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

增加ip payload日志，与ip spoofing日志调用相同接口

Browse Source
This commit is contained in:
zhangwei
2018-12-29 17:55:35 +06:00
parent 95185070c6
commit 2b82aa1fd4
8 changed files with 63 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/nis/web/controller/log/ntc/OpenVpnLogController.java
View File

@@ -25,6 +25,7 @@ import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.SysUser;
import com.nis.domain.log.DkBehaviorLog;
import com.nis.domain.log.MmVoipLog;
import com.nis.domain.log.NtcCollectRadiusLog;
import com.nis.domain.log.NtcOpenVpnLog;
@@ -32,6 +33,7 @@ import com.nis.domain.log.NtcOpenVpnLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
import com.nis.util.StringUtil;
import com.nis.util.httpclient.HttpClientUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.security.UserUtils;
@@ -56,14 +58,20 @@ public class OpenVpnLogController extends BaseController{
PageLog<NtcOpenVpnLog> page = new PageLog<NtcOpenVpnLog>(request, response);
Map<String, Object> params=new HashMap<>();
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList);
if(StringUtil.isEmpty(entry.getAction())){
for(int i=0;i<serviceList.size();i++){
entry.setAction(serviceList.get(i).getAction());
break;
}
}
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
//查询值判断
initLogSearchValue(entry,params);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entry.getFunctionId());
model.addAttribute("serviceList", serviceList);
String url = "";
url = Constants.LOG_BASE_URL+Constants.NTC_OPENVPN_LOG;
//url = Constants.LOG_BASE_URL+Constants.NTC_IP_LOG;
@@ -104,6 +112,15 @@ public class OpenVpnLogController extends BaseController{
Map<String, String> noExportMap=new HashMap<String, String>();
//---------------------------
PageLog<NtcOpenVpnLog> page = new PageLog<NtcOpenVpnLog>(request, response);
List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId());
model.addAttribute("serviceList", serviceList);
if(StringUtil.isEmpty(log.getAction())){
for(int i=0;i<serviceList.size();i++){
log.setAction(serviceList.get(i).getAction());
break;
}
}
page.setPageNo(1);
page.setPageSize(Constants.MAX_LOG_EXPORT_SIZE);
Map<String, Object> params = new HashMap<String, Object>();
@@ -121,6 +138,10 @@ public class OpenVpnLogController extends BaseController{
Page<NtcOpenVpnLog> data = fromJson.getData();
list= data.getList();
}
for (NtcOpenVpnLog l : list) {
l.setFunctionId(log.getFunctionId());
setLogAction(l, serviceList);
}
}
titleList.add("spoofing_ip_policy");
classMap.put("spoofing_ip_policy", NtcOpenVpnLog.class);

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

@@ -1355,7 +1355,7 @@ translated_dest_ip=Translated destination address
translated_dest_port=Translated destination port
show_ips=View all IP
show_available_ips=View available IP
radius_log=Radius Identify
radius_log=Radius Log
message_type=Code
nas_ip=NAS IP Address
framed_ip=Framed IP Address

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

@@ -1359,14 +1359,14 @@ translated_dest_ip=\u041f\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043d\u043d\
translated_dest_port=\u041f\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u041f\u043e\u0440\u0442 \u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f
show_ips=\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0412\u0441\u0435 IP
show_available_ips=\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 IP
radius_log=Radius \u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u043e\u0432\u0430\u0442\u044c
radius_log=\u0416\u0443\u0440\u043D\u0430\u043B Radius
message_type=\u041a\u043e\u0434
nas_ip=NAS IP-\u0430\u0434\u0440\u0435\u0441
framed_ip=Framed IP-\u0430\u0434\u0440\u0435\u0441
log_user_name=\u0418\u043c\u044f \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f
av_tips=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0438\u043d\u0434\u0435\u043a\u0441\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0430\u0443\u0434\u0438\u043e \u0438 \u0432\u0438\u0434\u0435\u043e \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0432 \u0445\u0432\u043e\u0441\u0442\u0435 \u0430\u0443\u0434\u0438\u043e \u0438 \u0432\u0438\u0434\u0435\u043e \u0444\u0430\u0439\u043b\u043e\u0432. \u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0432\u0438\u0434\u0435\u043e \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435\u043c \u0432\u044b\u0448\u0435 1080P.
asn_ip_group_delete=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f IP \u0432 \u044d\u0442\u043e\u0439 \u0433\u0440\u0443\u043f\u043f\u0435 ASN \u0442\u0430\u043a\u0436\u0435 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043b\u0435\u043d\u0430.
keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u043c\u0438 \u0441\u043b\u043e\u0432\u0430\u043c\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043b\u043e\u0445\u0438\u043c, \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0434\u0435\u0434\u0443\u043f\u043b\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0433\u043e \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0434\u0430\u043d\u043d\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e \u7395u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 URL\ufffd \u0434\u043b\u044f \u043f\u043e\u0434\u0430\u0432\u0448\u0435\u0433\u043e \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430.
keyword_log_tips=\u041A\u043E\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u043F\u043B\u043E\u0445\u0438\u043C, \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u043E\u0447\u0438\u0441\u0442\u043A\u0438 \u0436\u0443\u0440\u043D\u0430\u043B\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u043E\u0434\u0430\u0432\u0448\u0438\u0439 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442 \u043D\u0430 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E ''\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 URL''.
conn_record=\u0417\u0430\u043f\u0438\u0441\u0438 \u041f\u043e\u0434\u043a\u044e\u0447\u0435\u043d\u0438\u0439
bps=Gbps
bps_percent=Bps Percent
@@ -1416,7 +1416,7 @@ upload_limit_is=The limitation of file uplaod is
count=Count
do_blacklist=Blacklist Option
l3_header_error=Only four attribute values are allowed to be entered at most
IP_HEADER=IP Header
IP_HEADER=IP Headerx
ICMP_HEADER=ICMP Header
offset_expression=Offset Expression
cfg_custom=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0435 \u0421\u0442\u043e\u043b\u0431\u0446\u044b
@@ -1439,4 +1439,4 @@ min_length=Minimum Length
length_error=Length Error
duplicate=Duplicate
print=Print
traffic_connect_log=\u041B\u043E\u0433 \u0422\u0440\u0430\u0444\u0438\u043A\u0430
traffic_connect_log=\u0416\u0443\u0440\u043D\u0430\u043B \u0422\u0440\u0430\u0444\u0438\u043A\u0430

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

@@ -1355,7 +1355,7 @@ show_ips=\u67e5\u770b\u6240\u6709IP
show_available_ips=\u67e5\u770b\u53ef\u7528IP
website_keyword_monit=\u5173\u952e\u5b57\u76d1\u6d4b
website_keyword_reject=\u5173\u952e\u5b57\u963b\u65ad
radius_log=Radius \u534f\u8bae
radius_log=Radius \u65E5\u5FD7
message_type=Code
nas_ip=NAS IP Address
framed_ip=Framed IP Address
@@ -1435,4 +1435,4 @@ min_length=\u6700\u5c0f\u957f\u5ea6
length_error=\u957f\u5ea6\u9519\u8bef
duplicate=\u91cd\u590d\u7684
print=\u6253\u5370
traffic_connect_log=\u9646\u826F\u65E5\u5FD7
traffic_connect_log=\u6D41\u91CF\u65E5\u5FD7

8
src/main/resources/sql/20181229/add_sys_menu.sql Normal file
View File

@@ -0,0 +1,8 @@
-- 新增ip payload日志菜单，以及ip spoofing,ip payload实时统计菜单
INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('940', '0,1,152,940,', 'ip_payload', 'IP Payload', '64', '/log/ntc/ntcOpenvpnLogs/list', '', '', '1', '', '1', '2018-12-29 14:59:51', '1', '2018-12-29 14:59:51', '', '1', NULL, '0', '0', '212');
INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ( '943', '0,1,780,943,', 'ip_payload', 'IP Payload', '60', '/report/list?cfgName=ip_payload&amp;reportType=1', '', '', '1', '', '1', '2018-12-29 15:05:12', '1', '2018-12-29 15:05:12', '', '1', NULL, '0', '0', '212');
INSERT INTO `sys_menu` ( `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ( '943', '0,1,780,943,', 'spoofing_ip_policy', 'IP Spoofing', '90', '/report/list?cfgName=spoofing_ip_policy&amp;reportType=1', '', '', '1', '', '1', '2018-12-29 15:06:02', '1', '2018-12-29 16:02:03', '', '1', NULL, '0', '0', '214');
-- 新增流量日志菜单，并修改通联关系域radius日志为流量日志下的子菜单
INSERT INTO `sys_menu` (`id`, `parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('1217', '152', '0,1,152,', 'traffic_connect_log', 'Traffic Connect Log', '190', '', '', '', '1', '', '1', '2018-12-29 14:06:08', '1', '2018-12-29 14:06:08', '', '1', NULL, '0', '0', NULL);
UPDATE `sys_menu` SET `id`='1179', `parent_id`='1217', `parent_ids`='0,1,152,1217,', `code`='radius_log', `name`='RADIUS协议日志', `sort`='80', `href`='/log/ntc/radiusLogs', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-12-12 15:14:37', `update_by`='1', `update_date`='2018-12-29 14:06:33', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`='0' WHERE (`id`='1179');
UPDATE `sys_menu` SET `id`='1181', `parent_id`='1217', `parent_ids`='0,1,152,1217,', `code`='conn_record', `name`='通联关系', `sort`='110', `href`='/log/ntc/connRecordLogs', `target`='', `icon`='', `is_show`='1', `permission`='', `create_by`='1', `create_date`='2018-12-15 15:47:32', `update_by`='1', `update_date`='2018-12-29 14:06:55', `remarks`='', `del_flag`='1', `menu_bg`=NULL, `quick_action`='0', `is_top`='0', `function_id`=NULL WHERE (`id`='1181');

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

@@ -114,8 +114,8 @@ function update(url){
top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
return;
}else if(cked.val()==3){
/* top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return; */
top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
return;
}
//处理asnIp,asn组下发过的ip配置不允许修改
if(cked.attr("serviceGroupId")&&cked.attr("isValid")){

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

@@ -441,7 +441,7 @@
<spring:message code="bypass"/>
</c:if>
<c:if test="${indexCfg.action eq 48}">
<spring:message code="spoofing"/>
<spring:message code="action_spoofing"/>
</c:if>
<c:if test="${(indexCfg.action ne 1) && (indexCfg.action ne 128) && (indexCfg.action ne 48)}">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

24
src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
View File

@@ -58,7 +58,15 @@ $(document).ready(function(){
varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) }">
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
<form:option value="${service.serviceId}">
<c:if test="${service.serviceId eq 518 }">
<spring:message code="action_spoofing"/>
</c:if>
<c:if test="${service.serviceId ne 518 }">
<spring:message code="${dict.itemValue}"/>
</c:if>
</form:option>
</c:if>
</c:forEach>
</c:forEach>
@@ -227,9 +235,17 @@ $(document).ready(function(){
<td>
<c:set var="actions">${log.action }</c:set>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
<c:set var="actions">${dict.itemValue}</c:set>
</c:if>
<c:choose>
<c:when test="${log.service eq 518 }">
<c:set var="actions"><spring:message code="action_spoofing"/></c:set>
</c:when>
<c:otherwise>
<c:if test="${dict.itemCode eq log.action}">
<c:set var="actions">${dict.itemValue}</c:set>
</c:if>
</c:otherwise>
</c:choose>
</c:forEach>
<spring:message code="${actions}"/>
</td>