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:
intraUser
2019-01-03 12:27:21 +08:00
parent 71038b0911
commit 330b6f6bc1
3 changed files with 112 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -38,6 +38,7 @@ import com.nis.domain.configuration.DnsResStrategy;
import com.nis.domain.configuration.FileDigestCfg; import com.nis.domain.configuration.FileDigestCfg;
import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.IpPortCfg;
import com.nis.domain.configuration.PxyObjKeyring; import com.nis.domain.configuration.PxyObjKeyring;
import com.nis.domain.configuration.PxyObjSpoofingIpPool;
import com.nis.domain.configuration.PxyObjTrustedCaCert; import com.nis.domain.configuration.PxyObjTrustedCaCert;
import com.nis.domain.configuration.PxyObjTrustedCaCrl; import com.nis.domain.configuration.PxyObjTrustedCaCrl;
import com.nis.domain.configuration.WebsiteDomainTopic; import com.nis.domain.configuration.WebsiteDomainTopic;
@@ -1737,6 +1738,9 @@ public class ConfigSynchronizationService extends BaseService{
IpPortCfg cfg = (IpPortCfg) list.get(i); IpPortCfg cfg = (IpPortCfg) list.get(i);
newList.add(convertCallBackIp(cfg,cfg.getGroupId())); newList.add(convertCallBackIp(cfg,cfg.getGroupId()));
} }
}else if(className.equals("PxyObjSpoofingIpPool")){
list = configSynchronizationDao.getSpoofingIpPoolList(entity);
newList.addAll(list);
} }
} }

189
src/main/resources/nis.properties
View File

@@ -219,75 +219,72 @@ clusterBStartTime=1503504000725
isCommit=true isCommit=true
############################################################################################################################################ ############################################################################################################################################
############################################################################################################################################ ############################################################################################################################################
httpUrl=http://192.168.10.204:9999/galaxy-service/service/cfg/v1/ httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/
maatCfg=configSources maatCfg=v1/configSources
fileUploadCfg=fileUploadSources fileUploadCfg=v1/fileUploadSources
callbackCfg=commonSources callbackCfg=v1/commonSources
fileDigestCfg=fileDigestSources fileDigestCfg=v1/fileDigestSources
configIdSources=configPzIdSources configIdSources=v1/configPzIdSources
#logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/ #logBaseUrl=http://10.0.6.242:8080/galaxy-service/service/log/v1/
logBaseUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ logBaseUrl=http://10.0.7.14:9999/galaxy-service/service/log/
ntcPzReport=ntcPzReport ntcPzReport=v1/ntcPzReport
ntcServiceReport=ntcServiceReport ntcServiceReport=v1/ntcServiceReport
ntcTagReport=ntcTagReport ntcTagReport=v1/ntcTagReport
ntcAttrTypeReport=ntcAttrTypeReport ntcAttrTypeReport=v1/ntcAttrTypeReport
ntcLwhhReport=ntcLwhhReport ntcLwhhReport=v1/ntcLwhhReport
ntcSrcipDomesticReport=ntcSrcipDomesticReport ntcSrcipDomesticReport=v1/ntcSrcipDomesticReport
ntcDestipCountryReport=ntcDestipCountryReport ntcDestipCountryReport=v1/ntcDestipCountryReport
ntcEntranceReport=ntcEntranceReport ntcEntranceReport=v1/ntcEntranceReport
ntcIpLog=ntcIpLogs ntcIpLog=v1/ntcIpLogs
ntcBgpLog=ntcBgpLogs ntcBgpLog=v1/ntcBgpLogs
ntcP2pLog=ntcP2pLogs ntcP2pLog=v1/ntcP2pLogs
ntcHttpLog=ntcHttpLogs ntcHttpLog=v1/ntcHttpLogs
ntcDnsLog=ntcDnsLogs ntcDnsLog=v1/ntcDnsLogs
ntcSslLog=ntcSslLogs ntcSslLog=v1/ntcSslLogs
ntcPptpLog=ntcPptpLogs ntcPptpLog=v1/ntcPptpLogs
ntcL2tpLog=ntcL2tpLogs ntcL2tpLog=v1/ntcL2tpLogs
ntcOpenvpnLog=ntcOpenvpnLogs ntcOpenvpnLog=v1/ntcOpenvpnLogs
ntcIpsecLog=ntcIpsecLogs ntcIpsecLog=v1/ntcIpsecLogs
ntcSshLog=ntcSshLogs ntcSshLog=v1/ntcSshLogs
ntcMailLog=ntcMailLogs ntcMailLog=v1/ntcMailLogs
ntcFtpLog=ntcFtpLogs ntcFtpLog=v1/ntcFtpLogs
ntcAppLog=ntcAppLogs ntcAppLog=v1/ntcAppLogs
ntcDdosLog=ntcDdosLogs ntcDdosLog=v1/ntcDdosLogs
dkBehaviorLog=ntcAppLogs dkBehaviorLog=v1/ntcAppLogs
mmVoipLog=ntcVoipLogs mmVoipLog=v1/ntcVoipLogs
mmAvIpLog=mmAvIpLogs mmAvIpLog=v1/mmAvIpLogs
mmAvUrlLog=mmAvUrlLogs mmAvUrlLog=v1/mmAvUrlLogs
mmPicIpLog=mmPicIpLogs mmPicIpLog=v1/mmPicIpLogs
mmPicUrlLog=mmPicUrlLogs mmPicUrlLog=v1/mmPicUrlLogs
mmVoipIpLog=ntcVoipLogs mmVoipIpLog=v1/ntcVoipLogs
mmVoipAccountLog=mmVoipAccountLogs mmVoipAccountLog=v1/mmVoipAccountLogs
mmSampleAudioLog=mmSampleAudioLogs mmSampleAudioLog=v1/mmSampleAudioLogs
mmSampleVideoLog=mmSampleVideoLogs mmSampleVideoLog=v1/mmSampleVideoLogs
mmPornAudioLevelLog=mmPornAudioLevelLogs mmPornAudioLevelLog=v1/mmPornAudioLevelLogs
mmPornVideoLevelLog=mmPornVideoLevelLogs mmPornVideoLevelLog=v1/mmPornVideoLevelLogs
mmSamplePicLog=mmSamplePicLogs mmSamplePicLog=v1/mmSamplePicLogs
mmSampleVoipLog=mmSampleVoipLogs mmSampleVoipLog=v1/mmSampleVoipLogs
pxyHttpLog=pxyHttpLogs pxyHttpLog=v1/pxyHttpLogs
mmSpeakerRecognizationLog=mmSpeakerRecognizationLogs mmSpeakerRecognizationLog=v1/mmSpeakerRecognizationLogs
mmLogoDetectionLog=mmLogoDetectionLogs mmLogoDetectionLog=v1/mmLogoDetectionLogs
mmFaceRecognizationLog=mmFaceRecognizationLogs mmFaceRecognizationLog=v1/mmFaceRecognizationLogs
trafficAreaStat=trafficAreaStat
logServiceTopn=logServiceTopn
blockAndDropStat=blockAndDropStat
######################################## ########################################
#\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3 #\u5927\u5c4f\u56fe\u8868\u5c55\u793a\u670d\u52a1\u63a5\u53e3
dashboardUrl=http://192.168.10.204:9999/galaxy-service/service/log/v1/ dashboardUrl=http://10.0.7.14:9999/galaxy-service/service/log/
trafficIpActive=trafficIpActive trafficIpActive=v1/trafficIpActive
trafficProtocol=trafficProtocol trafficProtocol=v1/trafficProtocol
trafficApp=trafficApp trafficApp=v1/trafficApp
trafficOsList=trafficOsList trafficOsList=v1/trafficOsList
trafficBrowserChart=trafficBrowserChart trafficBrowserChart=v1/trafficBrowserChart
trafficBsList=trafficBsList trafficBsList=v1/trafficBsList
trafficSystemChart=trafficSystemChart trafficSystemChart=v1/trafficSystemChart
trafficWebsiteList=trafficWebsiteList trafficWebsiteList=v1/trafficWebsiteList
trafficWebTypeChart=trafficWebTypeChart trafficWebTypeChart=v1/trafficWebTypeChart
trafficPortActive=trafficPortActive trafficPortActive=v1/trafficPortActive
trafficTopicAndDomainChart=trafficTopicAndDomainChart trafficTopicAndDomainChart=v1/trafficTopicAndDomainChart
ntcTotalReport=ntcTotalReport ntcTotalReport=v1/ntcTotalReport
trafficIpActiveFiveMinute=trafficIpActiveFiveMinute trafficIpActiveFiveMinute=v1/trafficIpActiveFiveMinute
trafficIpActiveOneHour=trafficIpActiveOneHour trafficIpActiveOneHour=v1/trafficIpActiveOneHour
client_connect_timeout=300000 client_connect_timeout=300000
client_read_timeout=300000 client_read_timeout=300000
@@ -310,7 +307,7 @@ jdbc.hive.BName=xa_z2_mesalog_hive
maxPageSize=100000 maxPageSize=100000
#\u5bfc\u51fa\u6700\u5927\u6761\u6570 #\u5bfc\u51fa\u6700\u5927\u6761\u6570
maxExportSize=100000 maxExportSize=5000
#\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7 #\u5141\u8bb8\u914d\u7f6e\u6700\u5927\u5c42\u7ea7
maxLevelNo=4 maxLevelNo=4
#\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26 #\u4e0a\u4e0b\u7ea7\u663e\u793a\u95f4\u9694\u6807\u8bc6\u7b26
@@ -550,9 +547,9 @@ domain_regexp=^(?=^.{3,255}$)[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-
maat_json_send_size=20000 maat_json_send_size=20000
#\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf #\u5bfc\u5165\u9a8c\u8bc1\u7684\u7ebf\u7a0b\u6570\u91cf
mulity_thread_size=5 mulity_thread_size=5
ntcRadiusReport=ntcRadiusReport ntcRadiusReport=v2/ntcRadiusReport
ntcCollectVoipLog=ntcCollectVoipLogs ntcCollectVoipLog=v1/ntcCollectVoipLogs
ntcKeywordsUrlLog=ntcKeywordsUrlLogs ntcKeywordsUrlLog=v1/ntcKeywordsUrlLogs
save_and_del_thread_size=5 save_and_del_thread_size=5
#mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e #mysql \u5355\u4e2asql\u5927\u5c0f\u9650\u5236,\u6839\u636emariadb\u76f8\u5173\u53c2\u6570\u914d\u7f6e
max_allowed_packet=1048576 max_allowed_packet=1048576
@@ -568,38 +565,50 @@ userPasswordSet=UserPasswordSet
userDelete=UserDelete userDelete=UserDelete
userGet=UserGet userGet=UserGet
userList=UserList userList=UserList
ip_reuse_call_cgi_url=http://192.168.11.137:8090/command ip_reuse_call_cgi_url=http://10.4.10.32:8090/command
ipNumGet=IpNumGet ipNumGet=IpNumGet
allIpGet=AllIpGet allIpGet=AllIpGet
#\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5 #\u6d41\u91cf\u7edf\u8ba1\u5e26\u5bbd\u8be6\u60c5
trafficBandwidthTrans=trafficBandwidthTrans trafficBandwidthTrans=v1/trafficBandwidthTrans
trafficProtocolList=trafficProtocolList trafficProtocolList=v1/trafficProtocolList
irSnatLog=irSnatLogs irSnatLog=irSnatLogs
irDnatLog=irDnatLogs irDnatLog=irDnatLogs
trafficBandwidthTrans=trafficBandwidthTrans trafficBandwidthTransv1/=trafficBandwidthTrans
trafficProtocolList=trafficProtocolList trafficProtocolList=v1/trafficProtocolList
trafficAppList=trafficAppList trafficAppList=v1/trafficAppList
ntcActionEntranceReport=ntcActionEntranceReport ntcActionEntranceReport=v1/ntcActionEntranceReport
redis.host=192.168.10.192:6379 redis.host=10.0.4.2:6379
redis.expire=1800 redis.expire=1800
redis.timeout=10000 redis.timeout=10000
dns_spoofing_ip_desc=Default Spoofing IP dns_spoofing_ip_desc=Default Spoofing IP
dns_spoofing_ip_ip=1.1.1.1 dns_spoofing_ip_ip=1.1.1.1
trafficBandwidthTransTwo=trafficBandwidthTransTwo trafficBandwidthTransTwo=v1/trafficBandwidthTransTwo
trafficBandwidthTransThree=trafficBandwidthTransThree trafficBandwidthTransThree=v1/trafficBandwidthTransThree
trafficBandwidthTransFour=trafficBandwidthTransFour trafficBandwidthTransFour=v1/trafficBandwidthTransFour
ntcCollectRadiusLog=ntcCollectRadiusLogs ntcCollectRadiusLog=v1/ntcCollectRadiusLogs
ntcConnRecordLog=ntcConnRecordLogs ntcConnRecordLog=v1/ntcConnRecordLogs
ntcConnRecordPercent=ntcConnRecordPercent ntcConnRecordPercent=v1/ntcConnRecordPercent
#\u5bfc\u51fa\u6700\u5927\u6761\u6570 #\u5bfc\u51fa\u6700\u5927\u6761\u6570
maxLogExportSize=2000 maxLogExportSize=2000
pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID
ntc_subscribe_id_region=NTC_SUBSCRIBE_ID ntc_subscribe_id_region=NTC_SUBSCRIBE_ID
ntcAsnRecord=ntcAsnRecord ntcAsnRecord=v1/ntcAsnRecord
ntcURLReport=ntcURLReport ntcURLReport=v1/ntcURLReport
ntcIpRangeReport=ntcIpRangeReport ntcIpRangeReport=v1/ntcIpRangeReport
trafficWebsiteListNoTime=trafficWebsiteListNoTime trafficWebsiteListNoTime=v1/trafficWebsiteListNoTime
trafficTopicList=trafficTopicList trafficTopicList=v1/trafficTopicList
trafficDomainTrans=trafficDomainTrans trafficDomainTrans=v1/trafficDomainTrans
#maximum number to import #maximum number to import
import_limit=10 import_limit=10
trafficPortActiveFiveMinute=v1/trafficPortActiveFiveMinute
trendTotalReport=v1/trendTotalReport
#\u4e8b\u4ef6\u76d1\u6d4b/\u5c01\u5835
ntcEventsMonitorOrBlock=v1/ntcEventsMonitorOrBlock
#\u91cd\u70b9\u4fdd\u969c\u4e8b\u4ef6
ntcEventKeyProtection=v1/ntcEventKeyProtection
dashboardUrlV2=http://10.0.7.14:9999/galaxy-service/service/log/v2/
trafficAreaStat=v1/trafficAreaStat
logServiceTopn=v1/logServiceTopn
blockAndDropStat=v1/blockAndDropStat
#配置启停接口
configStartStop=v2/configStartStop

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

@@ -26,27 +26,27 @@
<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a> <a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
</c:when> </c:when>
<c:when test="${label eq 'cfg_excel'}"> <c:when test="${label eq 'cfg_excel'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top"> <a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="Excel"/></i> <i class="fa fa-download"> <spring:message code="Excel"/></i>
</a> </a>
</c:when> </c:when>
<c:when test="${label eq 'export'}"> <c:when test="${label eq 'export'}">
<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top"> <a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="Excel"/></i> <i class="fa fa-download"> <spring:message code="Excel"/></i>
</a> </a>
</c:when> </c:when>
<c:when test="${label eq 'cfg_csv'}"> <c:when test="${label eq 'cfg_csv'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top"> <a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxExportSize',1000000)},'${searchUrl}','cfg')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="CSV"/></i> <i class="fa fa-download"> <spring:message code="CSV"/></i>
</a> </a>
</c:when> </c:when>
<c:when test="${label eq 'excel'}"> <c:when test="${label eq 'excel'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top"> <a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="Excel"/></i> <i class="fa fa-download"> <spring:message code="Excel"/></i>
</a> </a>
</c:when> </c:when>
<c:when test="${label eq 'csv'}"> <c:when test="${label eq 'csv'}">
<a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}')" data-toggle="tooltip" data-placement="top"> <a href="javascript:void(0);" onclick="exportData('${url}',${fns:getStringProperty('maxLogExportSize',2000)},'${searchUrl}','log')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-download"> <spring:message code="CSV"/></i> <i class="fa fa-download"> <spring:message code="CSV"/></i>
</a> </a>
</c:when> </c:when>
@@ -400,7 +400,7 @@ function cancelPassOpt(url){
return flag; return flag;
} }
//导出 //导出
function exportData(url,maxRow,searchUrl){ function exportData(url,maxRow,searchUrl,exType){
var column=[]; var column=[];
var hColumn=[]; //隐藏列名 var hColumn=[]; //隐藏列名
$("#${id} ${value} thead tr th").each(function(){ $("#${id} ${value} thead tr th").each(function(){
@@ -428,7 +428,7 @@ function cancelPassOpt(url){
//导出检索条件下所有数据 //导出检索条件下所有数据
}else{ }else{
var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim(); var totalCount = $("#showTotalCount").html() == undefined ? '' : $("#showTotalCount").html().trim();
if (!confirmEnding(url,"excel")&&!confirmEnding(url,"csv")) { if (exType!='log') {
if(totalCount > maxRow){ if(totalCount > maxRow){
top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){ top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){ if(v=="ok"){
@@ -453,12 +453,5 @@ function cancelPassOpt(url){
} }
} }
function confirmEnding(str, target) {
var result=true;
var num=str.indexOf(target);
if (-1==num) {
result=false;
}
return result;
}
</script> </script>