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

拦截策略新增allow_http2

Browse Source
This commit is contained in:
wangwei
2019-05-28 13:36:36 +08:00
parent 84c10eac7d
commit e9bb74d9fd
14 changed files with 120 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/nis/util/excel/ExportExcel.java
View File

@@ -896,6 +896,25 @@ public class ExportExcel {
index++;
}
}
//allow_http2
if("ssl_ver_allow_http2".equals(headerStr)) {
commentStr="";
defaultValue="1";
commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++;
commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
index++;
commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
index++;
commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
index++;
//1、默认值说明
if(!StringUtil.isEmpty(defaultValue)){
commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
index++;
}
index++;
}
if("decrypt_mirror_enable".equals(headerStr)) {
commentStr="";
defaultValue="0";

12
src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java
View File

@@ -579,6 +579,7 @@ public class CheckIpFormatThread implements Callable<String>{
String min=baseIpCfg.getMin();
String max=baseIpCfg.getMax();
Integer mirrorClient=baseIpCfg.getMirrorClient();
Integer allowHttp2=baseIpCfg.getAllowHttp2();
Integer enable=baseIpCfg.getEnable();
Integer mirrorProfile=baseIpCfg.getMirrorProfile();
Map<String,Object> userRegionMap=new HashMap<>();
@@ -726,6 +727,17 @@ public class CheckIpFormatThread implements Callable<String>{
if(StringUtils.isBlank(max)) {
max="tls13";
}
if(allowHttp2==null) {
allowHttp2=1;
map.put("allow_http2", allowHttp2);
}else {
if(allowHttp2!=0&&allowHttp2!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("ssl_ver_allow_http2","SSL version allow http2") + " ") + ";");
}else {
map.put("allow_http2", allowHttp2);
}
}
for(SysDataDictionaryItem sslversion: sslversions) {
if(sslversion.getItemCode().equals(min)) {
minSort=sslversion.getItemSort();

12
src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java
View File

@@ -527,6 +527,7 @@ public class CheckStringFormatThread implements Callable<String>{
String min=baseStringCfg.getMin();
String max=baseStringCfg.getMax();
Integer mirrorClient=baseStringCfg.getMirrorClient();
Integer allowHttp2=baseStringCfg.getAllowHttp2();
Integer enable=baseStringCfg.getEnable();
Integer mirrorProfile=baseStringCfg.getMirrorProfile();
Map<String,Object> userRegionMap=new HashMap<>();
@@ -674,6 +675,17 @@ public class CheckStringFormatThread implements Callable<String>{
if(StringUtils.isBlank(max)) {
max="tls13";
}
if(allowHttp2==null) {
allowHttp2=1;
map.put("allow_http2", allowHttp2);
}else {
if(allowHttp2!=0&&allowHttp2!=1) {
errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("ssl_ver_allow_http2","SSL version allow http2") + " ") + ";");
}else {
map.put("allow_http2", allowHttp2);
}
}
for(SysDataDictionaryItem sslversion: sslversions) {
if(sslversion.getItemCode().equals(min)) {
minSort=sslversion.getItemSort();