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

修正拦截策略ssl版本校验

Browse Source
This commit is contained in:
wangwei
2019-06-08 22:14:14 +08:00
parent a821ca4364
commit 3247d6fc9e
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -755,7 +755,7 @@ public class CheckIpFormatThread implements Callable<String>{
errInfo.append(String.format(prop.getProperty("is_incorrect"), errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("ssl_ver_max","max SSL version") + " ") + ";"); prop.getProperty("ssl_ver_max","max SSL version") + " ") + ";");
} }
if(minSort>=maxSort) { if(minSort>maxSort) {
errInfo.append(prop.getProperty("min_should_less_than_max","the min SSL version should less than the max SSL version") + ";"); errInfo.append(prop.getProperty("min_should_less_than_max","the min SSL version should less than the max SSL version") + ";");
} }
map.put("min", min); map.put("min", min);

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

@@ -703,7 +703,7 @@ public class CheckStringFormatThread implements Callable<String>{
errInfo.append(String.format(prop.getProperty("is_incorrect"), errInfo.append(String.format(prop.getProperty("is_incorrect"),
prop.getProperty("ssl_ver_max","max SSL version") + " ") + ";"); prop.getProperty("ssl_ver_max","max SSL version") + " ") + ";");
} }
if(minSort>=maxSort) { if(minSort>maxSort) {
errInfo.append(prop.getProperty("min_should_less_than_max","the min SSL version should less than the max SSL version") + ";"); errInfo.append(prop.getProperty("min_should_less_than_max","the min SSL version should less than the max SSL version") + ";");
} }
map.put("min", min); map.put("min", min);

2
src/main/resources/messages/message_en.properties
View File

@@ -1548,7 +1548,7 @@ format=Format
file_is_used=Policy is used file_is_used=Policy is used
none_profile_tip=Please Choose Profile Info! none_profile_tip=Please Choose Profile Info!
#---------------------------pxy intercept------------------------------------ #---------------------------pxy intercept------------------------------------
min_should_less_than_max=The min SSL version should less than the max SSL version min_should_less_than_max=The min SSL version should less than or equal the max SSL version
exclusions_ev_cert=Exclusion EV Cert exclusions_ev_cert=Exclusion EV Cert
exclusions_cert_transparency=Exclusion Cert Transparency exclusions_cert_transparency=Exclusion Cert Transparency
exclusions_client_cert_req=Exclusion Client Cert Request exclusions_client_cert_req=Exclusion Client Cert Request

2
src/main/resources/messages/message_ru.properties
View File

@@ -1550,7 +1550,7 @@ format=Format
file_is_used=Policy is used file_is_used=Policy is used
none_profile_tip=Please Choose Profile Info! none_profile_tip=Please Choose Profile Info!
#---------------------------pxy intercept------------------------------------ #---------------------------pxy intercept------------------------------------
min_should_less_than_max=The min SSL version should less than the max SSL version min_should_less_than_max=The min SSL version should less than or equal the max SSL version
exclusions_ev_cert=Exclusion EV Cert exclusions_ev_cert=Exclusion EV Cert
exclusions_cert_transparency=Exclusion Cert Transparency exclusions_cert_transparency=Exclusion Cert Transparency
exclusions_client_cert_req=Exclusion Client Cert Request exclusions_client_cert_req=Exclusion Client Cert Request

2
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1548,7 +1548,7 @@ format=\u683c\u5f0f
file_is_used=\u7b56\u7565\u88ab\u5f15\u7528 file_is_used=\u7b56\u7565\u88ab\u5f15\u7528
none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6! none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6!
#---------------------------pxy intercept------------------------------------ #---------------------------pxy intercept------------------------------------
min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6700\u5927SSL\u7248\u672c min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6216\u7B49\u4E8E\u6700\u5927SSL\u7248\u672c
exclusions_ev_cert=\u6392\u9664EV\u8bc1\u4e66 exclusions_ev_cert=\u6392\u9664EV\u8bc1\u4e66
exclusions_cert_transparency=\u6392\u9664\u8bc1\u4e66\u900f\u660e exclusions_cert_transparency=\u6392\u9664\u8bc1\u4e66\u900f\u660e
exclusions_client_cert_req=\u6392\u9664\u5ba2\u6237\u7aef\u8bc1\u4e66\u8bf7\u6c42 exclusions_client_cert_req=\u6392\u9664\u5ba2\u6237\u7aef\u8bc1\u4e66\u8bf7\u6c42

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -885,7 +885,7 @@ jQuery.validator.addMethod("sslVersionCheck",function(value,element) {
}else{ }else{
max=element,min=$("#min"); max=element,min=$("#min");
} }
if($(min).find("option:selected").data("sort")>=$(max).find("option:selected").data("sort")){ if($(min).find("option:selected").data("sort")>$(max).find("option:selected").data("sort")){
return false; return false;
}else{ }else{
return true; return true;