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:
wangxin
2018-07-04 11:07:36 +08:00
parent bad96e4366 1bc284243f
commit 04bb3f28e8
4 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/util/Constants.java
View File

@@ -389,6 +389,14 @@ public final class Constants {
public static final String USER_REGION_SPLIT = Configurations.getStringProperty("user_region_split", ";");
//用户自定义域占位符
public static final String USER_REGION_PLACEHOLDER = Configurations.getStringProperty("user_region_placeholder", ";;");
//HTTP REPLACE USER_REGION ZONE KEY
public static final String REPLACE_TYPE_KEY = Configurations.getStringProperty("userregion_replace_type_key", "zone");
//HTTP REPLACE USER_REGION ZONE REQ KEY VALUE
public static final String REPLACE_REQ_KEY_VALUE = Configurations.getStringProperty("userregion_replace_req_key_value", "http_req_replace_body");
//HTTP REPLACE USER_REGION ZONE RES KEY VALUE
public static final String REPLACE_RES_KEY_VALUE = Configurations.getStringProperty("userregion_replace_res_key_value", "http_res_replace_body");
//HTTP REPLACE USER_REGION REGEX KEY
public static final String REPLACE_REGEX_KEY = Configurations.getStringProperty("userregion_replace_regex_key", "regex");
//HTTP重定向配置域
public static final String HTTP_REDIRECT_URL_REGION = Configurations.getStringProperty("http_redirect_url_region","PXY_CTRL_HTTP_URL");

4
src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java
View File

@@ -94,7 +94,7 @@ public class ControlPolicyController extends BaseController{
Date auditTime=new Date();
for(String id :idArray){
try {
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime,Constants.REPLACE_REQ_KEY_VALUE);
} catch (MaatConvertException e) {
logger.error("配置下发失败",e);
addMessage(redirectAttributes, e.getMessage());
@@ -162,7 +162,7 @@ public class ControlPolicyController extends BaseController{
Date auditTime=new Date();
for(String id :idArray){
try {
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime);
controlPolicyService.audit(isAudit,isValid,functionId,id,auditTime,Constants.REPLACE_RES_KEY_VALUE);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.error("配置下发失败",e);

13
src/main/java/com/nis/web/service/configuration/ControlPolicyService.java
View File

@@ -156,7 +156,7 @@ public class ControlPolicyService extends BaseService{
}
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
public void audit(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime,String replaceKeyValue){
HttpBodyCfg entity = new HttpBodyCfg();
List<HttpBodyCfg> list = new ArrayList();
List<AreaIpCfg> areaIpCfgList = new ArrayList();
@@ -218,6 +218,17 @@ public class ControlPolicyService extends BaseService{
maatCfg.setGroupNum(groupRelationList.size());
maatCfg.setAreaIpRegionList(areaIpRegionList);
maatCfg.setIsValid(entity.getIsValid());
if(StringUtil.isEmpty(entity.getReplaceContent())) entity.setReplaceContent("");
// req replace body set zone
String replaceType=Constants.REPLACE_TYPE_KEY+"=";
replaceType=replaceType+replaceKeyValue;
//req replace body set regex
String replaceRegex=Constants.REPLACE_REGEX_KEY+"=";
replaceRegex=replaceRegex+entity.getReplaceContent();
//req replace body set user_region
maatCfg.setUserRegion(replaceType+ Constants.USER_REGION_SPLIT+replaceRegex);
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(auditTime);

4
src/main/resources/nis.properties
View File

@@ -298,6 +298,10 @@ userregion_ir_strategy=IR_STRATEGY
userregion_ir_type=ir_type
userregion_domian_id=DOMIAN_ID
userregion_domian_str=DOMIAN_STR
userregion_replace_type_key=zone
userregion_replace_req_key_value=http_req_replace_body
userregion_replace_res_key_value=http_res_replace_body
userregion_replace_regex_key=regex
#IP相关验证正则
ipv4_ip_subnet_regexp=^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}/(3[0-2]|[1-2][0-9]|[0-9])$
ipv6_ip_subnet_regexp=^\\s*((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}(:|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4}){0,4}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:?)|((:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\\s*/(0|2|4|8|16|32|64|128)$