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

http(s) 监测、白名单自定义域下发置"{}",http(s) 阻断、操控去除日志总量

Browse Source
This commit is contained in:
wangwei
2019-06-08 15:36:06 +08:00
parent 744a6eae55
commit df690cffd3
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/nis/util/SchedulerTaskUtil.java
View File

@@ -254,10 +254,11 @@ public class SchedulerTaskUtil {
if(entity.getServiceId().equals(656)) {
userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
}
//Intercept Policy
else if(entity.getServiceId().equals(521)) {
//Intercept Policy、http(s) 监测 、http(s) 白名单
else if(entity.getServiceId().equals(521) || entity.getServiceId().equals(592)
|| entity.getServiceId().equals(750)) {
userRegion="{}";
}
}
for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
ip.setIsValid(entity.getIsValid());

2
src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
View File

@@ -405,7 +405,7 @@ public class HttpRedirectPolicyController extends BaseController {
String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
if (entity.getFunctionId() == 207) {
cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-";
cfgIndexInfoNoExport = ",log_total,policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:response_code-userregion2:response_content-";
} else if (entity.getFunctionId() == 208) {
cfgIndexInfoNoExport = ",policy_name,group_name,userregion3,userregion4,userregion5,&userregion1:redirect_response_code-userregion2:redirect_url-";
} else if (entity.getFunctionId() == 209) {

2
src/main/java/com/nis/web/controller/configuration/proxy/ManipulatPolicyController.java
View File

@@ -432,7 +432,7 @@ public class ManipulatPolicyController extends BaseController {
}
}
String cfgIndexInfoNoExport = ",policy_name,group_name,userregion1,&method_export:method-responseCode:response_code-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-";
String cfgIndexInfoNoExport = ",log_total,policy_name,group_name,userregion1,&method_export:method-responseCode:response_code-userregion2:redirect_url-userregion3:replace_zone-userregion4:replaced_content-userregion5:replace_content-";
String httpUrlCfgNoExport = ",do_log,action,config_describe,valid_identifier,is_audit,creator,creator"
+ ",config_time,editor,edit_time,auditor,audit_time"

5
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -477,8 +477,9 @@ public class ConfigSynchronizationService extends BaseService{
if(entity.getServiceId().equals(656)) {
userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
}
//Intercept Policy
else if(entity.getServiceId().equals(521)) {
//Intercept Policy、http(s) 监测 、http(s) 白名单
else if(entity.getServiceId().equals(521) || entity.getServiceId().equals(592)
|| entity.getServiceId().equals(750)) {
userRegion="{}";
}

4
src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
View File

@@ -549,6 +549,10 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
if(StringUtil.isEmpty(userRegion)){
userRegion=Constants.USER_REGION_PLACEHOLDER;
}
//http(s) 监测、http(s) 白名单
if(entity.getServiceId().equals(592) || entity.getServiceId().equals(750)) {
userRegion="{}";
}
maatCfg.setUserRegion(userRegion);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);