From 9745251b2aff9fac176e0443acd95a9bf33d592c Mon Sep 17 00:00:00 2001 From: fengweihao Date: Fri, 23 Jul 2021 15:55:42 +0800 Subject: TSG-7141 修复非格式日志部分下载失败问题 修复重定向指定用户自定义域无法替换问题 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/business/pangu-http/src/test_pattern_replace.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugin/business/pangu-http/src/test_pattern_replace.cpp') diff --git a/plugin/business/pangu-http/src/test_pattern_replace.cpp b/plugin/business/pangu-http/src/test_pattern_replace.cpp index c993b06..6885661 100644 --- a/plugin/business/pangu-http/src/test_pattern_replace.cpp +++ b/plugin/business/pangu-http/src/test_pattern_replace.cpp @@ -186,7 +186,7 @@ TEST(PatternReplace, UrlReplace) const char *rd_url = "http://www.example.com/query?pageid=12345&policy_id={{tsg_policy_id}}&user_id={{tsg_subscriber_id}}&source_ip={{tsg_client_ip}}"; - if(strstr(rd_url, "policy_id")==NULL && strstr(rd_url, "user_id")==NULL && strstr(rd_url, "source_ip")==NULL) + if(strstr(rd_url, "tsg_policy_id")==NULL && strstr(rd_url, "tsg_subscriber_id")==NULL && strstr(rd_url, "tsg_client_ip")==NULL) { return; } @@ -194,21 +194,21 @@ TEST(PatternReplace, UrlReplace) rule = ALLOC(struct replace_rule, 3); n_rule=0; rule[n_rule].zone = kZoneRequestUri; - rule[n_rule].find = tfe_strdup("policy_id={{tsg_policy_id}}"); - snprintf(replace_with, TFE_SYMBOL_MAX, "policy_id=%d", 23); + rule[n_rule].find = tfe_strdup("{{tsg_policy_id}}"); + snprintf(replace_with, TFE_SYMBOL_MAX, "%d", 23); rule[n_rule].replace_with = tfe_strdup(replace_with); n_rule=1; memset(replace_with, TFE_SYMBOL_MAX, 0); rule[n_rule].zone = kZoneRequestUri; - rule[n_rule].find = tfe_strdup("user_id={{tsg_subscriber_id}}"); - rule[n_rule].replace_with = tfe_strdup("user_id=te&st01"); + rule[n_rule].find = tfe_strdup("{{tsg_subscriber_id}}"); + rule[n_rule].replace_with = tfe_strdup("te&st01"); n_rule=2; memset(replace_with, TFE_SYMBOL_MAX, 0); rule[n_rule].zone = kZoneRequestUri; - rule[n_rule].find = tfe_strdup("source_ip={{tsg_client_ip}}"); - rule[n_rule].replace_with = tfe_strdup("source_ip=192.168.50.71"); + rule[n_rule].find = tfe_strdup("{{tsg_client_ip}}"); + rule[n_rule].replace_with = tfe_strdup("192.168.50.71"); size_t rewrite_uri_sz = execute_replace_rule(rd_url, strlen(rd_url), kZoneRequestUri, rule, n_rule+1, &rewrite_uri, 1); -- cgit v1.2.3