From 66934ce6f06d37a9f2d6bfc62b6a89503f595f15 Mon Sep 17 00:00:00 2001 From: yangwei Date: Wed, 1 Dec 2021 15:11:09 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(Firewall):=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0tsg=E6=80=BB=E6=8E=A7=EF=BC=8Csocks=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=E5=92=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=E8=AF=86=E5=88=AB?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=20tsg=5Fmaster:fix=20TSG-8407,TSG-8583,?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DL2TP/MAIL=E6=97=A5=E5=BF=97=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20app=5Fproto=5Fidentify:fix=20TSG-8697,TSG-?= =?UTF-8?q?7126,=E4=BF=AE=E5=A4=8Dsocks,L2TP,RTP,FTPS=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E4=B8=8D=E5=87=86=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=20deal=5Fsocks:=E4=BB=8Ebusiness=E5=B1=82=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=E8=87=B3protocol=E5=B1=82=EF=BC=8C=E8=A7=A3=E5=86=B3socks?= =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=B1=82=E7=BB=93=E6=9D=9F=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=BC=82=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 6 +++--- .../roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 | 2 +- .../roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 | 2 +- ansible/roles/sapp/templates/entrylist.conf.j2 | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index b8147fae..457effcb 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -20,11 +20,11 @@ firewall_rpm_version: rtp: rtp-1.0.5.93e978a mesa_sip: mesa_sip-1.1.2.b4bc77d fw_voip_plug: fw_voip_plug-1.0.7.0521f2f - app_proto_identify: app_proto_identify-2.0.14.769dbe8 + app_proto_identify: app_proto_identify-2.0.16.85f5d7c app_proto_engine: app_proto_engine-2.1.3.cc6c1ed gtp: gtp-1.0.5.afa055c gtp_signaling_plug: gtp_signaling_plug-1.0.3.c3d2c93 - deal_socks: deal_socks-1.0.2.379a897 + deal_socks: deal_socks-1.0.3.651bc6f tsg_ddos_sketch: tsg_ddos_sketch-1.2.2.6ed20a6 radius: radius-1.0.5.b330829 radius_collect_plug: radius_collect_plug-2.0.4.7057cc5 @@ -66,7 +66,7 @@ tsg_app_rpm_version: app_sketch_local: app_sketch_local-4.2.0.9529fcf tsg_master_rpm_version: - tsg_master: tsg_master-5.4.19.6cde067 + tsg_master: tsg_master-5.4.20.f98acd8 tsg_diagnose_rpm_version: tsg_diagnose: tsg-diagnose-21.10.2.c848872 diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 index 4a4a6958..ab980974 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 @@ -22,6 +22,7 @@ {% endraw %} [protocol] +./plug/protocol/deal_socks/deal_socks.inf ./plug/protocol/mesa_sip/mesa_sip.inf ./plug/protocol/rtp/rtp.inf ./plug/protocol/ssl/ssl.inf @@ -60,7 +61,6 @@ ./plug/business/fw_quic_plug/fw_quic_plug.inf ./plug/business/fw_voip_plug/fw_voip_plug.inf ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf -./plug/business/deal_socks/deal_socks.inf {% endif %} ./plug/business/conn_telemetry/conn_telemetry.inf {% if app.identify_by.user_defined_signature == 1 %} diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 index 118951b7..74c58e55 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 @@ -22,6 +22,7 @@ {% endraw %} [protocol] +./plug/protocol/deal_socks/deal_socks.inf ./plug/protocol/mesa_sip/mesa_sip.inf ./plug/protocol/rtp/rtp.inf ./plug/protocol/ssl/ssl.inf @@ -60,7 +61,6 @@ ./plug/business/fw_quic_plug/fw_quic_plug.inf ./plug/business/fw_voip_plug/fw_voip_plug.inf ./plug/business/gtp_signaling_plug/gtp_signaling_plug.inf -./plug/business/deal_socks/deal_socks.inf {% endif %} ./plug/business/conn_telemetry/conn_telemetry.inf {% if app.identify_by.user_defined_signature == 1 %} diff --git a/ansible/roles/sapp/templates/entrylist.conf.j2 b/ansible/roles/sapp/templates/entrylist.conf.j2 index e1415474..b2b14849 100644 --- a/ansible/roles/sapp/templates/entrylist.conf.j2 +++ b/ansible/roles/sapp/templates/entrylist.conf.j2 @@ -19,4 +19,5 @@ RTP SIP GTP SSH -RADIUS \ No newline at end of file +RADIUS +SOCKS