From 4d6d89452aadfc94b8b0e691a3a98f5094826f51 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 13 Jul 2018 14:15:38 +0800 Subject: [PATCH] =?UTF-8?q?(1)=E6=B3=A8=E9=87=8A=E6=8E=89IP=E4=B8=8E?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E5=90=8E=E5=8F=B0=E5=88=97=E8=A1=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=9A=84=E6=9D=83=E9=99=90=E6=B3=A8=E8=A7=A3=20(2)IP,?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E9=80=9A=E7=94=A8=E9=A1=B5=E9=9D=A2=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=9A=90=E8=97=8F=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=9D=A5=E5=87=BD=EF=BC=8C=E5=88=86=E7=B1=BB?= =?UTF-8?q?=EF=BC=8C=E6=80=A7=E8=B4=A8=E6=A0=87=E7=AD=BE=20(3)=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=94=B9=E4=B8=BAclassification?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manipulation/IpMultiplexController.java | 3 +- .../manipulation/RatelimitController.java | 5 +- .../configuration/ntc/IpController.java | 3 +- .../ntc/WhiteListController.java | 5 +- .../proxy/ControlController.java | 5 +- .../proxy/InterceptController.java | 5 +- .../webapp/WEB-INF/include/form/basicInfo.jsp | 2 +- .../WEB-INF/views/cfg/common/domainList.jsp | 63 +++++++++++++++++- .../WEB-INF/views/cfg/common/ipList.jsp | 64 ++++++++++++++++++- 9 files changed, 136 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java index 9b3ef0740..b741a93b2 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java @@ -13,7 +13,6 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -42,7 +41,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/manipulation/ipmulitiplex") public class IpMultiplexController extends CommonController { @RequestMapping(value = {"/list"}) - @RequiresPermissions(value={"ip:mulitiplex:config","ip:mulitiplex:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"ip:mulitiplex:config","ip:mulitiplex:confirm"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); diff --git a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java index cb1b9058a..f6ea0548a 100644 --- a/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java +++ b/src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java @@ -11,7 +11,6 @@ package com.nis.web.controller.configuration.manipulation; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -38,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/manipulation/ratelimit") public class RatelimitController extends CommonController { @RequestMapping(value = {"/ip/list"}) - @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"ip:ratelimit:config","ip:ratelimit:confirm"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); @@ -46,7 +45,7 @@ public class RatelimitController extends CommonController { return "/cfg/common/ipList"; } @RequestMapping(value = {"/domain/list"}) - @RequiresPermissions(value={"domain:ratelimit:config","domain:ratelimit:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"domain:ratelimit:config","domain:ratelimit:confirm"},logical=Logical.OR) public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._domainList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java index 685260052..6e969da78 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java @@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.ntc; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -27,7 +26,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/ntc/iplist") public class IpController extends CommonController{ @RequestMapping(value = {"list"}) - @RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR) public String list(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName, model, cfg, request, response); model.addAttribute("urlPrefix","/ntc/iplist"); diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index 1f0a4a8c1..632d65432 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang3.StringUtils; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Controller; @@ -37,7 +36,7 @@ import com.nis.web.controller.configuration.CommonController; public class WhiteListController extends CommonController{ @RequestMapping(value = {"ip/list"}) - @RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm"},logical=Logical.OR) + //@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm","whitelist:ip:aduit"},logical=Logical.OR) public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { cfg.setTableName(IpPortCfg.getTablename()); Page searchPage=new Page(request,response,"r"); @@ -47,7 +46,7 @@ public class WhiteListController extends CommonController{ return "/cfg/whitelist/ipList"; } @RequestMapping(value = {"domain/list"}) - @RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm"},logical=Logical.OR) + //@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm","whitelist:domain:aduit"},logical=Logical.OR) public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { cfg.setTableName(HttpUrlCfg.getTablename()); Page searchPage=new Page(request,response,"r"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java index c122adaf0..8db0ea9b0 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java @@ -11,7 +11,6 @@ package com.nis.web.controller.configuration.proxy; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -38,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/proxy/control") public class ControlController extends CommonController { @RequestMapping(value = {"/ip/list"}) - @RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"control:ip:config","control:ip:confirm"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/proxy/control/ip"); @@ -46,7 +45,7 @@ public class ControlController extends CommonController { return "/cfg/common/ipList"; } @RequestMapping(value = {"/domain/list"}) - @RequiresPermissions(value={"control:domain:config","control:domain:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"control:domain:config","control:domain:confirm"},logical=Logical.OR) public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._domainList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/proxy/control/domain"); diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index f860560f9..2789aeccc 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.proxy; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -28,7 +27,7 @@ import com.nis.web.controller.configuration.CommonController; @RequestMapping("${adminPath}/proxy/intercept") public class InterceptController extends CommonController{ @RequestMapping(value = {"/ip/list"}) - @RequiresPermissions(value={"intercept:ip:config","intercept:ip:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"intercept:ip:config","intercept:ip:confirm"},logical=Logical.OR) public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._ipList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/proxy/intercept/ip"); @@ -36,7 +35,7 @@ public class InterceptController extends CommonController{ return "/cfg/common/ipList"; } @RequestMapping(value = {"/domain/list"}) - @RequiresPermissions(value={"intercept:domain:config","intercept:domain:confirm"},logical=Logical.OR) +// @RequiresPermissions(value={"intercept:domain:config","intercept:domain:confirm"},logical=Logical.OR) public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) { this._domainList(cfgName,model, cfg, request, response); model.addAttribute("urlPrefix","/proxy/intercept/domain"); diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp index 7e1881a82..84539577f 100644 --- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp @@ -25,7 +25,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp index cf7b67277..f51f4f028 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp @@ -146,6 +146,67 @@
+
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
@@ -213,7 +274,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp index 92e218661..71146328a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp @@ -155,6 +155,68 @@
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ + + + + + + + +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+
+
@@ -243,7 +305,7 @@ - +