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

十六进制校验去掉关键字的间隔符

Browse Source
This commit is contained in:
duandongmei
2018-09-13 18:14:38 +08:00
parent e5b7661fbc
commit c49bf6985e
26 changed files with 59 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/sql/20180913/update-sys_menu-voip.sql
View File

@@ -3,4 +3,9 @@ UPDATE sys_menu set permission='avVoipAccount:config',href='/ntc/av/voipAccountL
UPDATE sys_menu set permission='avVoipIp:confirm',href='/ntc/av/voipList' where id=662;
UPDATE sys_menu set permission='avVoipAccount:confirm',href='/ntc/av/voipAccountList' where id=663;
UPDATE sys_menu set permission='avVoipIp:audit',href='/ntc/av/voipList' where id=832;
UPDATE sys_menu set permission='avVoipAccount:audit',href='/ntc/av/voipAccountList' where id=833;
UPDATE sys_menu set permission='avVoipAccount:audit',href='/ntc/av/voipAccountList' where id=833;
#修改来函和专项权限标识
update sys_menu set permission='cfg:requestInfo:confirm',name='审核',code='confirm' where id=222;
update sys_menu set permission='cfg:requestInfo:config',name='操作',code='config' where id=221;
update sys_menu set permission='basics:taskInfo:config',name='操作',code='config' where id=223;
update sys_menu set permission='basics:taskInfo:confirm',name='审核',code='confirm' where id=224;

32
src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
View File

@@ -9,34 +9,14 @@
<body>
<div class="page-content">
<c:set var ="isOptator" value="false"></c:set>
<c:set var ="isConfirmor" value="false"></c:set>
<c:set var ="isAuditor" value="false"></c:set>
<c:forEach items="${fns:getUser().userRoleList}" var="role">
<c:if test="${role.id ==28}">
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==27}">
<c:set var ="isConfirmor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==26}">
<c:set var ="isOptator" value="true"></c:set>
</c:if>
<c:if test="${role.id ==1}">
<c:set var ="isOptator" value="true"></c:set>
<c:set var ="isConfirmor" value="true"></c:set>
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
</c:forEach>
<shiro:hasPermission name="basics:taskInfo:edit">
<c:if test="${isOptator }">
<shiro:hasPermission name="basics:taskInfo:config">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/basics/taskInfo/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"/></button>
</div>
</c:if>
</shiro:hasPermission>
<h3 class="page-title">
<spring:message code="special_task"></spring:message>
@@ -84,15 +64,14 @@
</div>
<div class="pull-right">
<shiro:hasPermission name="basics:taskInfo:edit">
<c:if test="${isOptator }">
<shiro:hasPermission name="basics:taskInfo:config">
<button type="button" class="btn btn-default" onclick="edit()">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
<sys:delRow url="${ctx}/basics/taskInfo/delete" id="contentTable" label="delete"></sys:delRow>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
</c:if>
<c:if test="${isConfirmor }">
</shiro:hasPermission>
<shiro:hasPermission name="basics:taskInfo:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -104,7 +83,6 @@
<li><sys:delRow url="${ctx}/basics/taskInfo/taskCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</c:if>
</shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">

1
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -66,6 +66,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","")
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

1
src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
View File

@@ -40,6 +40,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","")
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

1
src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
View File

@@ -32,6 +32,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","")
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
View File

@@ -62,7 +62,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp
View File

@@ -65,7 +65,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp
View File

@@ -73,7 +73,8 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/form.jsp
View File

@@ -50,7 +50,8 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
keywords=keywords.replace("***and***","")
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"
+ $(this).attr("name").replace("isHexbin","cfgKeywords")

3
src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
View File

@@ -45,7 +45,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
keywords=keywords.replace("***and***","")
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"
+ $(this).attr("name").replace("isHexbin","cfgKeywords")

3
src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
View File

@@ -65,7 +65,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

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

@@ -51,31 +51,8 @@
top.$.jBox.tip("<spring:message code='one_more_area'/>", "<spring:message code='info'/>");
return;
}
$(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
if($(this).val()==''){
$(this).parents(".form-group").find(
"div[for='"
+ $(this).attr("name")
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
flag = false;
}
});
//keywords非空校验完成校验二进制字符串
$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"
+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
flag = false;
}
}
}
});
//校验tagInput的空和十六进制
flag=validateTagInputKeyword();
var flag1=validateInvisibleCharTag();
if(flag){
flag=flag1;
@@ -237,7 +214,7 @@
</div>
</div>
<!-- dolog begin-->
<div class="row">
<div class="row interceptDoLog hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="do_log" /></label>

6
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -338,7 +338,7 @@
<th><spring:message code="replace_content"/></th>
</c:if>
<th class="sort-column a.action"><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th>
<%-- <th><spring:message code="do_log"/></th> --%>
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="letter"/></th>
<th><spring:message code="classification"/></th>
@@ -408,13 +408,13 @@
</c:if>
</c:forEach>
</td>
<td>
<%-- <td>
<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
<c:if test="${dict.itemCode eq indexCfg.doLog }">
<spring:message code="${dict.itemValue }"/>
</c:if>
</c:forEach>
</td>
</td> --%>
<td>
<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
<c:if test="${indexCfg.isAreaEffective==1}">

3
src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
View File

@@ -126,7 +126,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/mail/mailForm.jsp
View File

@@ -71,7 +71,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
View File

@@ -57,7 +57,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
View File

@@ -60,7 +60,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectForm.jsp
View File

@@ -67,7 +67,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

31
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -9,34 +9,13 @@
<body>
<div class="page-content">
<c:set var ="isOptator" value="false"></c:set>
<c:set var ="isConfirmor" value="false"></c:set>
<c:set var ="isAuditor" value="false"></c:set>
<c:forEach items="${fns:getUser().userRoleList}" var="role">
<c:if test="${role.id ==28}">
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==27}">
<c:set var ="isConfirmor" value="true"></c:set>
</c:if>
<c:if test="${role.id ==26}">
<c:set var ="isOptator" value="true"></c:set>
</c:if>
<c:if test="${role.id ==1}">
<c:set var ="isOptator" value="true"></c:set>
<c:set var ="isConfirmor" value="true"></c:set>
<c:set var ="isAuditor" value="true"></c:set>
</c:if>
</c:forEach>
<shiro:hasPermission name="cfg:requestInfo:edit">
<c:if test="${isOptator }">
<shiro:hasPermission name="cfg:requestInfo:config">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/request/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"/></button>
</div>
</c:if>
</shiro:hasPermission>
<h3 class="page-title">
<spring:message code="requestInfo"></spring:message>
@@ -93,15 +72,14 @@
</div>
<div class="pull-right">
<shiro:hasPermission name="cfg:requestInfo:edit">
<c:if test="${isOptator }">
<shiro:hasPermission name="cfg:requestInfo:config">
<button type="button" class="btn btn-default" onClick="edit()">
<i class="fa fa-edit"></i> <spring:message code="edit"></spring:message></button>
<sys:delRow url="${ctx}/cfg/request/delete" id="contentTable" label="delete"></sys:delRow>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
</c:if>
<c:if test="${isConfirmor }">
</shiro:hasPermission>
<shiro:hasPermission name="cfg:requestInfo:confirm">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
@@ -113,7 +91,6 @@
<li><sys:delRow url="${ctx}/cfg/request/requestCancelExamine" id="contentTable" label="cancelPass"></sys:delRow></li>
</ul>
</div>
</c:if>
</shiro:hasPermission>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">

3
src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
View File

@@ -63,7 +63,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/website/httpForm.jsp
View File

@@ -106,7 +106,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
View File

@@ -69,7 +69,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
View File

@@ -49,7 +49,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

3
src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
View File

@@ -69,7 +69,8 @@
var isHexbin=$(this).val();
if(isHexbin == 1){ //十六进制
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
if(keywords != ''){
keywords=keywords.replace("***and***","")
if(keywords != ''){
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".boxSolid").find(
"div[for='"

2
src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css vendored
View File

@@ -2225,7 +2225,7 @@ table th[class*="col-"] {
background-color: #f8cace; }
.table-responsive {
overflow-x: auto;
/* overflow-x: auto; */
min-height: 0.01%; }
@media screen and (max-width: 767px) {
.table-responsive {

4
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -70,8 +70,8 @@
httpCheck:"Please enter a correct url(http[s]://xxx.xx)",
failed:"Failed",
go_back:"Go Back Policies",
log_5_minutes:"Log Five Minutes' Amount",
log_1_hour:"Log One Hour's Amount",
log_5_minutes:"Log For The Last Five Minutes",
log_1_hour:"Log For The Last Hour",
input:"Please Enter "
});
}(jQuery));