From 7f465371031ea19d64940be40d77f3162481aa91 Mon Sep 17 00:00:00 2001
From: Sn0rt <wangguohao.2009@gmail.com>
Date: Mon, 23 Oct 2023 10:26:39 +0800
Subject: [PATCH] fix: post_arg match fails because content-type contains
 charset

Signed-off-by: Sn0rt <wangguohao.2009@gmail.com>
---
 apisix/core/ctx.lua       |  4 ++-
 t/core/ctx2.t             | 25 +++++++++----
 t/plugin/traffic-split5.t | 75 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 97 insertions(+), 7 deletions(-)

diff --git a/apisix/core/ctx.lua b/apisix/core/ctx.lua
index 5128061d58fe..6d77b43811ca 100644
--- a/apisix/core/ctx.lua
+++ b/apisix/core/ctx.lua
@@ -260,7 +260,9 @@ do
 
             elseif core_str.has_prefix(key, "post_arg_") then
                 -- only match default post form
-                if request.header(nil, "Content-Type") == "application/x-www-form-urlencoded" then
+                local content_type = request.header(nil, "Content-Type")
+                if content_type ~= nil and core_str.has_prefix(content_type,
+                        "application/x-www-form-urlencoded") then
                     local arg_key = sub_str(key, 10)
                     local args = request.get_post_args()[arg_key]
                     if args then
diff --git a/t/core/ctx2.t b/t/core/ctx2.t
index a99844ffd0d2..7782ac9125cd 100644
--- a/t/core/ctx2.t
+++ b/t/core/ctx2.t
@@ -292,7 +292,20 @@ find ctx.req_post_args.test: true
 
 
 
-=== TEST 13: missed (post_arg_test is missing)
+=== TEST 13: hit with charset
+--- request
+POST /hello
+test=test
+--- more_headers
+Content-Type: application/x-www-form-urlencoded;charset=utf-8
+--- response_body
+hello world
+--- error_log
+find ctx.req_post_args.test: true
+
+
+
+=== TEST 14: missed (post_arg_test is missing)
 --- request
 POST /hello
 --- more_headers
@@ -303,7 +316,7 @@ Content-Type: application/x-www-form-urlencoded
 
 
 
-=== TEST 14: missed (post_arg_test is mismatch)
+=== TEST 15: missed (post_arg_test is mismatch)
 --- request
 POST /hello
 test=tesy
@@ -315,7 +328,7 @@ Content-Type: application/x-www-form-urlencoded
 
 
 
-=== TEST 15: register custom variable
+=== TEST 16: register custom variable
 --- config
     location /t {
         content_by_lua_block {
@@ -351,7 +364,7 @@ Content-Type: application/x-www-form-urlencoded
 
 
 
-=== TEST 16: hit
+=== TEST 17: hit
 --- config
     location /t {
         content_by_lua_block {
@@ -375,7 +388,7 @@ find ctx.var.a6_labels_zone: Singapore
 
 
 
-=== TEST 17: register custom variable with no cacheable
+=== TEST 18: register custom variable with no cacheable
 --- config
     location /t {
         content_by_lua_block {
@@ -412,7 +425,7 @@ find ctx.var.a6_labels_zone: Singapore
 
 
 
-=== TEST 18: hit
+=== TEST 19: hit
 --- config
     location /t {
         content_by_lua_block {
diff --git a/t/plugin/traffic-split5.t b/t/plugin/traffic-split5.t
index b627d38418ba..96e284d5bf06 100644
--- a/t/plugin/traffic-split5.t
+++ b/t/plugin/traffic-split5.t
@@ -460,3 +460,78 @@ GET /server_port?name=jack
 --- error_log eval
 qr/event timer add: \d+: 12345000:\d+/
 --- error_code: 502
+
+
+
+=== TEST 9: set upstream for post_arg_id test case
+--- config
+    location /t {
+        content_by_lua_block {
+            local json = require("toolkit.json")
+            local t = require("lib.test_admin").test
+            local data = {
+                uri = "/hello",
+                plugins = {
+                    ["traffic-split"] = {
+                        rules = {
+                            {
+                                match = { {
+                                    vars = { { "post_arg_id", "==", "1" } }
+                                } },
+                                weighted_upstreams = {
+                                    {
+                                        upstream = {
+                                            name = "upstream_A",
+                                            type = "roundrobin",
+                                            nodes = {
+                                                ["127.0.0.1:1970"] = 1
+                                            }
+                                        },
+                                        weight = 1
+                                    }
+                               }
+                            }
+                        }
+                    }
+                },
+                upstream = {
+                    type = "roundrobin",
+                    nodes = {
+                        ["127.0.0.1:1974"] = 1
+                    }
+                }
+            }
+            local code, body = t('/apisix/admin/routes/1',
+                ngx.HTTP_PUT,
+                json.encode(data)
+            )
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+=== TEST 10: post_arg_id = 1 without content-type charset
+--- request
+POST /hello
+id=1
+--- more_headers
+Content-Type: application/x-www-form-urlencoded
+--- response_body
+1970
+
+
+
+=== TEST 11: post_arg_id = 1 with content-type charset
+--- request
+POST /hello
+id=1
+--- more_headers
+Content-Type: application/x-www-form-urlencoded;charset=UTF-8
+--- response_body
+1970