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 17:28:09 +08:00
parent 2bee7a7f68
commit a821ca4364
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -899,7 +899,7 @@ public class ExportExcel {
//allow_http2 //allow_http2
if("ssl_ver_allow_http2".equals(headerStr)) { if("ssl_ver_allow_http2".equals(headerStr)) {
commentStr=""; commentStr="";
defaultValue="1"; defaultValue="0";
commentStr=msgProp.getProperty("select")+":\n"+commentStr; commentStr=msgProp.getProperty("select")+":\n"+commentStr;
index++; index++;
commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n"; commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";

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

@@ -720,7 +720,7 @@ public class CheckIpFormatThread implements Callable<String>{
} }
} }
if(allowHttp2==null) { if(allowHttp2==null) {
allowHttp2=1; allowHttp2=0;
map.put("allow_http2", allowHttp2); map.put("allow_http2", allowHttp2);
}else { }else {
if(allowHttp2!=0&&allowHttp2!=1) { if(allowHttp2!=0&&allowHttp2!=1) {

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

@@ -667,6 +667,17 @@ public class CheckStringFormatThread implements Callable<String>{
map.put("mirror_client", mirrorClient); map.put("mirror_client", mirrorClient);
} }
} }
if(allowHttp2==null) {
allowHttp2=0;
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) { if(mirrorClient==0) {
int minSort=0,maxSort=0; int minSort=0,maxSort=0;
if(StringUtils.isBlank(min)) { if(StringUtils.isBlank(min)) {
@@ -675,17 +686,6 @@ public class CheckStringFormatThread implements Callable<String>{
if(StringUtils.isBlank(max)) { if(StringUtils.isBlank(max)) {
max="tls13"; 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) { for(SysDataDictionaryItem sslversion: sslversions) {
if(sslversion.getItemCode().equals(min)) { if(sslversion.getItemCode().equals(min)) {
minSort=sslversion.getItemSort(); minSort=sslversion.getItemSort();

4
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -878,8 +878,8 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<div class="bootstrap-switch"> <div class="bootstrap-switch">
<input type="checkbox" id="allow_http2" name="allow_http2" class="switch form-control sslVersionCheck" <input type="checkbox" id="allow_http2" name="allow_http2" class="switch userRegion"
value="${_cfg.cfgId eq null?1:_cfg.userRegion.ssl_ver.allow_http2 }" <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.ssl_ver.allow_http2 eq 1}">checked</c:if>/> value="${_cfg.userRegion.ssl_ver.allow_http2 }" <c:if test="${_cfg.userRegion.ssl_ver.allow_http2 eq 1}">checked</c:if>/>
</div> </div>
</div> </div>
<div for="allow_http2"></div> <div for="allow_http2"></div>