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

TSG-15514: ALLOW动作不支持多命中

Browse Source
This commit is contained in:
liuxueli
2023-07-05 14:55:29 +08:00
parent 77c3005ca6
commit 4237a4a970
2 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tsg_bridge.cpp
View File

@@ -974,6 +974,7 @@ void session_matched_rules_notify(const struct streaminfo *a_stream, TSG_SERVICE
if(ret<0)
{
session_matched_rules_free_by_bridge(a_stream, g_tsg_bridge_para[bridge_idx].id, (void *)matched_policy);
return ;
}
}
@@ -983,7 +984,7 @@ void session_matched_rules_notify(const struct streaminfo *a_stream, TSG_SERVICE
int repeat_result=0;
for(size_t j=0; j<matched_policy->n_rules; j++)
{
if(rules[i].rule_id==matched_policy->rules[j].rule_id)
if((rules[i].rule_id==matched_policy->rules[j].rule_id) || (rules[i].action==TSG_ACTION_BYPASS && matched_policy->rules[j].action==TSG_ACTION_BYPASS))
{
repeat_result=1;
break;

36
test/src/gtest_bridge.cpp
View File

@@ -849,6 +849,42 @@ TEST(TSGBridge, SessionSessionRuntimeAttributeSubscriberIDTSG15568)
EXPECT_EQ(nullptr, srt_attribute_get_server_subscriber_id((const struct session_runtime_attribute *)srt_attribute_out));
}
TEST(TSGBridge, SessionMatchedRuleNotifyTSG15514)
{
const struct streaminfo a_stream = {0};
struct maat_rule matched_rules_1={15514, TSG_ACTION_BYPASS, TSG_SERVICE_SECURITY, 1, 0, 1};
session_matched_rules_notify(&a_stream, TSG_SERVICE_SECURITY, &matched_rules_1, 1, 0);
struct matched_policy_rules *matched_rules_out=(struct matched_policy_rules *)session_matched_rules_get(&a_stream, TSG_SERVICE_SECURITY);
EXPECT_NE(nullptr, matched_rules_out);
EXPECT_EQ(1, matched_rules_out->n_rules);
EXPECT_EQ(15514, matched_rules_out->rules[0].rule_id);
EXPECT_EQ(TSG_ACTION_BYPASS, matched_rules_out->rules[0].action);
EXPECT_EQ(TSG_SERVICE_SECURITY, matched_rules_out->rules[0].service_id);
EXPECT_EQ(1, matched_rules_out->rules[0].vsys_id);
struct maat_rule matched_rules_2={15514, TSG_ACTION_BYPASS, TSG_SERVICE_SECURITY, 1, 0, 1};
session_matched_rules_notify(&a_stream, TSG_SERVICE_SECURITY, &matched_rules_2, 1, 0);
matched_rules_out=(struct matched_policy_rules *)session_matched_rules_get(&a_stream, TSG_SERVICE_SECURITY);
EXPECT_NE(nullptr, matched_rules_out);
EXPECT_EQ(1, matched_rules_out->n_rules);
EXPECT_EQ(15514, matched_rules_out->rules[0].rule_id);
EXPECT_EQ(TSG_ACTION_BYPASS, matched_rules_out->rules[0].action);
EXPECT_EQ(TSG_SERVICE_SECURITY, matched_rules_out->rules[0].service_id);
EXPECT_EQ(1, matched_rules_out->rules[0].vsys_id);
struct maat_rule matched_rules_3={155145, TSG_ACTION_BYPASS, TSG_SERVICE_SECURITY, 1, 0, 1};
session_matched_rules_notify(&a_stream, TSG_SERVICE_SECURITY, &matched_rules_3, 1, 0);
matched_rules_out=(struct matched_policy_rules *)session_matched_rules_get(&a_stream, TSG_SERVICE_SECURITY);
EXPECT_NE(nullptr, matched_rules_out);
EXPECT_EQ(1, matched_rules_out->n_rules);
EXPECT_EQ(15514, matched_rules_out->rules[0].rule_id);
EXPECT_EQ(TSG_ACTION_BYPASS, matched_rules_out->rules[0].action);
EXPECT_EQ(TSG_SERVICE_SECURITY, matched_rules_out->rules[0].service_id);
EXPECT_EQ(1, matched_rules_out->rules[0].vsys_id);
}
int main(int argc, char *argv[])
{
int ret=tsg_bridge_init("tsgconf/main.conf");