From e64ba76ebab41c0812d0856ea2b6f86a39ecab7c Mon Sep 17 00:00:00 2001 From: zhangwq Date: Wed, 12 Dec 2018 14:00:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0DNS=E9=98=BB=E6=96=AD?= =?UTF-8?q?=E6=97=A0=E7=AD=96=E7=95=A5=E6=A3=80=E9=AA=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../maintenance/DnsIpCfgController.java | 16 ++++++++++++++++ .../web/dao/configuration/DnsIpCfgDao.java | 1 + .../nis/web/dao/configuration/DnsIpCfgDao.xml | 8 ++++++++ .../configuration/DnsIpCfgService.java | 4 ++++ .../WEB-INF/views/cfg/website/dnsForm.jsp | 3 ++- .../1.11.0/jquery.validate.method.js | 19 +++++++++++++++++++ .../1.11.0/localization/messages_en.js | 3 ++- .../1.11.0/localization/messages_ru.js | 3 ++- .../1.11.0/localization/messages_zh.js | 3 ++- 9 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java index 804e79545..00804807c 100644 --- a/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java @@ -180,6 +180,22 @@ public class DnsIpCfgController extends BaseController { return "redirect:" + adminPath +"/cfg/dnsIp/list?functionId="+functionId; } + /** + * DNS阻断无策略时检验 + * @param entity + * @param request + * @param response + * @return + */ + @ResponseBody + @RequestMapping(value = {"/dnsNoStrategyCheck"}) + public boolean dnsNoStrategyCheck(DnsIpCfg entity, HttpServletRequest request, HttpServletResponse response){ + List list = dnsIpCfgService.getValidCfgInfo(entity); + if(list.size() > 0){ + return true; + } + return false; + } //dnsIp配置导出 @RequestMapping(value = "exportDnsIp") diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java index 7cd1f24f8..e0b0fa891 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.java @@ -13,4 +13,5 @@ public interface DnsIpCfgDao extends CrudDao { List findPage(DnsIpCfg dnsIpCfg); DnsIpCfg getDnsIpCfg(Long cfgId); List findDnsIpCfg(DnsIpCfg entity); + List getValidCfgInfo(DnsIpCfg cfg); } diff --git a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml index 815a502b8..3d76fa287 100644 --- a/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml @@ -203,6 +203,14 @@ + + insert into dns_ip_cfg ( CFG_DESC, diff --git a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java index 1355b1401..0b0f9be5c 100644 --- a/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java @@ -54,6 +54,10 @@ public class DnsIpCfgService extends BaseService{ public DnsIpCfg getDnsIpCfg(Long cfgId) { return dnsIpCfgDao.getDnsIpCfg(cfgId); } + public List getValidCfgInfo(DnsIpCfg cfg) { + return dnsIpCfgDao.getValidCfgInfo(cfg); + } + @Transactional(readOnly=false,rollbackFor=RuntimeException.class) public void saveOrUpdate(DnsIpCfg entity){ Date createTime=new Date(); diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 387186ba1..2119a0a41 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -224,13 +224,14 @@
-
+
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js index 5a835fc61..af2f41f77 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js @@ -1010,5 +1010,24 @@ jQuery.validator.addMethod("ipMaskSole",function(value,element) { }); } + return flag; +}); + +// DNS阻断无策略校验 +jQuery.validator.addMethod("noStrategyCheck",function(value,element) { + var flag = true; + if(value == 0){ + var ctx = $(element).attr("ctx"); + var url = ctx+"/cfg/dnsIp/dnsNoStrategyCheck"; + $.ajax({ + type:'post', + async:false, + url: url, + data:{"dnsStrategyId":0}, + success:function(data){ + flag = data; + } + }); + } return flag; }); \ No newline at end of file diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js index ec1e2aa62..490c44eb6 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js @@ -80,6 +80,7 @@ asnNoUnique:"ASN already exists.", areaUnique:"Area already exists.", config_sync_tip:"The system is being maintained and temporarily inaccessible.", - ipMaskSole:"IP already exists." + ipMaskSole:"IP already exists.", + noStrategyCheck:"Spoofing IP Configuration Not Approved" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js index d1b327eac..09324e6d4 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js @@ -80,6 +80,7 @@ asnNoUnique:"ASN уже существует.", areaUnique:"Регион уже существует.", config_sync_tip:"Система находится под техническим обслуживанием и временно недоступна.", - ipMaskSole:"IP уже существует." + ipMaskSole:"IP уже существует.", + noStrategyCheck:"Spoofing IP Configuration Not Approved" }); }(jQuery)); diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js index ab62f520d..2d609b4ac 100644 --- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js +++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js @@ -80,6 +80,7 @@ asnNoUnique:"ASN号已存在", areaUnique:"该区域已存在", config_sync_tip:"系统正在维护中，暂时不可访问！", - ipMaskSole:"IP已存在" + ipMaskSole:"IP已存在", + noStrategyCheck:"无审核通过的欺骗IP配置" }); }(jQuery));