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

修改HTTP监测时用户自定义域的HTTP头部匹配区域字典获取

Browse Source 
Signed-off-by: zhangwei <zhangwei@intranet.com>
This commit is contained in:
zhangwei
2018-07-12 14:59:50 +08:00
parent 7ab708fd25
commit 0e4583e7a5
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,7 +450,7 @@ public final class Constants {
//HTTP自定义域相关参数 //HTTP自定义域相关参数
public static String HTTP_HEADER_USER_REGION_KEY=Configurations.getStringProperty("http_header_user_region_key", "HTTP_HEADER"); public static String HTTP_HEADER_USER_REGION_KEY=Configurations.getStringProperty("http_header_user_region_key", "HTTP_HEADER");
public static String HTTP_HEADER_DICT_MODULE=Configurations.getStringProperty("http_header_dict_module", "REQUEST_HEADER_DISTRICT"); public static String HTTP_HEADER_DICT_MODULE=Configurations.getStringProperty("http_header_dict_module", "HTTP_HEADER_DISTRICT");
//DNS自定义域参数 //DNS自定义域参数
public static String DNS_STRATEGY_USER_REGION_KEY=Configurations.getStringProperty("dns_strategy_user_region_key", "DNS_STRATEGY"); public static String DNS_STRATEGY_USER_REGION_KEY=Configurations.getStringProperty("dns_strategy_user_region_key", "DNS_STRATEGY");
} }

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

@@ -306,6 +306,10 @@ userregion_replace_type_key=zone
userregion_replace_req_key_value=http_req_body userregion_replace_req_key_value=http_req_body
userregion_replace_res_key_value=http_res_body userregion_replace_res_key_value=http_res_body
userregion_replace_regex_key=regex userregion_replace_regex_key=regex
#用户自定义域占位符
user_region_placeholder=
#用户自定义域分隔符
user_region_split=;
#IP相关验证正则 #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])$ 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)$ 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)$
@@ -322,12 +326,12 @@ redirect_response_code_startwith=30
sample_upload_url_keyword=/av sample_upload_url_keyword=/av
digest_upload_url_keyword=/fileTransfer digest_upload_url_keyword=/fileTransfer
#样例和摘要文件大小类型设置 #样例和摘要文件大小类型设置
sample_file_type=,mp4,flv,ivf,mp2v,jpg, sample_file_type=,mp3,mp4,flv,ivf,mp2v,jpg,
#10M 10485760 #10M 10485760
sample_single_file_max_size=10485760 sample_single_file_max_size=10485760
#12M 12582912 #12M 12582912
sample_total_file_max_size=12582912 sample_total_file_max_size=12582912
digest_file_type=,txt,doc,img, digest_file_type=,txt,doc,img,docx,pptx,xlsx,xls,ppt,
#10M10485760 #10M10485760
digest_single_file_max_size=10485760 digest_single_file_max_size=10485760
#12M12582912 #12M12582912
@@ -361,6 +365,6 @@ picture_sample_proc_param_is_translation=false
#picture_sample_proc_param_is_translation=true #picture_sample_proc_param_is_translation=true
#http自定义域相关参数 #http自定义域相关参数
http_header_user_region_key=HTTP_HEADER http_header_user_region_key=HTTP_HEADER
http_header_dict_module=REQUEST_HEADER_DISTRICT http_header_dict_module=HTTP_HEADER_DISTRICT
#dns自定义域参数key #dns自定义域参数key
dns_strategy_user_region_key=DNS_STRATEGY dns_strategy_user_region_key=DNS_STRATEGY

1
src/main/webapp/static/global/css/components.css
View File

@@ -22545,6 +22545,7 @@ transition: background-color .1s ease-in-out;
border-bottom: 0px; border-bottom: 0px;
cursor:pointer; cursor:pointer;
display: inline; display: inline;
width:auto;
} }
.content { .content {
width: 80%; width: 80%;