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

ProxyPolicyObject菜单：配置批量取消审核过滤被引用策略

Browse Source
This commit is contained in:
wangwei
2019-06-26 10:57:14 +08:00
parent 11a5d1a65f
commit 9d47a56130
6 changed files with 116 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -329,6 +329,8 @@ public class BaseController {
protected CommonGroupManageService commonGroupManageService;
@Autowired
protected ObjectGroupService objectGroupService;
@Autowired
protected StatusOfUsedService statusOfUsedService;
/**
* 管理基础路径
*/
@@ -4047,6 +4049,7 @@ public class BaseController {
}
}else if(className.equals("ProxyFileTrafficMirrorCfg")){
list = proxyFileTrafficMirrorService.findPage(page, searFileTrafficMirrorCfg).getList();
statusOfUsedService.removePolicyOfUsed(list,645);
for(int i=0;i<list.size();i++){
ProxyFileTrafficMirrorCfg cfg = (ProxyFileTrafficMirrorCfg) list.get(i);
ids.add(cfg.getCompileId());
@@ -4085,6 +4088,7 @@ public class BaseController {
}
}else if(className.equals("ProxyFileResponsePageCfg")){
list = proxyFileResponsePageService.findPage(page, searFileResponsePageCfg).getList();
statusOfUsedService.removePolicyOfUsed(list,646);
for(int i=0;i<list.size();i++){
ProxyFileResponsePageCfg cfg = (ProxyFileResponsePageCfg) list.get(i);
ids.add(cfg.getCompileId());
@@ -4104,6 +4108,7 @@ public class BaseController {
}
}else if(className.equals("ProxyFileHijackCfg")){
list = proxyFileHijackService.findPage(page, searFileHijackCfg).getList();
statusOfUsedService.removePolicyOfUsed(list,643);
for(int i=0;i<list.size();i++){
ProxyFileHijackCfg cfg = (ProxyFileHijackCfg) list.get(i);
ids.add(cfg.getCompileId());
@@ -4123,6 +4128,7 @@ public class BaseController {
}
}else if(className.equals("ProxyFileInsertScriptCfg")){
list = proxyFileInsertScriptService.findPage(page, searFileInsertScriptCfg).getList();
statusOfUsedService.removePolicyOfUsed(list,644);
for(int i=0;i<list.size();i++){
ProxyFileInsertScriptCfg cfg = (ProxyFileInsertScriptCfg) list.get(i);
ids.add(cfg.getCompileId());
@@ -4142,6 +4148,7 @@ public class BaseController {
}
}else if(className.equals("PxyObjKeyring")){
list = pxyObjKeyringService.findPage(page, searchObjKeyringCfg).getList();
statusOfUsedService.removePolicyOfUsed(list,520);
for(int i=0;i<list.size();i++){
PxyObjKeyring cfg = (PxyObjKeyring) list.get(i);
ids.add(cfg.getCompileId());

86
src/main/java/com/nis/web/service/configuration/StatusOfUsedService.java
View File

@@ -1,12 +1,19 @@
package com.nis.web.service.configuration;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.configuration.BaseCfg;
import com.nis.domain.configuration.CfgIndexInfo;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.WebsiteCfgDao;
import com.nis.web.service.BaseService;
import com.nis.web.service.CrudService;
@Service
@@ -18,4 +25,83 @@ public class StatusOfUsedService extends CrudService<WebsiteCfgDao, CfgIndexInfo
public List<CfgIndexInfo> getStatusOfUsed(CfgIndexInfo entity){
return websiteCfgDao.getStatusOfUsed(entity);
}
public List<BaseCfg> removePolicyOfUsed(List<BaseCfg> list,Integer ServiceId){
if(StringUtil.isEmpty(list)){
return list;
}
Integer functionId = 0;
String key = "";
//拦截证书策略
if(ServiceId==520){
functionId = 200;
ServiceId = 512;
key = "keyring";
}//流量转发目的地址
else if(ServiceId==645){
functionId = 200;
ServiceId = 512;
key = "mirror_profile";
}
//劫持文件、注入脚本文件
else if(ServiceId==643 || ServiceId==644){
functionId = 215;
ServiceId = 656;
}//访问阻断页面
else if(ServiceId==646){
functionId = 207;
ServiceId = 576;
}
if(ServiceId == 576 || ServiceId==656){
for(Iterator<BaseCfg> ite = list.iterator(); ite.hasNext();){
BaseCfg base = ite.next();
CfgIndexInfo cfg = new CfgIndexInfo();
if(ServiceId==656){
cfg.setUserRegion4(String.valueOf(base.getCompileId()));
}else if(ServiceId==576){
cfg.setUserRegion3(String.valueOf(base.getCompileId()));
}
cfg.setIsValid(-1);
cfg.setFunctionId(functionId);
cfg.setServiceId(ServiceId);
List<CfgIndexInfo> listCfg = websiteCfgDao.getStatusOfUsed(cfg);
if (!StringUtil.isEmpty(listCfg)) {
ite.remove();
}
}
return list;
}else if(ServiceId==512){
CfgIndexInfo cfg = new CfgIndexInfo();
cfg.setIsValid(-1);
cfg.setFunctionId(functionId);
cfg.setServiceId(ServiceId);
List<CfgIndexInfo> listCfg = websiteCfgDao.getStatusOfUsed(cfg);
Map<String,Map<String,Object>> tempMap = new HashMap<>();
List compileIdUsed = new ArrayList<Integer>();
//遍历获取引用策略compileId
for(Iterator<CfgIndexInfo> ite = listCfg.iterator(); ite.hasNext();){
BaseCfg base = ite.next();
tempMap = BaseService.gsonFromJson(base.getUserRegion1(), Map.class);
String value = "";
if("keyring".equals(key)){
value = String.valueOf(tempMap.get(key));
}else if("mirror_profile".equals(key)){
value = String.valueOf(tempMap.get("decrypt_mirror").get("mirror_profile"));
}
if(!compileIdUsed.contains(value) && !"1".equals(value) && !"0".equals(value)){
compileIdUsed.add(value);
}
}
//遍历去除引用策略
for(Iterator<BaseCfg> ite = list.iterator(); ite.hasNext();){
BaseCfg listEmpt = ite.next();
if(compileIdUsed.contains(String.valueOf(listEmpt.getCompileId()))){
ite.remove();
}
}
return list;
}
return list;
}
}

1
src/main/resources/messages/message_en.properties
View File

@@ -1550,6 +1550,7 @@ visit_response_page=Response Pages
format=Format
file_is_used=Policy is used
none_profile_tip=Please Choose Profile Info!
confirm_message_filter_used=Policy of used will be automatically filtered,Confirm?
#---------------------------pxy intercept------------------------------------
min_should_less_than_max=The min SSL version should less than or equal the max SSL version
exclusions_ev_cert=Exclusion EV Certificate

1
src/main/resources/messages/message_ru.properties
View File

@@ -1554,6 +1554,7 @@ visit_response_page=\u0421\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u041E\u044
format=\u0424\u043E\u0440\u043C\u0430\u0442
file_is_used=\u041F\u043E\u043B\u0438\u0442\u0438\u043A\u0430 \u0418\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442\u0441\u044F
none_profile_tip=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0432\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E \u043E \u043F\u0440\u043E\u0444\u0438\u043B\u0435!
confirm_message_filter_used=Policy of used will be automatically filtered,Confirm?
#---------------------------pxy intercept------------------------------------
min_should_less_than_max=\u041C\u0438\u043D. \u0432\u0435\u0440\u0441\u0438\u044F SSL \u0434\u043E\u043B\u0436\u043D\u0430 \u0431\u044B\u0442\u044C \u043C\u0435\u043D\u044C\u0448\u0435 \u0438\u043B\u0438 \u0440\u0430\u0432\u043D\u0430 \u043C\u0430\u043A\u0441. \u0432\u0435\u0440\u0441\u0438\u0438 SSL
exclusions_ev_cert=\u0418\u0441\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 EV Cert

1
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1550,6 +1550,7 @@ visit_response_page=\u8bbf\u95ee\u963b\u65ad\u9875\u9762
format=\u683c\u5f0f
file_is_used=\u7b56\u7565\u88ab\u5f15\u7528
none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6!
confirm_message_filter_used=\u5C06\u81EA\u52A8\u8FC7\u6EE4\u88AB\u5F15\u7528\u7684\u7B56\u7565,\u786E\u5B9A\u5417?
#---------------------------pxy intercept------------------------------------
min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6216\u7B49\u4E8E\u6700\u5927SSL\u7248\u672c
exclusions_ev_cert=\u6392\u9664EV\u8bc1\u4e66

26
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -472,12 +472,26 @@ function cancelPassOpt(url){
url = url+"&"
//配置批量取消
if(isBatch(url)){
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='cancel_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
var functionId=$("#functionId").val();
if(functionId == 516
||functionId == 515
||functionId == 514
||functionId == 513
||functionId == 570){
top.$.jBox.confirm("<spring:message code='confirm_message_filter_used'/>","<spring:message code='cancel_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
}else {
top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='cancel_all'/>",function(v,h,f){
if(v=="ok"){
$("#searchForm").attr("action",url);
page();
}
});
}
}else{
top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
return;