From 1437b60164a05395cf35599a7c2f3a9d1d4f995d Mon Sep 17 00:00:00 2001
From: Abhishek Choudhary <shreemaan.abhishek@gmail.com>
Date: Fri, 24 Nov 2023 08:50:42 +0545
Subject: [PATCH] fix: closing brace should not be a part of variable (#10485)

---
 apisix/core/utils.lua       |  6 +++--
 t/plugin/fault-injection2.t | 44 +++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/apisix/core/utils.lua b/apisix/core/utils.lua
index 70531e7c1fa9..adca3d856d8c 100644
--- a/apisix/core/utils.lua
+++ b/apisix/core/utils.lua
@@ -292,11 +292,13 @@ local resolve_var
 do
     local _ctx
     local n_resolved
-    local pat = [[(?<!\\)\$\{?(\w+)\}?]]
+    local pat = [[(?<!\\)\$(\{(\w+)\}|(\w+))]]
     local _escaper
 
     local function resolve(m)
-        local v = _ctx[m[1]]
+        local variable = m[2] or m[3]
+        local v = _ctx[variable]
+
         if v == nil then
             return ""
         end
diff --git a/t/plugin/fault-injection2.t b/t/plugin/fault-injection2.t
index 0ba23f536069..bd28f6bfa5d2 100644
--- a/t/plugin/fault-injection2.t
+++ b/t/plugin/fault-injection2.t
@@ -140,3 +140,47 @@ GET /hello
 h1: v1
 h2: 2
 h3: /hello
+
+
+
+=== TEST 6: closing curly brace not should not be a part of variable
+--- config
+ location /t {
+           content_by_lua_block {
+               local t = require("lib.test_admin").test
+               local code, body = t('/apisix/admin/routes/1',
+                    ngx.HTTP_PUT,
+                    [=[{
+                            "plugins": {
+                               "fault-injection": {
+                                   "abort": {
+                                      "http_status": 200,
+                                      "body": "{\"count\": $arg_count}"
+                                   }
+                               }
+                            },
+                            "upstream": {
+                               "nodes": {
+                                   "127.0.0.1:1980": 1
+                               },
+                               "type": "roundrobin"
+                            },
+                            "uri": "/hello"
+                        }]=]
+                   )
+               if code >= 300 then
+                   ngx.status = code
+               end
+               ngx.say(body)
+           }
+       }
+--- response_body
+passed
+
+
+
+=== TEST 7: test route
+--- request
+GET /hello?count=2
+--- response_body chomp
+{"count": 2}