diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java index 2a77022bc..4f644fd96 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjKeyringController.java @@ -122,6 +122,8 @@ public class PxyObjKeyringController extends BaseController { logger.error("证书文件校验失败",e); if(e instanceof MaatConvertException) { addMessage(redirectAttributes,"error","request_service_failed"); + }else if(e instanceof MaatConvertException){ + addMessage(redirectAttributes,"error",e.getMessage()); }else { addMessage(redirectAttributes,"error","save_failed"); } @@ -134,12 +136,18 @@ public class PxyObjKeyringController extends BaseController { // 获取公钥信息 if(certInfoMap != null && certInfoMap.size() >0){ - String issuer=certInfoMap.get("ca issuer").toString();//颁发者 - Date notBeforeTime=new Date(certInfoMap.get("ca notbefore").toString());//开始时间 - Date notAfterTime=new Date(certInfoMap.get("ca notafter").toString());//结束时间 - String subject=certInfoMap.get("ca subjectname").toString();//颁发给 - String notBeforeStr=sdf.format(notBeforeTime); - String notAfterStr=sdf.format(notAfterTime); + String issuer=StringUtil.isEmpty(certInfoMap.get("ca issuer")) ? "":certInfoMap.get("ca issuer").toString();//颁发者 + String subject=StringUtil.isEmpty(certInfoMap.get("ca subjectname")) ? "":certInfoMap.get("ca subjectname").toString();//颁发给 + String notBeforeStr=""; + if (!StringUtil.isEmpty(certInfoMap.get("ca notbefore"))) { + Date notBeforeTime=new Date(certInfoMap.get("ca notbefore").toString());//开始时间 + notBeforeStr=sdf.format(notBeforeTime); + } + String notAfterStr=""; + if (!StringUtil.isEmpty(certInfoMap.get("ca notafter"))) { + Date notAfterTime=new Date(certInfoMap.get("ca notafter").toString());//结束时间 + notAfterStr=sdf.format(notAfterTime); + } String cn="";//CN //CN精确信息获取 if(!StringUtil.isEmpty(subject)){ @@ -151,7 +159,7 @@ public class PxyObjKeyringController extends BaseController { } } } - String altName=certInfoMap.get("ca altname").toString();//SAN + String altName=StringUtil.isEmpty(certInfoMap.get("ca altname")) ? "":certInfoMap.get("ca altname").toString();//SAN cfg.setIssuer(issuer); cfg.setSubject(subject); @@ -167,9 +175,12 @@ public class PxyObjKeyringController extends BaseController { }catch (Exception e) { validFlag=false; logger.error("证书信息获取失败",e); - if(e instanceof MaatConvertException) { + logger.error("证书文件校验失败",e); + if(e instanceof MaatConvertException){ addMessage(redirectAttributes,"error","request_service_failed"); - }else { + }else if(e instanceof MultiPartNewException){ + addMessage(redirectAttributes,"error",e.getMessage()); + }else{ addMessage(redirectAttributes,"error","save_failed"); } } @@ -222,14 +233,16 @@ public class PxyObjKeyringController extends BaseController { } } pxyObjKeyringService.saveOrUpdate(cfg); + addMessage(redirectAttributes,"success","save_success"); } - addMessage(redirectAttributes,"success","save_success"); }catch(Exception e){ logger.error("证书上传失败",e); - if(e instanceof MaatConvertException) { + if(e instanceof MaatConvertException){ addMessage(redirectAttributes,"error","request_service_failed"); - }else { + }else if(e instanceof MultiPartNewException){ + addMessage(redirectAttributes,"error",e.getMessage()); + }else{ addMessage(redirectAttributes,"error","save_failed"); } } @@ -247,7 +260,7 @@ public class PxyObjKeyringController extends BaseController { */ public boolean validCertFileContent(MultipartFile file,String validateType)throws Exception{ String os = System.getProperty("os.name").toLowerCase(); - if(!os.contains("windows")){ + if(!os.contains("windows") && file != null){ //证书文件临时保存路径 String certFilePath = Constants.CERT_FILE_PATH; FileUtils.createDirectory(certFilePath); @@ -453,7 +466,11 @@ public class PxyObjKeyringController extends BaseController { } catch (Exception e) { validFlag=false; logger.error("证书文件校验失败",e); - addMessage(redirectAttributes,"error",e.getMessage()); + if(e instanceof MaatConvertException){ + addMessage(redirectAttributes,"error",e.getMessage()); + }else{ + addMessage(redirectAttributes,"error","save_failed"); + } } try{ @@ -462,7 +479,7 @@ public class PxyObjKeyringController extends BaseController { if(certFileI != null) { // 获取公钥信息 if(certInfoMap != null && certInfoMap.size() >0){ - String issuer=certInfoMap.get("ca issuer").toString();//颁发者 + String issuer=StringUtil.isEmpty(certInfoMap.get("ca issuer")) ? "":certInfoMap.get("ca issuer").toString();//颁发者 logger.info("issuer："+issuer); cfg.setIssuer(issuer); }else{ @@ -506,7 +523,9 @@ public class PxyObjKeyringController extends BaseController { }catch(Exception e){ logger.error("证书上传失败",e); - if(e instanceof MaatConvertException) { + if(e instanceof MultiPartNewException) { + addMessage(redirectAttributes,"error",e.getMessage()); + }else if(e instanceof MaatConvertException) { addMessage(redirectAttributes,"error","request_service_failed"); }else { addMessage(redirectAttributes,"error","save_failed"); @@ -534,8 +553,14 @@ public class PxyObjKeyringController extends BaseController { } } catch (Exception e) { validFlag=false; - logger.error("crl文件校验失败",e); - addMessage(redirectAttributes,"error",e.getMessage()); + logger.error("证书文件校验失败",e); + if(e instanceof MaatConvertException){ + addMessage(redirectAttributes,"error","request_service_failed"); + }else if(e instanceof MultiPartNewException){ + addMessage(redirectAttributes,"error",e.getMessage()); + }else{ + addMessage(redirectAttributes,"error","save_failed"); + } } try{ @@ -544,8 +569,7 @@ public class PxyObjKeyringController extends BaseController { if(crlFileI != null) { // 获取issuer if(certInfoMap != null && certInfoMap.size() >0){ - String issuer=certInfoMap.get("crl issuer").toString();//颁发者 - logger.info("-----------------------------issuer："+issuer); + String issuer=StringUtil.isEmpty(certInfoMap.get("crl issuer")) ? "":certInfoMap.get("crl issuer").toString();//颁发者 if(cfg != null){ if((cfg.getCertId() != null && cfg.getCertId() > 0) && (!cfg.getIssuer().equals(issuer))){ logger.error("cert 和 crl的issuser不符合"); @@ -564,7 +588,11 @@ public class PxyObjKeyringController extends BaseController { }catch (Exception e) { validFlag=false; logger.error("crl issuer比对失败",e); - addMessage(redirectAttributes,"error",e.getMessage()); + if(e instanceof MultiPartNewException){ + addMessage(redirectAttributes,"error",e.getMessage()); + }else{ + addMessage(redirectAttributes,"error","save_failed"); + } } try{ if(validFlag){ @@ -598,11 +626,14 @@ public class PxyObjKeyringController extends BaseController { }catch(Exception e){ logger.error("crl上传失败",e); - if(e instanceof MaatConvertException) { - addMessage(redirectAttributes,"error","request_service_failed"); - }else { - addMessage(redirectAttributes,"error","save_failed"); - } + logger.error("证书文件校验失败",e); + if(e instanceof MaatConvertException){ + addMessage(redirectAttributes,"error","request_service_failed"); + }else if(e instanceof MultiPartNewException){ + addMessage(redirectAttributes,"error",e.getMessage()); + }else{ + addMessage(redirectAttributes,"error","save_failed"); + } } return "redirect:" + adminPath +"/proxy/intercept/strateagy/trustedCertList?functionId="+cfg.getFunctionId(); @@ -648,7 +679,11 @@ public class PxyObjKeyringController extends BaseController { StringBuilder out = new StringBuilder(); String key=""; String value=""; - certInfoMap=new HashMap<>(); + if((sb.toString().indexOf("inlist") > -1) + || ( sb.toString().indexOf("incrl") > -1 ) + || ( sb.toString().indexOf("incert") > -1 )){ + certInfoMap=new HashMap<>(); + } while ((s = br.readLine()) != null) { logger.info(s); //可信证书pem信息收集 diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index b83c01822..b614838fe 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -967,8 +967,8 @@ public abstract class BaseService { //可信证书 public List convertCallBackProxyObjTrustedCa(PxyObjTrustedCaCert cfgCert,PxyObjTrustedCaCrl cfgCrl){ List proxyObjTrustedCas=new ArrayList<>(); - ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa(); if(cfgCert != null && !StringUtil.isEmpty(cfgCert.getCompileId())){ + ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa(); proxyObjTrustedCaCert.setId(Long.valueOf(cfgCert.getCompileId())); proxyObjTrustedCaCert.setCfgId(cfgCert.getCompileId()); proxyObjTrustedCaCert.setCertId(cfgCert.getCompileId()); @@ -980,6 +980,7 @@ public abstract class BaseService { proxyObjTrustedCas.add(proxyObjTrustedCaCert); } if(cfgCrl != null && !StringUtil.isEmpty(cfgCrl.getCompileId())){ + ProxyObjTrustedCa proxyObjTrustedCaCert=new ProxyObjTrustedCa(); proxyObjTrustedCaCert.setId(Long.valueOf(cfgCrl.getCompileId())); proxyObjTrustedCaCert.setCfgId(cfgCrl.getCompileId()); proxyObjTrustedCaCert.setCertId(cfgCrl.getCertId()); diff --git a/src/main/resources/sql/20181107/update_sys_menu b/src/main/resources/sql/20181107/update_sys_menu.sql similarity index 100% rename from src/main/resources/sql/20181107/update_sys_menu rename to src/main/resources/sql/20181107/update_sys_menu.sql diff --git a/src/main/resources/sql/20181108/add_pxy_obj_table b/src/main/resources/sql/20181108/add_pxy_obj_table.sql similarity index 100% rename from src/main/resources/sql/20181108/add_pxy_obj_table rename to src/main/resources/sql/20181108/add_pxy_obj_table.sql diff --git a/src/main/resources/sql/20181109/update_specific_service_cfg_data.sql b/src/main/resources/sql/20181109/update_specific_service_cfg_data.sql new file mode 100644 index 000000000..68daf5706 --- /dev/null +++ b/src/main/resources/sql/20181109/update_specific_service_cfg_data.sql @@ -0,0 +1,2 @@ +delete from specific_service_cfg; +INSERT INTO `specific_service_cfg` VALUES (1,100001,'Skype','Skype',1,'2018-10-10 19:02:04',0,0,1297,1,'2',NULL),(7,100101,'Instagram','',1,'2018-08-28 15:46:48',0,0,8,1,'14',NULL),(8,100201,'Youtube','',1,'2018-08-28 15:46:14',0,0,9,1,'10',NULL),(9,100301,'Facebook','',1,'2018-08-28 15:45:47',0,0,10,1,'14',NULL),(10,100401,'What\'s App','',1,'2018-09-10 17:08:40',0,0,11,1,'2',NULL),(11,100501,'Periscope','',1,'2018-08-28 15:44:36',0,0,12,1,'10',NULL),(12,100601,'Viber','',1,'2018-08-28 15:44:10',0,0,13,1,'2',NULL),(13,100701,'Twitter','',1,'2018-08-28 15:43:37',0,0,14,1,'14',NULL),(14,100801,'Vkontakte','',1,'2018-08-28 15:42:59',0,0,15,1,'14',NULL),(15,100901,'Telegram','',1,'2018-08-28 15:41:18',0,0,16,1,'2',NULL),(17,101101,'Mail agent','',1,'2018-08-28 15:40:47',0,0,18,1,'2',NULL),(18,101201,'FaceTime','',1,'2018-08-28 15:40:20',0,0,19,1,'2',NULL),(20,101301,'Snapchat','',1,'2018-08-28 15:39:40',0,0,35,1,'2',NULL),(21,101401,'Google','',1,'2018-08-28 15:39:13',0,0,36,1,'4',NULL),(22,4,'message','',0,'2018-06-21 14:01:11',21,1,37,1,'',NULL),(28,103301,'Zenmate VPN','',1,'2018-09-21 18:52:31',0,0,13,1,'20',NULL),(29,103201,'HideMyAss VPN','',1,'2018-08-28 15:38:18',0,0,162,1,'20',NULL),(30,103101,'Hola VPN','',1,'2018-08-28 15:37:50',0,0,163,1,'20',NULL),(31,103001,'VPN Master','',1,'2018-09-12 16:32:58',0,0,197,1,'20',NULL),(32,102901,'HotSpot Shield VPN','',1,'2018-08-28 15:36:36',0,0,165,1,'20',NULL),(33,102801,'Tunnel Bear VPN','',1,'2018-09-24 21:52:50',0,0,200,1,'20',NULL),(34,102701,'Orbot','',1,'2018-08-28 15:35:49',0,0,167,1,'20',NULL),(35,102602,'Tor browser','',1,'2018-09-13 15:23:44',0,0,279,1,'20',NULL),(36,102601,'TOR','',1,'2018-10-18 18:17:27',0,0,1798,1,'20',NULL),(37,102501,'Psiphon','',1,'2018-09-24 21:51:49',0,0,199,1,'20',NULL),(38,102401,'Freegate','',1,'2018-09-14 12:36:03',0,0,123,1,'20',NULL),(39,102301,'Zello','',1,'2018-09-07 18:28:58',0,0,414,1,'2',NULL),(40,102201,'WeChat','',1,'2018-08-28 15:32:57',0,0,173,1,'2',NULL),(41,102101,'Badoo social networking','',1,'2018-08-28 15:32:35',0,0,174,1,'14',NULL),(42,102001,'Drugvokrug social networking','',1,'2018-08-28 15:32:09',0,0,175,1,'14',NULL),(43,101901,'PlayMarket','',1,'2018-09-12 18:08:13',0,0,206,1,'15',NULL),(44,101801,'AppStore','',1,'2018-08-28 15:31:22',0,0,177,1,'15',NULL),(45,101703,'Opera mini','',1,'2018-08-28 15:30:58',0,0,178,1,'17',NULL),(46,101702,'Opera Turbo','',1,'2018-08-28 15:30:17',0,0,179,1,'17',NULL),(47,101701,'Opera','',1,'2018-10-08 15:34:00',0,0,992,1,'17',NULL),(48,101601,'Yandex Browser Turbo','',1,'2018-08-28 15:28:53',0,0,181,1,'17',NULL),(49,101501,'Yandex','',1,'2018-08-28 15:12:22',0,0,182,1,'4',NULL),(51,101001,'Odnoklassniki','',1,'2018-08-28 15:09:39',0,0,184,1,'14',NULL),(52,100002,'Skype video calls/calls','',1,'2018-07-23 14:12:02',1,1,72,1,'',NULL),(53,100003,'Skype voice','',1,'2018-07-23 14:12:40',1,1,73,1,'',NULL),(54,100004,'Skype message','',1,'2018-07-23 14:15:01',1,1,74,1,'',NULL),(55,100102,'Instagram video','',1,'2018-07-23 14:15:57',7,1,75,1,'',NULL),(56,100103,'Instagram message','',1,'2018-07-23 14:41:44',7,1,76,1,'',NULL),(57,100104,'Instagram live','',1,'2018-07-23 14:17:01',7,1,77,1,'',NULL),(58,100105,'Instagram adding photos and videos','',1,'2018-07-23 14:18:02',7,1,78,1,'',NULL),(59,100202,'Youtube video','',1,'2018-07-23 14:42:39',8,1,79,1,'',NULL),(60,100203,'Youtube live','',1,'2018-07-23 14:42:59',8,1,80,1,'',NULL),(61,100204,'Youtube adding videos','',1,'2018-07-29 16:31:58',8,1,81,1,'',NULL),(62,100302,'Facebook video','',1,'2018-07-23 14:44:05',9,1,82,1,'',NULL),(63,100303,'Facebook live','',1,'2018-07-23 14:44:49',9,1,83,1,'',NULL),(64,100304,'Facebook message','',1,'2018-07-23 14:45:24',9,1,84,1,'',NULL),(65,0,'Beyond The Range Of Protocol','',1,'2018-08-24 11:04:31',0,0,109,3,'basic_1',NULL),(71,6,'GRE','',1,'2018-09-10 15:41:12',0,0,115,3,'107',NULL),(73,8,'HTTPS','',1,'2018-09-10 15:41:47',0,0,117,3,'104',NULL),(74,9,'ICMP','',1,'2018-09-10 15:42:03',0,0,118,3,'107',NULL),(77,12,'IMAPS','',1,'2018-09-10 15:43:13',0,0,121,3,'106',NULL),(81,16,'NTP','',1,'2018-09-10 15:45:37',0,0,125,3,'112',NULL),(83,18,'POP3 SSL','',1,'2018-09-10 15:46:22',0,0,127,3,'106',NULL),(85,20,'QUIC','',1,'2018-09-10 15:50:33',0,0,129,3,'104',NULL),(87,22,'SMB','',1,'2018-09-10 15:52:45',0,0,131,3,'112',NULL),(89,24,'SMTPS','',1,'2018-09-10 15:53:29',0,0,133,3,'106',NULL),(90,25,'SPDY','google tcp',1,'2018-09-10 15:53:58',0,0,134,3,'104',NULL),(91,28,'SSH','',1,'2018-09-10 15:54:34',0,0,135,3,'109',NULL),(94,268435455,'Unspecified','',1,'2018-08-28 18:08:09',0,0,138,3,'268435455',NULL),(95,6,'GRE','',1,'2018-07-25 09:43:06',0,0,157,2,'',NULL),(96,15,'L2TP','',1,'2018-08-24 11:05:53',0,0,158,2,'0',NULL),(97,19,'PPTP','',1,'2018-07-25 09:43:48',0,0,159,2,'',NULL),(98,61,'OpenVPN','',1,'2018-08-25 12:18:06',0,0,166,2,'0',NULL),(99,26,'SSH-V1','',1,'2018-08-24 11:05:45',0,0,167,2,'0',NULL),(100,27,'SSH-V2','',1,'2018-07-25 13:02:20',0,0,168,2,'',NULL),(101,28,'SSH-other','',1,'2018-08-24 11:05:37',0,0,169,2,'0',NULL),(102,29,'SSL','',1,'2018-08-24 11:05:28',0,0,170,2,'0',NULL),(103,30,'SOCKS','',1,'2018-08-24 11:05:19',0,0,171,2,'0',NULL),(104,13,'IPSEC','',1,'2018-08-24 11:05:11',0,0,172,2,'0',NULL),(105,10,'IKE','',1,'2018-08-24 11:05:03',0,0,173,2,'0',NULL),(106,20,'QUIC','',1,'2018-08-21 16:59:19',0,0,174,2,'0',NULL),(107,1,'multimedia_video','',1,'2018-07-25 15:13:38',106,1,181,2,'',NULL),(108,0,'Beyond The Range Of Application','',1,'2018-08-24 10:57:41',0,0,182,1,'app_10001',NULL),(109,2,'File Transfer','',0,'2018-07-25 15:46:29',106,1,212,2,'',NULL),(110,3,'Remote Control','',0,'2018-07-25 15:46:56',106,1,213,2,'',NULL),(111,4,'Web Browse','',0,'2018-07-25 15:47:34',106,1,214,2,'',NULL),(112,5,'VOIP','',0,'2018-08-21 15:58:52',106,1,215,2,'',NULL),(113,1,'multimedia_video','',1,'2018-07-25 18:24:26',105,1,241,2,'',NULL),(114,2,'File Transfer','',0,'2018-07-25 18:24:49',105,1,242,2,'',NULL),(115,3,'Remote Control','',0,'2018-07-25 18:25:09',105,1,243,2,'',NULL),(116,4,'Web browse','',0,'2018-07-25 18:25:34',105,1,244,2,'',NULL),(117,5,'VOIP','',0,'2018-07-25 18:25:51',105,1,245,2,'',NULL),(118,1,'multimedia_video','',1,'2018-07-25 18:26:14',104,1,246,2,'',NULL),(119,2,'File Transfer','',0,'2018-07-25 18:26:35',104,1,247,2,'',NULL),(120,3,'Remote Control','',0,'2018-07-25 18:26:58',104,1,248,2,'',NULL),(121,4,'Web Browse','',0,'2018-07-25 18:27:22',104,1,249,2,'',NULL),(122,5,'VOIP','',0,'2018-07-25 18:27:55',104,1,250,2,'',NULL),(123,1,'multimedia_video','',1,'2018-07-25 18:28:13',103,1,251,2,'',NULL),(124,2,'File Transfer','',0,'2018-07-25 18:28:29',103,1,252,2,'',NULL),(125,3,'Remote Control','',1,'2018-07-25 18:28:51',103,1,253,2,'',NULL),(126,4,'Web Browse','',0,'2018-07-25 18:29:09',103,1,254,2,'',NULL),(127,5,'VOIP','',0,'2018-07-25 18:29:22',103,1,255,2,'',NULL),(128,1,'multimedia_video','',1,'2018-07-25 18:29:56',102,1,256,2,'',NULL),(129,2,'File Transfer','',0,'2018-07-25 18:30:17',102,1,257,2,'',NULL),(130,3,'Remote Control','',0,'2018-07-25 18:30:34',102,1,258,2,'',NULL),(131,4,'Web Browse','',0,'2018-07-25 18:30:54',102,1,259,2,'',NULL),(132,5,'VOIP','',0,'2018-07-25 18:31:10',102,1,260,2,'',NULL),(133,1,'multimedia_video','',1,'2018-07-25 18:31:27',101,1,261,2,'',NULL),(134,2,'File Transfer','',0,'2018-07-25 18:31:42',101,1,262,2,'',NULL),(135,3,'Remote Control','',0,'2018-07-25 18:32:01',101,1,263,2,'',NULL),(136,4,'Web Browse','',0,'2018-07-25 18:32:46',101,1,264,2,'',NULL),(137,5,'VOIP','',0,'2018-07-25 18:33:06',101,1,265,2,'',NULL),(138,1,'multimedia_video','',1,'2018-07-25 18:33:25',100,1,266,2,'',NULL),(139,2,'File Transfer','',0,'2018-07-25 18:33:37',100,1,267,2,'',NULL),(140,3,'Remote Control','',0,'2018-07-25 18:33:49',100,1,268,2,'',NULL),(141,4,'Web Browse','',0,'2018-07-25 18:34:01',100,1,269,2,'',NULL),(142,5,'VOIP','',0,'2018-07-25 18:34:14',100,1,270,2,'',NULL),(143,1,'multimedia_video','',1,'2018-07-25 18:34:45',99,1,271,2,'',NULL),(144,2,'File Transfer','',0,'2018-07-25 18:34:57',99,1,272,2,'',NULL),(145,3,'Remote Control','',0,'2018-07-25 18:35:09',99,1,273,2,'',NULL),(146,4,'Web Browse','',0,'2018-07-25 18:35:24',99,1,274,2,'',NULL),(147,5,'VOIP','',0,'2018-07-25 18:35:37',99,1,275,2,'',NULL),(148,1,'multimedia_video','',1,'2018-07-25 18:35:51',98,1,276,2,'',NULL),(149,2,'File Transfer','',0,'2018-07-25 18:36:02',98,1,277,2,'',NULL),(150,3,'Remote Control','',0,'2018-07-25 18:36:14',98,1,278,2,'',NULL),(151,4,'Web Browse','',0,'2018-07-25 18:37:00',98,1,279,2,'',NULL),(152,5,'VOIP','',0,'2018-07-25 18:38:55',98,1,280,2,'',NULL),(153,1,'multimedia_video','',1,'2018-07-25 18:39:23',97,1,281,2,'',NULL),(154,2,'File Transfer','',0,'2018-07-25 18:39:34',97,1,282,2,'',NULL),(155,3,'Remote Control','',0,'2018-07-25 18:39:53',97,1,283,2,'',NULL),(156,4,'Web Browse','',0,'2018-07-25 18:49:15',97,1,284,2,'',NULL),(157,5,'VOIP','',0,'2018-07-26 09:03:19',97,1,285,2,'',NULL),(158,1,'multimedia_video','',1,'2018-07-26 09:04:21',96,1,286,2,'',NULL),(159,2,'File Transfer','',0,'2018-07-26 09:04:35',96,1,287,2,'',NULL),(160,3,'Remote Control','',0,'2018-07-26 09:05:02',96,1,288,2,'',NULL),(161,4,'Web Browse','',0,'2018-07-26 09:05:17',96,1,289,2,'',NULL),(162,2,'VOIP','',0,'2018-07-26 09:05:31',96,1,290,2,'',NULL),(163,1,'multimedia_video','',1,'2018-07-26 09:05:48',95,1,291,2,'',NULL),(164,2,'File Transfer','',0,'2018-07-26 09:06:05',95,1,292,2,'',NULL),(165,3,'Remote Control','',0,'2018-07-26 09:06:23',95,1,293,2,'',NULL),(166,4,'Web Browse','',0,'2018-07-26 09:06:39',95,1,294,2,'',NULL),(167,5,'VOIP','',0,'2018-07-26 09:06:57',95,1,295,2,'',NULL),(168,100402,'What\'s App message','',1,'2018-07-26 09:10:20',10,1,296,1,'',NULL),(169,100403,'What\'s App calls/video calls','',1,'2018-07-26 09:10:48',10,1,297,1,'',NULL),(170,100404,'What\'s App transfer','',1,'2018-07-26 09:11:34',10,1,298,1,'',NULL),(171,100502,'Viber calls/video calls','',1,'2018-07-26 09:11:56',12,1,299,1,'',NULL),(172,100503,'Viber message','',1,'2018-07-26 09:12:18',12,1,300,1,'',NULL),(173,100504,'Viber transfer','',1,'2018-07-26 09:12:43',12,1,301,1,'',NULL),(174,100602,'Vkontakte video','',1,'2018-07-26 09:13:15',14,1,302,1,'',NULL),(175,100603,'Vkontakte message','',1,'2018-07-26 09:13:31',14,1,303,1,'',NULL),(176,100604,'Vkontakte live','',1,'2018-07-26 09:13:48',14,1,304,1,'',NULL),(177,100702,'Telegram message','',1,'2018-07-26 09:14:12',15,1,305,1,'',NULL),(178,100703,'Telegram calls/video calls','',1,'2018-07-26 09:14:29',15,1,306,1,'',NULL),(179,100704,'Telegram transfer','',1,'2018-07-26 09:14:46',15,1,307,1,'',NULL),(180,100802,'Odnoklassniki message','',1,'2018-07-26 09:15:33',51,1,308,1,'',NULL),(181,100803,'Odnoklassniki video','',1,'2018-07-26 09:15:53',51,1,309,1,'',NULL),(182,100902,'Mail agent message','',1,'2018-07-26 09:17:13',17,1,310,1,'',NULL),(183,100903,'Mail agent calls','',1,'2018-07-26 09:17:29',17,1,311,1,'',NULL),(184,100904,'Mail agent transfer','',1,'2018-07-26 09:17:47',17,1,312,1,'',NULL),(185,101002,'Facetime video calls','',1,'2018-07-26 09:18:15',18,1,313,1,'',NULL),(186,101003,'Facetime voice calls','',1,'2018-07-26 09:18:32',18,1,314,1,'',NULL),(282,100005,'Skype transfer','ӦΪ',1,'2018-09-10 14:30:58',1,1,2,1,'',NULL),(283,102603,'Tor mode','',1,'2018-09-10 16:31:39',0,0,14,1,'20',NULL),(296,30,'SOCKS','',1,'2018-09-12 17:28:43',0,0,200,3,'108',NULL),(297,5,'FTPS','',1,'2018-09-12 17:30:30',0,0,201,3,'105',NULL),(298,10,'IKE','',1,'2018-09-12 17:32:19',0,0,202,3,'102',NULL),(299,13,'IPSEC','',1,'2018-09-12 17:33:19',0,0,203,3,'102',NULL),(300,15,'L2TP','',1,'2018-09-12 17:34:58',0,0,204,3,'103',NULL),(301,19,'PPTP','',1,'2018-09-12 17:36:17',0,0,205,3,'103',NULL),(303,13579,'facetime-hx','dingdingdongdong',0,'2018-09-16 15:48:54',18,1,624,1,'',NULL),(305,121,'XMPP','',1,'2018-09-16 19:17:18',0,0,628,3,'101',NULL),(307,90001,'Advanced Application Test','Advanced Application Test',1,'2018-10-05 12:45:13',0,0,783,1,'4',NULL),(309,300002,'New Applicaiton',NULL,0,'2018-10-08 11:19:10',0,0,956,1,'20',185),(311,300003,'douyin',NULL,0,'2018-10-08 11:19:50',0,0,957,1,'268435455',185),(313,6,'other','',1,'2018-08-21 15:58:52',106,1,215,2,NULL,NULL),(315,6,'other','',1,'2018-07-25 18:25:51',105,1,245,2,NULL,NULL),(317,6,'other','',1,'2018-07-25 18:27:55',104,1,250,2,NULL,NULL),(319,6,'other','',1,'2018-07-25 18:29:22',103,1,255,2,NULL,NULL),(321,6,'other','',1,'2018-07-25 18:31:10',102,1,260,2,NULL,NULL),(323,6,'other','',1,'2018-07-25 18:33:06',101,1,265,2,NULL,NULL),(325,6,'other','',1,'2018-07-25 18:34:14',100,1,270,2,NULL,NULL),(327,6,'other','',1,'2018-07-25 18:35:37',99,1,275,2,NULL,NULL),(329,6,'other','',1,'2018-07-25 18:38:55',98,1,280,2,NULL,NULL),(331,6,'other','',1,'2018-07-26 09:03:19',97,1,285,2,NULL,NULL),(333,6,'other','',1,'2018-07-26 09:05:31',96,1,290,2,NULL,NULL),(335,6,'other','',1,'2018-07-26 09:06:57',95,1,295,2,NULL,NULL); \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp index d4d388f9e..bb53a079e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/form.jsp @@ -341,9 +341,7 @@ function privateFileValidate(){
- - - +
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp index 80eb14637..c4c47f112 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/trustedCertList.jsp @@ -124,8 +124,11 @@ onClick="javascript:window.location='${ctx}/proxy/intercept/strateagy/trustedCertForm?functionId=${cfg.functionId}'"> + + +