fix: remove backslash before slash when encoding (#8684)

Fixes #7785
apache · Jan 18, 2023 · 4131fbf · 4131fbf
1 parent b440a06
commit 4131fbf
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 5 deletions.
diff --git a/apisix/core/json.lua b/apisix/core/json.lua
@@ -29,6 +29,7 @@ local pairs = pairs
 local cached_tab = {}
 
 
+cjson.encode_escape_forward_slash(false)
 cjson.decode_array_with_array_mt(true)
 local _M = {
     version = 0.1,

diff --git a/t/admin/api.t b/t/admin/api.t
@@ -137,4 +137,4 @@ deployment:
 X-API-KEY: edd1c9f034335f136f87ad84b625c8f1
 --- response_headers
 X-API-VERSION: v2
---- response_body_like: "\\/apisix\\/routes"
+--- response_body_like: "/apisix/routes"
diff --git a/t/core/json.t b/t/core/json.t
@@ -139,3 +139,22 @@ qr/\{"b":\{"a":\{"b":"table: 0x[\w]+"\}\}\}/
 --- response_body
 {"arr":[]}
 {"obj":{}}
+
+
+
+=== TEST 7: encode slash without escape
+--- config
+    location /t {
+        content_by_lua_block {
+            local core = require("apisix.core")
+            local json_data = core.json.encode({test="/test"})
+
+            ngx.say("encode: ", json_data)
+
+            local data = core.json.decode(json_data)
+            ngx.say("data: ", data.test)
+        }
+    }
+--- response_body
+encode: {"test":"/test"}
+data: /test
diff --git a/t/gm/gm.t b/t/gm/gm.t
@@ -157,7 +157,7 @@ location /t {
 }
 --- error_code: 400
 --- response_body
-{"error_msg":"sign cert\/key are required"}
+{"error_msg":"sign cert/key are required"}
 
 
 

diff --git a/t/plugin/ext-plugin/sanity.t b/t/plugin/ext-plugin/sanity.t
@@ -225,7 +225,7 @@ EXPIRE 3600
     }
 --- error_log
 runner exited with reason: exit, status: 111
-respawn runner 3 seconds later with cmd: ["t\/plugin\/ext-plugin\/runner.sh","0.1"]
+respawn runner 3 seconds later with cmd: ["t/plugin/ext-plugin/runner.sh","0.1"]
 
 
 

diff --git a/t/plugin/real-ip.t b/t/plugin/real-ip.t
@@ -80,7 +80,7 @@ __DATA__
 --- response_body
 {"error_msg":"failed to check the configuration of plugin real-ip err: property \"source\" is required"}
 {"error_msg":"failed to check the configuration of plugin real-ip err: property \"trusted_addresses\" validation failed: failed to validate item 1: object matches none of the required"}
-{"error_msg":"failed to check the configuration of plugin real-ip err: invalid ip address: ::1\/129"}
+{"error_msg":"failed to check the configuration of plugin real-ip err: invalid ip address: ::1/129"}
 
 
 

diff --git a/t/stream-node/sanity.t b/t/stream-node/sanity.t
@@ -317,7 +317,7 @@ hello world
 GET /t
 --- error_code: 400
 --- response_body
-{"error_msg":"invalid remote_addr: :\/8"}
+{"error_msg":"invalid remote_addr: :/8"}