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-06-08 16:07:20 +08:00
parent df690cffd3
commit 5f8a9b43fc
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -719,6 +719,17 @@ public class CheckIpFormatThread implements Callable<String>{
map.put("mirror_client", mirrorClient);
}
}
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);
}
}
if(mirrorClient==0) {
int minSort=0,maxSort=0;
if(StringUtils.isBlank(min)) {
@@ -726,18 +737,7 @@ 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();