gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161 Commits 12 Branches 296 Tags
adee46fe650d845d16af7de4c52cbc0baba6386f
Commit Graph

29 Commits

Author SHA1 Message Date
liuxueli
adee46fe65 增加丢日志的本地日志记录 2020-09-16 10:09:05 +08:00
liuxueli
abcc94dc25 支持JA3指纹 2020-09-11 18:06:09 +08:00
liuxueli
b18d3cfcf6 消除warning 2020-09-01 16:55:21 +08:00
liuxueli
4229468e71 增加当kafka broker性能不足时丢日志的逻辑，确保不丢流量 2020-09-01 11:35:49 +08:00
liuxueli
08c8985d9d 共享IP归属地、subscribe_id等信息给KNI 2020-08-28 10:43:12 +08:00
liuxueli
44b8f7be11 共享链接属性流标签结构体：https://jira.geedge.net/browse/TSG-2848 2020-08-19 16:56:10 +08:00
liuxueli
99dc6723f1 修复IP归属地日志字段填充错误 2020-08-05 14:41:14 +08:00
liuxueli
0c89dd2603 发送支持支持嵌套json，调用者需传cJSON *object 2020-07-29 18:51:58 +08:00
liuxueli
40fa047be1 支持按设备编号指定策略生效范围 
调整获取链接的包数、字节数
 2020-07-24 17:04:09 +08:00
liuxueli
b9774d36ca 增加UDP相关链接计数 
一个链接多命中同一个策略仅发送一条日志
 2020-07-20 15:59:15 +08:00
liuxueli
65833d7a1e tsg_stat.log按照influx_line格式输出到telegraf 
IP归属地日志字段格式适配
 2020-06-18 14:11:02 +08:00
liuxueli
10e6f7037e 修正IP归属地格式，将';'改为',' 2020-06-17 13:51:05 +08:00
liuxueli
1456eff40c 发送QUIC白名单日志，填充QUIC_SNI字段 2020-06-02 09:57:26 +08:00
liuxueli
fdd6c8ab2b 调整扫描的属地表名称,同时调整table_info,IP归属地表不能使用composition聚合表 
支持扫描quic协议，增加相关代码
调整发送IP归属地字段的位置，保证拦截日志能正常填充IP归属地字段
 2020-05-29 14:40:15 +08:00
liuxueli
4788cd0c9d 多个监测日志需要发多次common_establish_latency_ms字段 2020-05-28 16:09:32 +08:00
liuxueli
606c9909cd Merge branch 'ip-location' into develop 
# Conflicts:
#	src/tsg_entry.cpp
#	src/tsg_send_log.cpp

支持IP归属地功能
 2020-05-28 16:04:12 +08:00
liuxueli
76c0b51246 Merge branch 'Branch_v1.0.4' into develop-20.05.01 
# Conflicts:
#	src/tsg_entry.cpp
安全事件日志中填写“设备编号”字段(https://jira.geedge.net/browse/TSG-1722)
 2020-05-25 15:02:59 +08:00
liuxueli
a03e59cadd 增加获取device_id,在发送日志时附带common_device_id字段 2020-05-22 09:51:28 +08:00
liuxueli
cbcabe06b3 修复发送日志初始化失败的BUG 2020-05-18 19:04:26 +08:00
liuxueli
278c54ab1f 支持IP归属地定位功能 2020-05-14 15:52:54 +08:00
liuxueli
bc0e6313b4 支持Decryption Exclusion 
初始化maat时增加应答文件路径设置
Friewall仅deny动作填写common_sub_action
更新相应配置文件
 2020-04-27 17:49:59 +08:00
liuxueli
64f487d084 支持alert动作，发送common_sub_action日志字段 2020-04-16 13:03:56 +08:00
liuxueli
9f53396c0c 1、总控统一发送tcp会话创建延迟时间字段 
2、修复流量统计出现负值的现象
 2020-03-30 16:20:02 +08:00
liuxueli
15f70a849b 细化deny动作的执行 
发送日志删除用户自定义域字段
 2020-01-19 15:53:02 +08:00
liuxueli
8e53cecd2a 命中APP_ID时填写协议字段 
调整流量统计
修正配置文件
 2020-01-17 16:06:21 +08:00
liuxueli
4ba746a4b5 调整debug日志 
修复内存泄漏
 2020-01-16 16:20:35 +08:00
liuxueli
fb1511e25c 提供阻断方式判断函数接口 
提供统计命中策略流量信息函数接口
根据sapp提供信息，实现部分统计信息
 2019-12-20 11:15:29 +08:00
杨威
64c1dcb159 Squashed commit of the following: 
commit 91574444c3
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Dec 3 11:44:16 2019 +0800

    公共字段中的通信市时长单位是：ms；转换单位
    KNI发日志需等待TFE结束，需提前构造streaminfo日志字段，调整包数字节数统计位置
    细化调整日志

commit ff053e3e2c
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 11:38:35 2019 +0800

    增加调试日志信息

commit 2d1a530165
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 11:27:06 2019 +0800

    使用前置声明结构体，修改接口函数原型

commit 27f0cfc91a
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 10:33:48 2019 +0800

    提供TLD_append_streaminfo函数接口供KNI使用
    修改配置文件

commit ed0b17a49d
Merge: 132d807 04963fe
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Tue Nov 26 17:44:28 2019 +0800

    Merge branch 'feature-kni' into 'develop'

    增加http解析部分

    See merge request tango/tsg_master!3

commit 04963fe1bf
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Tue Nov 26 17:41:43 2019 +0800

    增加http解析部分

commit 132d807af1
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 26 16:58:54 2019 +0800

    调整调试日志内容

commit 8cfc6b32fd
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 19:30:08 2019 +0800

    增加调试日志信息

commit 4aef0628e5
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 18:36:48 2019 +0800

    增加调试信息

commit 7c9dabdab5
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 10:51:37 2019 +0800

    矫正tableinfo配置项

commit 34ec2059ea
Merge: 27cb2ad 2b96c05
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 10:00:18 2019 +0800

    Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop

commit 27cb2ad3b2
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Thu Nov 21 19:21:08 2019 +0800

    获取包数、字节数与sapp头文件不一致，导致统计信息颠倒
    删除从vxlan里获取信息

commit 2b96c050d5
Merge: 0a11db6 8d954e4
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Thu Nov 21 10:22:42 2019 +0800

    Merge branch 'feature-kni' into 'develop'

    修改proto初始值为PROTO_UNKONWN

    See merge request tango/tsg_master!2

commit 46a233b782
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Thu Nov 21 10:18:08 2019 +0800

    KNI发送日志的线程不是sapp申请的，所以不能使用dictator_malloc申请内存
    增加user_region日志字段

commit 8d954e4cc5
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 20 19:55:59 2019 +0800

    修改proto初始值为PROTO_UNKONWN

commit 0a11db6d2e
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 18:02:54 2019 +0800

    增加总控配置文件

commit 5c04ba23aa
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 18:00:35 2019 +0800

    SSL_SNI和HTTP_HOST的deny动作由总控负责处理
    修复获取全局流ID时的错误

commit 291c05ea79
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 16:40:19 2019 +0800

    增加获取全局流ID的接口
    调整总控注册为TCP入口

commit 28da97b53b
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 14:45:41 2019 +0800

    支持平台提供的APP_STATE_KILL_OTHER
    修复BUG，天剑流标签时未对协议进行赋值，导致tfe颁发证书失败

commit 7912ec54b2
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 19 18:41:31 2019 +0800

    修复BUG，命中拦截策略时未对类型进行赋值，导致KNI获取不到命中结果
    添加总控配置文件
    添加FS2统计日志
    添加错误日志
    构造适用sapp4.0的rpm

commit 484feaed94
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 19 13:39:37 2019 +0800

    增加获取deny结果规则的接口
    修复自测试过程中遇到的BUG

commit 5165173025
Merge: 186e591 6b6cbef
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Mon Nov 18 15:46:03 2019 +0800

    Merge branch 'feature-fast-path' into feature-kni

commit 6b6cbeffa1
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 14:50:32 2019 +0800

    修复初始化错误

commit e7532d6280
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:33:29 2019 +0800

    添加遗漏头文件tsg_entry.h

commit f33d11c50b
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:29:28 2019 +0800

    修复编译错误

commit 88d9368cee
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:25:38 2019 +0800

    合并头文件，删除无用头文件

commit 382ca0a793
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:21:25 2019 +0800

    Delete tsg_types.h

commit ab58f918e5
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:21:05 2019 +0800

    Delete tsg_log_id.h

commit 3b13075701
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:20:57 2019 +0800

    Delete tsg_entry.h

commit 186e591dbf
Merge: 39f82ed 91c511c
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Fri Nov 15 21:22:44 2019 +0800

    Merge branch 'master' into feature-kni

commit 39f82ed3f7
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Fri Nov 15 21:22:39 2019 +0800

    接口适配

commit 8913a7d22e
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Fri Nov 15 19:29:54 2019 +0800

    规则排序功能
    统一发送日志功能

commit 1cb2358fea
Merge: c76bc55 bd65acc
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Thu Nov 14 15:06:35 2019 +0800

    合并master修改

commit c76bc5534d
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:56:19 2019 +0800

    接口增加protocol参数

commit db7282dab7
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:24:22 2019 +0800

    扫描接口增加domain

commit 56fadd73b2
Merge: f9aee05 9e738ae
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:08:55 2019 +0800

    Merge branch 'master' into feature-kni

commit f9aee05bcc
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:17:59 2019 +0800

    修改ssl_utils文件名

commit 452a08790c
Merge: 3abe8a2 c1ffc53
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:12:14 2019 +0800

    Merge branch 'master' into feature-kni

commit 3abe8a2fc5
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:11:38 2019 +0800

    添加kni模块扫描部分
 2019-12-09 18:58:05 +08:00
liuxueli
28fe2d3053 create version 2019-11-12 13:35:19 +08:00