fix: wildcard needs to match newline (#99)

api7 · Jul 7, 2021 · 776e155 · 776e155
1 parent 61b2fc7
commit 776e155
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/lib/resty/radixtree.lua b/lib/resty/radixtree.lua
@@ -469,7 +469,8 @@ local function fetch_pat(path)
                 name = ":ext"
             end
             table.insert(names, name)
-            res[i] = [=[(.*)]=]
+            -- '.' matches any character except newline
+            res[i] = [=[((.|\n)*)]=]
         end
     end
 

diff --git a/t/matched.t b/t/matched.t
@@ -155,3 +155,51 @@ GET /t?k=v
 [error]
 --- response_body
 after dispatch success get matched: {"_host":"foo.com","_method":"GET","_path":"/hello*"}
+
+
+
+=== TEST 6: match uri with '\n'
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = "*",
+                    metadata = "OK",
+                },
+            })
+            local opts = {method = "GET", matched = {}}
+            ngx.say(rx:match("/ip\nA", opts))
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+OK
+
+
+
+=== TEST 7: match uri with multiple '\n'
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = "*",
+                    metadata = "OK",
+                },
+            })
+            local opts = {method = "GET", matched = {}}
+            ngx.say(rx:match("/ip\ni\ni", opts))
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+OK