gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-07-13 14:30:33 +08:00
parent 47dd011c3c 4d6d89452a
commit 6f3935d8cb
9 changed files with 136 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java
View File

@@ -13,7 +13,6 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -42,7 +41,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/manipulation/ipmulitiplex") @RequestMapping("${adminPath}/manipulation/ipmulitiplex")
public class IpMultiplexController extends CommonController { public class IpMultiplexController extends CommonController {
@RequestMapping(value = {"/list"}) @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) { public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response); this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/manipulation/ipmulitiplex"); model.addAttribute("urlPrefix","/manipulation/ipmulitiplex");

5
src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java
View File

@@ -11,7 +11,6 @@ package com.nis.web.controller.configuration.manipulation;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -38,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/manipulation/ratelimit") @RequestMapping("${adminPath}/manipulation/ratelimit")
public class RatelimitController extends CommonController { public class RatelimitController extends CommonController {
@RequestMapping(value = {"/ip/list"}) @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) { public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response); this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/manipulation/ratelimit/ip"); model.addAttribute("urlPrefix","/manipulation/ratelimit/ip");
@@ -46,7 +45,7 @@ public class RatelimitController extends CommonController {
return "/cfg/common/ipList"; return "/cfg/common/ipList";
} }
@RequestMapping(value = {"/domain/list"}) @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) { public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._domainList(cfgName,model, cfg, request, response); this._domainList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/manipulation/ratelimit/domain"); model.addAttribute("urlPrefix","/manipulation/ratelimit/domain");

3
src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
View File

@@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.ntc;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -27,7 +26,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/ntc/iplist") @RequestMapping("${adminPath}/ntc/iplist")
public class IpController extends CommonController{ public class IpController extends CommonController{
@RequestMapping(value = {"list"}) @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) { public String list(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName, model, cfg, request, response); this._ipList(cfgName, model, cfg, request, response);
model.addAttribute("urlPrefix","/ntc/iplist"); model.addAttribute("urlPrefix","/ntc/iplist");

5
src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
View File

@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
@@ -37,7 +36,7 @@ import com.nis.web.controller.configuration.CommonController;
public class WhiteListController extends CommonController{ public class WhiteListController extends CommonController{
@RequestMapping(value = {"ip/list"}) @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) { public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(IpPortCfg.getTablename()); cfg.setTableName(IpPortCfg.getTablename());
Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r"); Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
@@ -47,7 +46,7 @@ public class WhiteListController extends CommonController{
return "/cfg/whitelist/ipList"; return "/cfg/whitelist/ipList";
} }
@RequestMapping(value = {"domain/list"}) @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) { public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
cfg.setTableName(HttpUrlCfg.getTablename()); cfg.setTableName(HttpUrlCfg.getTablename());
Page<HttpUrlCfg> searchPage=new Page<HttpUrlCfg>(request,response,"r"); Page<HttpUrlCfg> searchPage=new Page<HttpUrlCfg>(request,response,"r");

5
src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java
View File

@@ -11,7 +11,6 @@ package com.nis.web.controller.configuration.proxy;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -38,7 +37,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/proxy/control") @RequestMapping("${adminPath}/proxy/control")
public class ControlController extends CommonController { public class ControlController extends CommonController {
@RequestMapping(value = {"/ip/list"}) @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) { public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response); this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/control/ip"); model.addAttribute("urlPrefix","/proxy/control/ip");
@@ -46,7 +45,7 @@ public class ControlController extends CommonController {
return "/cfg/common/ipList"; return "/cfg/common/ipList";
} }
@RequestMapping(value = {"/domain/list"}) @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) { public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._domainList(cfgName,model, cfg, request, response); this._domainList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/control/domain"); model.addAttribute("urlPrefix","/proxy/control/domain");

5
src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
View File

@@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.proxy;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model; import org.springframework.ui.Model;
@@ -28,7 +27,7 @@ import com.nis.web.controller.configuration.CommonController;
@RequestMapping("${adminPath}/proxy/intercept") @RequestMapping("${adminPath}/proxy/intercept")
public class InterceptController extends CommonController{ public class InterceptController extends CommonController{
@RequestMapping(value = {"/ip/list"}) @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) { public String ipList(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._ipList(cfgName,model, cfg, request, response); this._ipList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/intercept/ip"); model.addAttribute("urlPrefix","/proxy/intercept/ip");
@@ -36,7 +35,7 @@ public class InterceptController extends CommonController{
return "/cfg/common/ipList"; return "/cfg/common/ipList";
} }
@RequestMapping(value = {"/domain/list"}) @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) { public String domainList(String cfgName,Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
this._domainList(cfgName,model, cfg, request, response); this._domainList(cfgName,model, cfg, request, response);
model.addAttribute("urlPrefix","/proxy/intercept/domain"); model.addAttribute("urlPrefix","/proxy/intercept/domain");

2
src/main/webapp/WEB-INF/include/form/basicInfo.jsp
View File

@@ -25,7 +25,7 @@
<!--/span--> <!--/span-->
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><spring:message code="type"/></label> <label class="control-label col-md-3"><spring:message code="classification"/></label>
<div class="col-md-6"> <div class="col-md-6">
<c:set var="classifyValue" value=""></c:set> <c:set var="classifyValue" value=""></c:set>
<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify" varStatus="status"> <c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify" varStatus="status">

63
src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
View File

@@ -146,6 +146,67 @@
<!-- 筛选搜索内容栏默认隐藏--> <!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" > <div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='request_number'/></label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='type'/></label>
<form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fls}" var="fl" >
<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='attribute'/></label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${xzs}" var="xz" >
<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='label'/></label>
<form:select path="lable" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${lables}" var="lable" >
<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
@@ -213,7 +274,7 @@
<th><spring:message code="ratelimit"/></th> <th><spring:message code="ratelimit"/></th>
</c:if> </c:if>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="type"/></th> <th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th> <th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> <th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th> <th><spring:message code="valid_identifier"/></th>

64
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -155,6 +155,68 @@
<!-- 筛选搜索内容栏默认隐藏--> <!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" > <div class="col-md-12 filter-action-select-panle hide" >
<div class="row"> <div class="row">
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='request_number'/></label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${requestInfos}" var="requestInfo" >
<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='type'/></label>
<form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${fls}" var="fl" >
<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='attribute'/></label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${xzs}" var="xz" >
<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<label class="control-label"><spring:message code='label'/></label>
<form:select path="lable" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code="select"/></form:option>
<c:forEach items="${lables}" var="lable" >
<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
</c:forEach>
</form:select>
</div>
</div>
</div>
<div class="row">
<div class="col-md-2"> <div class="col-md-2">
<div class="form-group"> <div class="form-group">
<label><spring:message code="config_time"/>：</label> <label><spring:message code="config_time"/>：</label>
@@ -243,7 +305,7 @@
<th><spring:message code="redirect_content"/></th> <th><spring:message code="redirect_content"/></th>
</c:if> </c:if>
<th><spring:message code="letter"/></th> <th><spring:message code="letter"/></th>
<th><spring:message code="type"/></th> <th><spring:message code="classification"/></th>
<th><spring:message code="attribute"/></th> <th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th> <th><spring:message code="label"/></th>
<th><spring:message code="valid_identifier"/></th> <th><spring:message code="valid_identifier"/></th>