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:
wangwei
2019-06-26 15:01:17 +08:00
parent a1f0f432e7
commit 714ac134f8
4 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
View File

@@ -196,8 +196,9 @@
<!-- 判断是否批量操作 -->
<when test="batchValidValue != null and batchValidValue != ''">
AND a.IS_VALID in (${batchValidValue})
<!-- 批量操作不针对compie_id=0的拦截配置 -->
<!-- 批量操作不针对compie_id=0和1的拦截配置 -->
AND a.compile_id != 0
AND a.compile_id != 1
</when>
<otherwise>
<if test="isValid != null">

7
src/main/resources/sql/20190604/intercept-built-in.sql
View File

@@ -4,3 +4,10 @@ VALUES ('default intercept policy', 128, 0, 0, 6, now(), NULL, NULL, NULL, NULL,
INSERT INTO `http_url_cfg`
(`cfg_desc`, `cfg_keywords`, `action`, `is_valid`, `is_audit`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `service_id`, `request_id`, `compile_id`, `is_area_effective`, `classify`, `attribute`, `lable`, `expr_type`, `match_method`, `is_hexbin`, `area_effective_ids`, `function_id`, `cfg_region_code`, `cfg_type`, `ratelimit`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`)
VALUES ('default intercept policy', '20190946.com', 128, 0, 0, 6, now(), NULL, NULL, NULL, NULL, 521, 0, 0, 0, '0', '0', '0', 0, 1, 2, '', 200, 2, 'PXY_INTERCEPT_DOMAIN', NULL, NULL, NULL, NULL, NULL, NULL);
#添加内置拦截白名单策略
INSERT INTO `cfg_index_info`
(`cfg_desc`, `action`, `is_valid`, `is_audit`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `service_id`, `request_id`, `compile_id`, `is_area_effective`, `classify`, `attribute`, `lable`, `area_effective_ids`, `function_id`, `dns_strategy_id`, `do_log`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`, `office_id`, `cancel_request_id`, `source_compile_id`, `do_blacklist`, `common_group_ids`)
VALUES ('built-in fe3.delivery.mp.microsoft.com', 128, 0, 0, 6, now(), NULL, NULL, NULL, NULL, 521, 0, 1, 0, '0', '0', '0', '', 200, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, '');
INSERT INTO `http_url_cfg`
(`cfg_desc`, `cfg_keywords`, `action`, `is_valid`, `is_audit`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `auditor_id`, `audit_time`, `service_id`, `request_id`, `compile_id`, `is_area_effective`, `classify`, `attribute`, `lable`, `expr_type`, `match_method`, `is_hexbin`, `area_effective_ids`, `function_id`, `cfg_region_code`, `cfg_type`, `ratelimit`, `user_region1`, `user_region2`, `user_region3`, `user_region4`, `user_region5`)
VALUES ('built-in fe3.delivery.mp.microsoft.com', 'fe3.delivery.mp.microsoft.com', 128, 0, 0, 6, now(), NULL, NULL, NULL, NULL, 521, 0, 1, 0, '0', '0', '0', 0, 0, 2, '', 200, 2, 'PXY_INTERCEPT_DOMAIN', NULL, NULL, NULL, NULL, NULL, NULL);

11
src/main/webapp/WEB-INF/tags/sys/delRow.tag
View File

@@ -252,8 +252,10 @@ function update(url){
top.$.jBox.tip("<spring:message code='built_in_tip'/>", "<spring:message code='info'/>");
return;
}
if(cked.attr("compileId")==1 && cked.attr("serviceId")==521){
top.$.jBox.tip('<spring:message code="built_in_tip"/>');
return;
}
doAll(checkboxes,url);
}else{
top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
@@ -322,7 +324,7 @@ function noPassOpt(url){
var builtInCompile=false;
$(checkboxes).filter(":checked").each(function(){
var compileId = $(this).attr("compileId");
if(compileId == 0){
if(compileId == 0 || compileId == 1){
builtInCompile=true;
}
});
@@ -400,7 +402,8 @@ function cancelPassOpt(url){
if(typeof serviceId != "undefined" && serviceIdJudge && typeof compileId != "undefined"){
compileIds.push(compileId);
}
if((compileId == 0) || (compileId==1 && serviceId==250) || (compileId==1 && serviceId==520)){
if((compileId == 0) || (compileId==1 && serviceId==250) || (compileId==1 && serviceId==520)
|| (compileId==1 && serviceId==521)){
builtInCompile=true;
}
});

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

@@ -511,7 +511,7 @@
<tr>
<td>
<span <c:if test="${indexCfg.compileId == 0}"> class="hidden"</c:if> id="open${status.index}" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}" compileId="${indexCfg.compileId}">
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}" compileId="${indexCfg.compileId}" serviceId="${indexCfg.serviceId}">
</td>
<td>${indexCfg.compileId }</td>
<td>