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

1、接口date类型去掉时区，并将日期格式设置为yyyy-MM-dd HH:mm:ss；

Browse Source 
2、添加配置日志总量统计服务接口示例；
3、为DNS响应策略配置(service=65)和DNS欺骗地址(service=65)添加配置文件；
This commit is contained in:
zhangdongxu
2018-06-22 10:48:53 +08:00
parent 2185421a3b
commit ec90d8867b
21 changed files with 560 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -13,7 +13,6 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import java.util.concurrent.CountDownLatch;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -99,7 +98,7 @@ public class ConfigSourcesService extends BaseService {
@Autowired
private StrRegionDao strRegionDao;
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS");
private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@Autowired
ConfigRedisService configRedisService;
@@ -1640,7 +1639,7 @@ public class ConfigSourcesService extends BaseService {
}
private String convertToTimeStamp16(Date date){
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
// sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
return date.getTime()+"000";
}
@@ -2509,7 +2508,7 @@ public class ConfigSourcesService extends BaseService {
break;
case "Date":
try {
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
// sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
System.out.println("--------------------TimeZone:"+sdf.getTimeZone());
Date date = sdf.parse(dstStr);
dstStr = date.getTime()+"000";
@@ -2542,12 +2541,26 @@ public class ConfigSourcesService extends BaseService {
//range取值范围验证
if(!StringUtil.isEmpty(commonSourceFieldCfg.getRange())){
String [] range= commonSourceFieldCfg.getRange().split("-");
if(!(Long.valueOf(range[0]).compareTo(Long.valueOf(dstStr))<=0&&Long.valueOf(range[1]).compareTo(Long.valueOf(dstStr))>=0)){
logger1.error(commonSourceFieldCfg.getSrcName()+"参数不在有效范围");
thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数不在有效范围");
throw new RestServiceException(thread, System.currentTimeMillis() - start, commonSourceFieldCfg.getSrcName()+"参数不在有效范围",
Boolean flag = false;
if (range.length==2) {
if(!(Long.valueOf(range[0]).compareTo(Long.valueOf(dstStr))<=0&&Long.valueOf(range[1]).compareTo(Long.valueOf(dstStr))>=0)){
flag = true;
}
}else if (commonSourceFieldCfg.getRange().startsWith("-")) {//只有最大值限制
if(Long.valueOf(range[0]).compareTo(Long.valueOf(dstStr))<=0){
flag = true;
}
}else if (commonSourceFieldCfg.getRange().endsWith("-")) {//只有最小值限制
if(Long.valueOf(range[0]).compareTo(Long.valueOf(dstStr))>=0){
flag = true;
}
}
if (flag) {
logger1.error(commonSourceFieldCfg.getSrcName()+"参数不在有效范围("+ commonSourceFieldCfg.getRange()+")");
thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数不在有效范围("+ commonSourceFieldCfg.getRange()+")");
throw new RestServiceException(thread, System.currentTimeMillis() - start, commonSourceFieldCfg.getSrcName()+"参数不在有效范围("+ commonSourceFieldCfg.getRange()+")",
RestBusinessCode.wrong_range.getValue());
}
}
//regexp 特殊格式正则验证
@@ -2560,9 +2573,9 @@ public class ConfigSourcesService extends BaseService {
if (valFlag) {
dstMap.put(commonSourceFieldCfg.getDstName(),dstStr);
}else{
logger1.error(commonSourceFieldCfg.getSrcName()+"参数格式与正则不匹配");
thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数格式与正则不匹配");
throw new RestServiceException(thread, System.currentTimeMillis() - start, commonSourceFieldCfg.getSrcName()+"参数格式不正确或数据不在有效范围",
logger1.error(commonSourceFieldCfg.getSrcName()+"参数格式与正则("+commonSourceFieldCfg.getRegexp()+")不匹配");
thread.setExceptionInfo(commonSourceFieldCfg.getSrcName()+"参数格式与正则("+commonSourceFieldCfg.getRegexp()+")不匹配");
throw new RestServiceException(thread, System.currentTimeMillis() - start,commonSourceFieldCfg.getSrcName()+"参数格式与正则("+commonSourceFieldCfg.getRegexp()+")不匹配",
RestBusinessCode.param_formate_error.getValue());
}
}
@@ -2731,10 +2744,10 @@ public class ConfigSourcesService extends BaseService {
String content="";
String digestGenToolPath=Constants.DIGEST_GEN_TOOL_PATH;
String chmodCommond="chmod +x "+realPath+digestGenToolPath;//执行权限命令
System.out.println("----------------chmodCommod:"+chmodCommond);
// System.out.println("----------------chmodCommod:"+chmodCommond);
String commondStr=realPath+digestGenToolPath+" -f "+filePath; //执行
//执行摘要获取命令 digest -f /home/aa.txt
System.out.println("------------commondStr:"+commondStr);
// System.out.println("------------commondStr:"+commondStr);
Runtime.getRuntime().exec(chmodCommond);
Process p=Runtime.getRuntime().exec(commondStr);
byte[] b=new byte[1024];
@@ -2746,7 +2759,7 @@ public class ConfigSourcesService extends BaseService {
if (!StringUtil.isBlank(content)) {
content = StringUtil.stripAll(content);
}
System.out.println("-------------------->>"+content);
// System.out.println("-------------------->>"+content);
String[] digestGenReslt=content.split(" ");
if(digestGenReslt.length >=4 && !StringUtil.isEmpty(digestGenReslt[3])){
return digestGenReslt[3];

133
src/main/java/com/nis/web/service/restful/LogTestService.java
View File

@@ -1,18 +1,30 @@
package com.nis.web.service.restful;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Service;
import com.beust.jcommander.internal.Lists;
import com.nis.domain.LogEntity;
import com.nis.domain.Page;
import com.nis.domain.restful.*;
import com.nis.util.Constants;
import com.nis.domain.restful.NtcDnsLog;
import com.nis.domain.restful.NtcFtpLog;
import com.nis.domain.restful.NtcHttpLog;
import com.nis.domain.restful.NtcIpLog;
import com.nis.domain.restful.NtcIpsecLog;
import com.nis.domain.restful.NtcL2tpLog;
import com.nis.domain.restful.NtcMailLog;
import com.nis.domain.restful.NtcOpenvpnLog;
import com.nis.domain.restful.NtcPptpLog;
import com.nis.domain.restful.NtcPzReport;
import com.nis.domain.restful.NtcSshLog;
import com.nis.domain.restful.NtcSslLog;
import com.nis.web.service.BaseLogService;
import org.apache.log4j.Logger;
import org.apache.twill.api.logging.LogEntry;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* Created by darnell on 2018/6/10.
@@ -101,12 +113,11 @@ public class LogTestService extends BaseLogService {
ntcHttpLog.setCfgId(1532L);
ntcHttpLog.setServiceType(17);
ntcHttpLog.setUserRegion("1532");
ntcHttpLog.setC2sIsn(19034211L);
ntcHttpLog.setHttpProxyFlag(211L);
ntcHttpLog.setHttpSeq(1L);
ntcHttpLog.setUrl("http://jd.com/get/api/json");
ntcHttpLog.setReqLine("Get jd.com");
ntcHttpLog.setResLine("response line content");
ntcHttpLog.setReqHdrFile("reqHdrFile1532.txt");
ntcHttpLog.setReqBodyFile("reqBodyFile1532");
ntcHttpLog.setResHdrFile("resHdrFile1532.txt");
ntcHttpLog.setResBodyFile("resBodyFile1532");
ntcHttpLogs.add(ntcHttpLog);
@@ -116,14 +127,11 @@ public class LogTestService extends BaseLogService {
ntcHttpLog.setCfgId(1533L);
ntcHttpLog.setServiceType(129);
ntcHttpLog.setUserRegion("1533");
ntcHttpLog.setC2sIsn(19034211L);
ntcHttpLog.setHttpProxyFlag(211L);
ntcHttpLog.setC2sIsn(190342112L);
ntcHttpLog.setHttpProxyFlag(212L);
ntcHttpLog.setHttpSeq(2L);
ntcHttpLog.setUrl("http://jd.com/get/api/json/abc");
ntcHttpLog.setReqLine("Get jd.com");
ntcHttpLog.setResLine("response line content");
ntcHttpLog.setReqHdrFile("reqHdrFile1533.txt");
ntcHttpLog.setReqBodyFile("reqBodyFile1533");
ntcHttpLog.setResHdrFile("resHdrFile1533.txt");
ntcHttpLog.setResBodyFile("resBodyFile1533");
ntcHttpLogs.add(ntcHttpLog);
@@ -561,7 +569,90 @@ public class LogTestService extends BaseLogService {
return page;
}
/**
* FTP 日志检索测试方法
* @param page
* @param entity
* @return
* @throws Exception
*/
public Page<?> findNtcPzReport(Page<NtcPzReport> page, NtcPzReport entity) throws Exception {
if ("1".equals(entity.getSearchBusinessType())) {
Page<Map> page1 = new Page<Map>();
page1.setPageNo(page.getPageNo());
page1.setPageSize(page.getPageSize());
List<Map> restList = new ArrayList<Map>();
Map<String, Long> restMap = new HashMap<String, Long>();
restMap.put("cfgId", 20l);
restMap.put("sum", 1000l);
restList.add(restMap);
Map<String, Long> restMap2 = new HashMap<String, Long>();
restMap2.put("cfgId", 30l);
restMap2.put("sum", 1001l);
restList.add(restMap2);
page1.setCount(restList.size());
page1.setList(restList);
return page1;
}else if ("2".equals(entity.getSearchBusinessType())){
List<NtcPzReport> ntcPzReports = Lists.newArrayList();
Date date = new Date();
NtcPzReport ntcPzReport = new NtcPzReport();
ntcPzReport.setCfgId(20l);
ntcPzReport.setSum(400l);
ntcPzReport.setService(1);
ntcPzReport.setReportTime(date);
ntcPzReports.add(ntcPzReport);
NtcPzReport ntcPzReport3 = new NtcPzReport();
ntcPzReport3.setCfgId(30l);
ntcPzReport3.setSum(351l);
ntcPzReport3.setService(1);
ntcPzReport3.setReportTime(date);
ntcPzReports.add(ntcPzReport3);
Date date1 = new Date();
date1.setMinutes(date1.getMinutes()+5);
NtcPzReport ntcPzReport1 = new NtcPzReport();
ntcPzReport1.setCfgId(20l);
ntcPzReport1.setSum(400l);
ntcPzReport1.setService(1);
ntcPzReport1.setReportTime(date1);
ntcPzReports.add(ntcPzReport1);
NtcPzReport ntcPzReport4 = new NtcPzReport();
ntcPzReport4.setCfgId(30l);
ntcPzReport4.setSum(500l);
ntcPzReport4.setService(1);
ntcPzReport4.setReportTime(date1);
ntcPzReports.add(ntcPzReport4);
Date date2 = new Date();
date2.setMinutes(date2.getMinutes()+10);
NtcPzReport ntcPzReport2 = new NtcPzReport();
ntcPzReport2.setCfgId(20l);
ntcPzReport2.setSum(200l);
ntcPzReport2.setService(1);
ntcPzReport2.setReportTime(date2);
ntcPzReports.add(ntcPzReport2);
NtcPzReport ntcPzReport5 = new NtcPzReport();
ntcPzReport5.setCfgId(30l);
ntcPzReport5.setSum(150l);
ntcPzReport5.setService(1);
ntcPzReport5.setReportTime(date2);
ntcPzReports.add(ntcPzReport5);
page.setCount(ntcPzReports.size());
page.setList(ntcPzReports);
return page;
}
return null;
}