gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新tsg_master、firewall、session_record、quic、ssl、http，修复:

Browse Source 
tsg_master: 规范变量的定义; 支持关闭FS的相关统计，便于valgrind/asan定位内存的相关问题
tsg_master: 增加sni长度判断，同时解析结果异常时，增加释放已申请sni内存的操作
tsg_master: 修复application metrics更新包数时可能存在内存越界
quic: 增加长度判断，修复长度异常时造成的内存非法读
http: 修复strncasecmp时未对待查找串长度保护，可能读越界的错误
session_record/firewall/ssl: Debug版本链接ASAN，用于定位问题


(cherry picked from commit 29e1910607)
This commit is contained in:
liuxueli
2023-08-02 15:44:35 +08:00
committed by 林鑫
parent ea223f7ac1
commit fa3e810e8e
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ansible/install_config/group_vars/rpm_version.yml
View File

@@ -4,8 +4,8 @@ certstore_rpm_version:
firewall_rpm_version:
capture_packet_plug: capture_packet_plug-5.0.6.1820f69
conn_telemetry: conn_telemetry-1.0.3.4ef6df6
firewall: firewall-2.0.14.e78add7
session_record: session_record-4.1.7.5733614
firewall: firewall-2.0.15.2c5842b
session_record: session_record-4.1.8.962ec30
gtp_signaling_plug: gtp_signaling_plug-2.0.0.3f233d7
tsg_vulpes: tsg_vulpes-1.0.9.0d7c615
radius_collect_plug: radius_collect_plug-2.0.11.47a51f3
@@ -14,10 +14,10 @@ firewall_rpm_version:
tsg_ddos_sketch: tsg_ddos_sketch-1.3.5.447bcc2
dns: dns-2.1.6.8cfb357
ftp: ftp-1.0.15.1fc64fe
http: http-2.0.13.5efe313
http: http-2.0.15.e949298
mail: mail-1.0.19.e982b44
quic: quic-2.0.6.513732e
ssl: ssl-3.0.1.8c0ec9f
quic: quic-2.0.8.4d73180
ssl: ssl-3.0.2.2919874
rtp: rtp-1.0.7.530ac76
gtp: gtp-1.0.7.e1041b2
ssh: ssh-2.1.7.b053e65
@@ -78,7 +78,7 @@ tsg_app_rpm_version:
app_sketch_local: app_sketch_local-5.0.6.cc02934
tsg_master_rpm_version:
tsg_master: tsg_master-6.0.43.39ed85f
tsg_master: tsg_master-6.0.46.e089f98
shaping_master_rpm_version:
shaping_master: shaping_master-1.1.4.b434f47

16
ansible/roles/firewall/templates/main.conf.j2.j2
View File

@@ -50,27 +50,27 @@ TCP_MIN_BYTES=5
UDP_MIN_PKTS=3
UDP_MIN_BYTES=5
[SECURITY_HITS]
CYCLE=1000
[SECURITY_HITS_METRICS]
CYCLE_INTERVAL_MS=1000
TELEGRAF_PORT=8400
TELEGRAF_IP="127.0.0.1"
APP_NAME="security_rule_hits"
[STATISTIC]
CYCLE=5
[NETWORK_METRICS]
CYCLE_INTERVAL_MS=5000
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="log/master.metrics"
APP_NAME="statistic"
[APP_METRIC]
CYCLE=1000
[APPLICATION_METRICS]
CYCLE_INTERVAL_MS=1000
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
APP_NAME="app_metric"
[FIELD_STAT]
CYCLE=5
[MASTER_STATUS]
CYCLE_INTERVAL_MS=30000
#TELEGRAF_PORT=8200
#TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="log/master.status"

16
ansible/roles/traffic-engine/files/helm/conf/main.conf
View File

@@ -46,27 +46,27 @@ UDP_MIN_PKTS=3
UDP_MIN_BYTES=5
RAPIDJSON_CHUNK_CAPACITY={{ .Values.firewall.rapidjson_chunk_capacity }}
[SECURITY_HITS]
CYCLE=1000
[SECURITY_HITS_METRICS]
CYCLE_INTERVAL_MS=1000
TELEGRAF_PORT=8400
TELEGRAF_IP="127.0.0.1"
APP_NAME="security_rule_hits"
[STATISTIC]
CYCLE=5
[NETWORK_METRICS]
CYCLE_INTERVAL_MS=5000
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="log/master.metrics"
APP_NAME="statistic"
[APP_METRIC]
CYCLE=1000
[APPLICATION_METRICS]
CYCLE_INTERVAL_MS=1000
TELEGRAF_PORT=8100
TELEGRAF_IP="127.0.0.1"
APP_NAME="app_metric"
[FIELD_STAT]
CYCLE=5
[MASTER_STATUS]
CYCLE_INTERVAL_MS=30000
#TELEGRAF_PORT=8200
#TELEGRAF_IP="127.0.0.1"
OUTPUT_PATH="log/master.status"