gfwleak/galaxy-tsg-olap-storm-log-stream-completion
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

日志补全代码更新

Browse Source
This commit is contained in:
李玺康
2019-11-12 17:39:20 +08:00
parent fab47b55fe
commit 0464e9cde5
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/ac/iie/bean/PublicSessionRecordLog.java
View File

@@ -8,7 +8,7 @@ package cn.ac.iie.bean;
*/
public class PublicSessionRecordLog {
//TODO 基础属性 40 int22
//TODO 基础属性 41 int22
private int common_service;
private int common_direction;

14
src/main/java/cn/ac/iie/bean/RadiusSessionRecordLog.java
View File

@@ -9,12 +9,17 @@ package cn.ac.iie.bean;
public class RadiusSessionRecordLog extends PublicSessionRecordLog {
//TODO RADIUS协议属性 4
//TODO RADIUS协议属性 8
private int radius_session_timeout;
private int radius_idle_timeout;
private int radius_acct_status_type;
private int radius_acct_terminate_cause;
private int radius_packet_type;
private String radius_nas_ip;
private String radius_framed_ip;
private String radius_account;
public int getRadius_session_timeout() {
return radius_session_timeout;
@@ -48,13 +53,6 @@ public class RadiusSessionRecordLog extends PublicSessionRecordLog {
this.radius_acct_terminate_cause = radius_acct_terminate_cause;
}
private int radius_packet_type;
private String radius_nas_ip;
private String radius_framed_ip;
private String radius_account;
public int getRadius_packet_type() {
return radius_packet_type;
}

2
src/main/java/cn/ac/iie/bolt/collectProtocol/CollectCompletedBolt.java → src/main/java/cn/ac/iie/bolt/collect/CollectCompletedBolt.java
View File

@@ -1,4 +1,4 @@
package cn.ac.iie.bolt.collectprotocol;
package cn.ac.iie.bolt.collect;
import cn.ac.iie.common.FlowWriteConfig;
import cn.ac.iie.utils.system.TupleUtils;

2
src/main/java/cn/ac/iie/topology/LogFlowWriteTopology.java
View File

@@ -2,7 +2,7 @@ package cn.ac.iie.topology;
import cn.ac.iie.bolt.NtcLogSendBolt;
import cn.ac.iie.bolt.collectprotocol.CollectCompletedBolt;
import cn.ac.iie.bolt.collect.CollectCompletedBolt;
import cn.ac.iie.bolt.radius.RadiusCompletionBolt;
import cn.ac.iie.bolt.security.SecurityCompletionBolt;

5
src/main/java/cn/ac/iie/utils/general/TransFormUtils.java
View File

@@ -78,7 +78,6 @@ public class TransFormUtils {
proxySessionRecordLog.setCommon_server_asn(ipLookup.asnLookup(serverIp, true));
//TODO 集成AAA数据subscribe_id -数据端补全
proxySessionRecordLog.setCommon_subscriber_id(HbaseUtils.getAccount(clientIp));
// proxySessionRecordLog.setCommon_subscriber_id("aaaaaaa");
proxySessionRecordLog.setHttp_domain(getTopDomain(null, proxySessionRecordLog.getHttp_host()));
return JSONObject.toJSONString(proxySessionRecordLog);
} catch (Exception e) {
@@ -109,7 +108,6 @@ public class TransFormUtils {
securitySessionRecordLog.setCommon_server_asn(ipLookup.asnLookup(serverIp, true));
//TODO 集成AAA数据subscribe_id -数据端补全
securitySessionRecordLog.setCommon_subscriber_id(HbaseUtils.getAccount(clientIp));
// securitySessionRecordLog.setCommon_subscriber_id("aaaaa");
securitySessionRecordLog.setHttp_domain(getTopDomain(securitySessionRecordLog.getSsl_sni(), securitySessionRecordLog.getHttp_host()));
return JSONObject.toJSONString(securitySessionRecordLog);
} catch (Exception e) {
@@ -123,7 +121,7 @@ public class TransFormUtils {
* 解析日志，并补全
* 补domain,补subscriber_id
*
* @param message Security原始日志
* @param message CollectProtocol原始日志
* @return 补全后的日志
*/
public static String getCollectProtocolMessage(String message) {
@@ -139,7 +137,6 @@ public class TransFormUtils {
collectProtocolRecordLog.setCommon_server_asn(ipLookup.asnLookup(serverIp, true));
//TODO 集成AAA数据subscribe_id -数据端补全
collectProtocolRecordLog.setCommon_subscriber_id(HbaseUtils.getAccount(clientIp));
// securitySessionRecordLog.setCommon_subscriber_id("aaaaa");
collectProtocolRecordLog.setHttp_domain(getTopDomain(collectProtocolRecordLog.getSsl_sni(), collectProtocolRecordLog.getHttp_host()));
return JSONObject.toJSONString(collectProtocolRecordLog);
} catch (Exception e) {