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

feat(策略对象组): 添加whitelist

Browse Source 
执行whitelist.sql，更新form.jsp和service_config.xml
This commit is contained in:
wangxin
2019-10-30 14:01:51 +08:00
parent 32fe2bb3d3
commit faed29c8b8
3 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/service/service_config.xml
View File

@@ -3,7 +3,7 @@
<!-- NTC或PROXY MAAT类配置开始 -->
<!-- IP Whitelist -->
<service id="1" functionId="3" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP白名单">
<serviceCfg cfgType="1" tableName="ip_port_cfg" ></serviceCfg>
<serviceCfg cfgType="1" tableName="ip_port_cfg" maatTable="WHITE_LIST_IP"></serviceCfg>
</service>
<!-- IP Address -->
<service id="16" functionId="5" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="IP地址封堵">
@@ -439,4 +439,5 @@
</service>
<service id="0" serviceIds="512,592,128,129,130,131,132,133,143,146,150,151" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>
<service id="-1" serviceIds="576,16,17,18,19,20,21,31,34,38,39" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service>
<service id="-2" serviceIds="1" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组白名单"></service>
</serviceList>

4
src/main/resources/sql/20191030/whitelist.sql Normal file
View File

@@ -0,0 +1,4 @@
# function_service_dict 加入whitelist
INSERT INTO `function_service_dict`(`function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`, `is_import`, `sort`, `config_do_log`) VALUES (888, 0, 128, 'whitelist', -2, 'obj_group_whitelist', NULL, 1, NULL, NULL, NULL, NULL, NULL, 0, 0, '1;0,2;0');
# OBJ_GROUP_PROTOCOL 加入whitelist
INSERT INTO `sys_data_dictionary_item`(`item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) select 'whitelist', 'White List', '白名单', 13, 1, 1, sn.id from `sys_data_dictionary_name` sn where sn.mark='OBJ_GROUP_PROTOCOL';

34
src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
View File

@@ -10,10 +10,16 @@
</style>
<script type="text/javascript">
$(function(){
if('${_cfg.action}'!=1 && '${_cfg.action}'!=""){
if('${_cfg.action}'==16){
$("[name='userRegion1'] option:not([value=whitelist])").removeClass("hidden").removeClass("disabled");
$("[name='userRegion1'] option[value=intercept]").addClass("hidden").addClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
}else{}
}else if('${_cfg.action}'==128){
$("[name='userRegion1'] option:not([value=whitelist])").addClass("hidden").addClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").addClass("hidden").addClass("disabled");
}
if('${_cfg.userRegion1}'=='intercept'){
$(".domainGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled");
@@ -37,29 +43,39 @@ $(function(){
processDoLog(configDoLog);
$(".action").on("change", function() {
//$("#serviceId").val($(this).attr("serviceId"));
changeServiceId();
$("#protocolId").val($(this).attr("protocolId"));
var action=$("input[name='action']:checked").val();
switchAction(action);
//处理页面协议
if($(this).val()!="1"){
if($("[name='userRegion1']").val()=="intercept"){//拦截隐藏
if($(this).val()=="16"){
$("[name='userRegion1'] option:not([value=whitelist])").removeClass("hidden").removeClass("disabled");
if($("[name='userRegion1']").val()=="intercept"||$("[name='userRegion1']").val()=="whitelist"){//拦截隐藏
$("[name='userRegion1']").selectpicker("val","");
$("[name='userRegion1']").change();
}
$("[name='userRegion1'] option[value=intercept]").addClass("hidden").addClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
}else{
}else if($(this).val()=="1"){
$("[name='userRegion1'] option:not([value=whitelist])").removeClass("hidden").removeClass("disabled");
$("[name='userRegion1'] option[value=intercept]").removeClass("hidden").removeClass("disabled");
if($("[name='userRegion1']").val()=="whitelist"){
$("[name='userRegion1']").selectpicker("val","");
$("[name='userRegion1']").change();
}
if($("[name='userRegion1']").val()=="intercept"){
$(".domainGroup").removeClass("hidden").removeClass("disabled");
}else{
$(".domainGroup").addClass("hidden").addClass("disabled");
}
}else{// 128
$("[name='userRegion1'] option:not([value=whitelist])").addClass("hidden").addClass("disabled");
$("[name='userRegion1']").selectpicker('val','whitelist');
}
$("[name='userRegion1']").selectpicker("refresh");
changeServiceId();
var serviceId=$("[name='serviceId']").val();
var configDoLog=$("#serviceId_"+serviceId).attr("configDoLog");
processDoLog(configDoLog);
@@ -73,7 +89,7 @@ $(function(){
$(".urlGroup").removeClass("hidden").removeClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
}else if(""==$(this).val()||"bgp"==$(this).val()){
}else if(""==$(this).val()||"bgp"==$(this).val()||'whitelist'==$(this).val()){
$(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").addClass("hidden").addClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
@@ -81,7 +97,7 @@ $(function(){
$(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled");
}else{
}else {
$(".urlGroup").removeClass("hidden").removeClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".domainGroup").removeClass("hidden").removeClass("disabled");
@@ -246,6 +262,8 @@ var changeServiceId=function () {
}else if("voip"==protocolType){
$("#serviceId").val(38);
}
}else if(128==action){
$("#serviceId").val(1);
}
}
</script>