diff --git a/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java index 5a21e4dc8..ca353a59d 100644 --- a/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java +++ b/src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java @@ -20,7 +20,7 @@ public class ProxyFileHijackCfg extends BaseCfg{ private String path;//储存路径 @ExcelField(title="content_name",sort=4) private String contentName;//内容格式 - private int quote;//判断与其他菜单是否关联使用中 + private String quote;//判断与其他菜单是否关联使用中 public String getContentName() { return contentName; @@ -28,10 +28,10 @@ public class ProxyFileHijackCfg extends BaseCfg{ public void setContentName(String contentName) { this.contentName = contentName; } - public int getQuote() { + public String getQuote() { return quote; } - public void setQuote(int quote) { + public void setQuote(String quote) { this.quote = quote; } public String getIndexTable() { diff --git a/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java index 369a07bf2..5b8c1dbdc 100644 --- a/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java +++ b/src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java @@ -13,7 +13,7 @@ public class ProxyFileInsertScriptCfg extends BaseCfg{ private String format;//css/js @ExcelField(title="file_insert_script",sort=2) private String path;//储存路径 - private int quote;//判断与其他菜单是否关联使用中 + private String quote;//判断与其他菜单是否关联使用中 public String getIndexTable() { return indexTable; } @@ -38,10 +38,10 @@ public class ProxyFileInsertScriptCfg extends BaseCfg{ public void setPath(String path) { this.path = path; } - public int getQuote() { + public String getQuote() { return quote; } - public void setQuote(int quote) { + public void setQuote(String quote) { this.quote = quote; - } + } } diff --git a/src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java b/src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java index ecaf10d31..b8feb2577 100644 --- a/src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java +++ b/src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java @@ -16,7 +16,16 @@ public class ProxyFileResponsePageCfg extends BaseCfg private String contentType;//内容类型，如text/html，取字典表contentType private String md5;//文件md5值 private Long contentLength;//文件长度 - + private String quote;//引用状态 + + public String getQuote() { + return quote; + } + + public void setQuote(String quote) { + this.quote = quote; + } + public String getIndexTable() { return indexTable; } diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index 4b84d5677..6bcd6a829 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -3729,8 +3729,15 @@ public class BaseController { page.setPageNo(1); page.setLastPage(false); List list = pxyObjKeyringService.findPage(page,searchObjKeyringCfg).getList(); + List result = new ArrayList(); + for(int i=0;i result = new ArrayList(); for(int i=0;i result = new ArrayList(); for(int i=0;i result = new ArrayList(); + for(int i=0;i result = new ArrayList(); + for(int i=0;i , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,i.is_valid as quote + ,ri.request_title as requestName,max(i.is_valid) as quote FROM PXY_PROFILE_HIJACK_FILES a left join sys_user s on a.creator_id=s.id @@ -156,6 +156,7 @@ ${sqlMap.dsf} + group by compile_id ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml index 871160ce0..1e74f47d0 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileInsertScriptDao.xml @@ -51,7 +51,7 @@ , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName,i.is_valid as quote + ,ri.request_title as requestName,max(i.is_valid) as quote FROM PXY_PROFILE_INSERT_SCRIPTS a left join sys_user s on a.creator_id=s.id @@ -155,6 +155,7 @@ ${sqlMap.dsf} + group by compile_id ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml index b27bcb154..6aad3e9ac 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileResponsePageDao.xml @@ -53,13 +53,14 @@ , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName + ,ri.request_title as requestName,max(i.is_valid) as quote FROM pxy_profile_response_pages a left join sys_user s on a.creator_id=s.id left join sys_user e on a.editor_id=e.id left join sys_user u on a.auditor_id=u.id left join request_info ri on a.request_id=ri.id + left join cfg_index_info i on a.COMPILE_ID=i.user_region3 @@ -160,6 +161,7 @@ ${sqlMap.dsf} + group by compile_id ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml b/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml index c18975173..e5f65f336 100644 --- a/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/ProxyFileTrafficMirrorDao.xml @@ -50,14 +50,14 @@ , s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName + ,ri.request_title as requestName,max(i.is_valid) as userRegion5 FROM PXY_PROFILE_TRAFFIC_MIRROR a left join sys_user s on a.creator_id=s.id left join sys_user e on a.editor_id=e.id left join sys_user u on a.auditor_id=u.id left join request_info ri on a.request_id=ri.id - + left join cfg_index_info i on a.COMPILE_ID=i.user_region5 AND ${page.where} @@ -157,6 +157,7 @@ ${sqlMap.dsf} + group by compile_id ORDER BY ${page.orderBy},a.is_audit,a.CFG_ID desc diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml index 1190b2d78..2d5c045f2 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml @@ -142,13 +142,14 @@ ,s.name as creator_name,e.name as editor_name,u.name as auditor_name - ,ri.request_title as requestName + ,ri.request_title as requestName,max(i.is_valid) as userRegion4 FROM pxy_obj_keyring r left join sys_user s on r.creator_id=s.id left join sys_user e on r.editor_id=e.id left join sys_user u on r.auditor_id=u.id left join request_info ri on r.request_id=ri.id + left join cfg_index_info i on r.COMPILE_ID=i.user_region4 AND ${page.where} @@ -229,6 +230,7 @@ ${sqlMap.dsf} + group by compile_id ORDER BY ${page.orderBy},r.is_audit,r.CFG_ID desc diff --git a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java index b1616bcdd..05a98a294 100644 --- a/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java +++ b/src/main/java/com/nis/web/service/configuration/CommonPolicyService.java @@ -459,7 +459,9 @@ public class CommonPolicyService extends CrudService convertList = Lists.newArrayList(); for (Object object : auditList) { PxyObjKeyring cfg = (PxyObjKeyring)object; - convertList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); + if(!"1".equals(cfg.getUserRegion4())){ + convertList.add(BaseService.convertCallBackProxyObjKeyring(cfg)); + } } if(convertList.size() > 0) { auditList = convertList; @@ -482,16 +484,20 @@ public class CommonPolicyService extends CrudService convertList = Lists.newArrayList(); for (Object object : auditList) { ProxyFileHijackCfg cfg = (ProxyFileHijackCfg)object; - convertList.add(BaseService.convertCallBackProxyFileHijack(cfg)); + if(!"1".equals(cfg.getQuote())){ + convertList.add(BaseService.convertCallBackProxyFileHijack(cfg)); + } } if(convertList.size() > 0) { auditList = convertList; } - }else if(entity.getServiceId().equals(644)) { // 劫持文件 + }else if(entity.getServiceId().equals(644)) { // 脚本注入 List convertList = Lists.newArrayList(); for (Object object : auditList) { ProxyFileInsertScriptCfg cfg = (ProxyFileInsertScriptCfg)object; - convertList.add(BaseService.convertCallBackProxyFileInsertScript(cfg)); + if(!"1".equals(cfg.getQuote())){ + convertList.add(BaseService.convertCallBackProxyFileInsertScript(cfg)); + } } if(convertList.size() > 0) { auditList = convertList; @@ -500,7 +506,9 @@ public class CommonPolicyService extends CrudService convertList = Lists.newArrayList(); for (Object object : auditList) { ProxyFileTrafficMirrorCfg cfg = (ProxyFileTrafficMirrorCfg)object; - convertList.add(BaseService.convertCallBackProxyFileTrafficMirror(cfg)); + if(!"1".equals(cfg.getUserRegion5())){ + convertList.add(BaseService.convertCallBackProxyFileTrafficMirror(cfg)); + } } if(convertList.size() > 0) { auditList = convertList; @@ -518,7 +526,9 @@ public class CommonPolicyService extends CrudService convertList = Lists.newArrayList(); for (Object object : auditList) { ProxyFileResponsePageCfg cfg = (ProxyFileResponsePageCfg)object; - convertList.add(BaseService.convertCallBackProxyFileResponsePage(cfg)); + if(!"1".equals(cfg.getQuote())){ + convertList.add(BaseService.convertCallBackProxyFileResponsePage(cfg)); + } } if(convertList.size() > 0) { auditList = convertList; diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 300096c66..fb29e89fc 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1020,7 +1020,7 @@ PXY_INTERCEPT_PKT_BIN=Packet Payload certificate=Certificate do_log=Logging Option file_strategy=File Strategy -file_desc=File Desc +file_desc=File Description content_type=Content Type content_length=Content Length response_file=Response File @@ -1530,18 +1530,21 @@ public_private_file_error=Public-private key mismatch https_url_format_tip=URL(http[s]://xxx.xx) hijack_file_strategy=Hijack File profile_name=Profile Name -file_insert_script=File Insert Script -format=Format -file_quote_disable_delete=File quote Disable Delete +file_insert_script=Script Injection +script_name=Script Name +script_format=Script Format +script_file=Script File +file_quote_disable_delete=File Quote Disable Delete target_type=Target Type vlan=VLAN mac=MAC mirror_addr_list=Address List mirror_addr_type=Address Type -target_name=Target Name -traffic_mirror_address=Traffic Mirror Address +address_name=Address Name +traffic_mirror_address=Destination Network Address content_name=Content Name -visit_response_page=Response Pages +visit_response_page=Response File +file_is_used=File Is Used none_profile_tip=Please Choose Profile Info! #---------------------------pxy intercept------------------------------------ min_should_less_than_max=The min SSL version should less than the max SSL version diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 7f6525c66..18d984f2f 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1534,16 +1534,19 @@ https_url_format_tip=URL(http[s]://xxx.xx) hijack_file_strategy=\u0417\u0430\u0445\u0432\u0430\u0442 \u0444\u0430\u0439\u043b profile_name=Profile Name file_insert_script=File Insert Script -format=Format +script_name=Script Name +script_format=Script Format +script_file=Script File file_quote_disable_delete=File quote Disable Delete mac=MAC vlan=VLAN mirror_addr_list=Address List mirror_addr_type=Address Type -target_name=Target Name -traffic_mirror_address=Traffic Mirror Address +address_name=Address Name +traffic_mirror_address=Destination Network Address content_name=Content Name -visit_response_page=Response Pages +visit_response_page=Response File +file_is_used=File Is Used none_profile_tip=Please Choose Profile Info! #---------------------------pxy intercept------------------------------------ min_should_less_than_max=The min SSL version should less than the max SSL version diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 4c19e555b..aab8594a9 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1532,16 +1532,19 @@ https_url_format_tip=URL(http[s]://xxx.xx) hijack_file_strategy=\u52ab\u6301\u6587\u4ef6 profile_name=\u6587\u4ef6\u540d\u79f0 file_insert_script=\u6ce8\u5165\u811a\u672c\u6587\u4ef6 -format=\u683c\u5f0f +script_name=\u811A\u672C\u540D\u79F0 +script_format=\u811A\u672C\u683C\u5F0F +script_file=\u811A\u672C\u6587\u4EF6 file_quote_disable_delete=\u6587\u4ef6\u88ab\u5f15\u7528 \u4e0d\u53ef\u5220\u9664 vlan=\u865a\u62df\u5c40\u57df\u7f51 mac=MAC\u5730\u5740 mirror_addr_list=\u76ee\u6807\u6807\u8bc6\u5217\u8868 mirror_addr_type=\u76ee\u6807\u6807\u8bc6\u7c7b\u578b -target_name=\u76ee\u6807\u540d\u79f0 +address_name=\u5730\u5740\u540D\u79F0 traffic_mirror_address=\u6d41\u91cf\u8f6c\u53d1\u76ee\u7684\u5730\u5740 content_name=\u5185\u5bb9\u540d\u79f0 visit_response_page=\u8bbf\u95ee\u963b\u65ad\u9875\u9762 +file_is_used=\u6587\u4EF6\u88AB\u5F15\u7528 none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6! #---------------------------pxy intercept------------------------------------ min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6700\u5927SSL\u7248\u672c diff --git a/src/main/webapp/WEB-INF/tags/sys/delRow.tag b/src/main/webapp/WEB-INF/tags/sys/delRow.tag index fabd96f9a..a0fd520db 100644 --- a/src/main/webapp/WEB-INF/tags/sys/delRow.tag +++ b/src/main/webapp/WEB-INF/tags/sys/delRow.tag @@ -390,8 +390,12 @@ function cancelPassOpt(url){ } }); } + } + //查询文件是否被引用 + if(canCancel && validateIsCancelOfQuote(checkboxes)){ + top.$.jBox.tip("", ""); + canCancel=false; } - if(canCancel){ doAll(checkboxes,url); } @@ -603,10 +607,20 @@ function validateIsDelete(checkboxes){ } //验证文件是否其他菜单有引用且非删除状态 function validateIsDeleteOfQuote(checkboxes){ + var flag = false; + $(checkboxes).filter(":checked").each(function(){ + if($(this).attr("quoteStatus") != -1 && "undefined" != typeof $(this).attr("quoteStatus") && $(this).attr("quoteStatus") != ""){ //可删除的条件 + flag = true; + return; + } + }); + return flag; +} +//验证文件是否其他菜单引用且生效 +function validateIsCancelOfQuote(checkboxes){ var flag = false; $(checkboxes).filter(":checked").each(function(){ - if($(this).attr("quoteStatus") != -1 && $(this).attr("quoteStatus") != 0 - && "undefined" != typeof $(this).attr("quoteStatus")){ //可删除的条件 + if($(this).attr("quoteStatus") == 1){ //不可取消的配置 flag = true; return; } diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp index a77df6a8b..c130a4273 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp @@ -322,7 +322,7 @@ - + ${cfg.compileId } ${cfg.cfgDesc } diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/form.jsp index 69404a6c1..3cbcd4e72 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileHijack/form.jsp @@ -13,7 +13,10 @@ $("#cfgFile").on('change',function(){ $("#urlInfo").val($("#cfgFile").val()); cfgFileValidate(); - }); + }); + $("#contentType").on('change',function(){ + cfgFileValidate(); + }); $("#cfgFrom") .validate( { submitHandler : function(form) { @@ -37,29 +40,23 @@ }); function cfgFileValidate(){ - var flag=false; //状态，检测文件后缀用 - var arr=["exe","apk"];//使用是什么格式的后缀 + var flag=false; //状态，检测文件后缀用 var cFile=$("#cfgFile").val();//文件的值 //取出上传文件的扩展名 var index=cFile.lastIndexOf("."); var ext = cFile.substr(index+1).toLowerCase(); - //循环比较 - for(var i=0;i"); - return false; - } - return true; + $("div[for='urlInfo']").append(""); + return false; + } + return true; } @@ -149,7 +146,41 @@ -
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ +
+
+
+
-
-
-
- -
- -
-
-
-
-
-
-
- -
- -
-
-
-
-
-
- -
- -
-
-
+