Skip to content

feat: support the HTTP QUERY method (RFC 10008) #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
indrekj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: support the HTTP QUERY method (RFC 10008) #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Each route can have the following attributes:
| paths | Required | List of request paths to match the route. By default does a full match. Adding `*` at the end will result in prefix match. For example, `/foo*` can match requests with paths `/foo/bar` and `/foo/car/far`. | {"/", "/foo", "/bar/\*"} |
| hosts | Optional | List of host addresses to match the route. Supports wildcards. For example `*.bar.com` can match `foo.bar.com` and `car.bar.com`. | {"foo.com", "\*.bar.com"} |
| remote_addrs | Optional | List of remote addresses (IPv4 or IPv6) to match the route. Supports CIDR format. | {"127.0.0.1", "192.0.0.0/8", "::1", "fe80::/32"} |
| methods | Optional | List of HTTP methods to match the route. Valid values: "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "CONNECT" and "TRACE". | {"GET", "POST"} |
| methods | Optional | List of HTTP methods to match the route. Valid values: "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "CONNECT", "TRACE", "PURGE" and "QUERY". | {"GET", "POST"} |
| vars | Optional | DSL to evaluate with the provided `opts.vars` or `ngx.var`. See: [lua-resty-expr](https://github.com/api7/lua-resty-expr#new). | {{"arg_name", "==", "json"}, {"arg_age", ">", 18}} |
| filter_fun | Optional | User defined filter function to match the route. Can be used for custom matching scenarios. `vars` and `opts` will be passed to the function when matching a route. | function(vars) return vars["arg_name"] == "json" end |
| priority | Optional | Route priority. Defaults to 0. | priority = 100 |
Expand Down
2 changes: 1 addition & 1 deletion lib/resty/radixtree.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ ffi_cdef[[

local METHODS = {}
for i, name in ipairs({"GET", "POST", "PUT", "DELETE", "PATCH", "HEAD",
"OPTIONS", "CONNECT", "TRACE", "PURGE"}) do
"OPTIONS", "CONNECT", "TRACE", "PURGE", "QUERY"}) do
METHODS[name] = bit.lshift(1, i - 1)
-- ngx.log(ngx.WARN, "name: ", name, " val: ", METHODS[name])
end
Expand Down
40 changes: 39 additions & 1 deletion t/sanity.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,45 @@ nil



=== TEST 11: Iterator
=== TEST 11: method: QUERY
--- config
location /t {
content_by_lua_block {
local radix = require("resty.radixtree")
local rx = radix.new({
{
paths = {"/aa"},
methods = {"QUERY"},
metadata = "metadata /aa",
},
{
paths = {"/aa*"},
methods = {"PUT"},
metadata = "metadata /aa*",
}
})

ngx.say(rx:match("/aa", {method = "QUERY"}))
ngx.say(rx:match("/aa/bb", {method = "QUERY"}))


ngx.say(rx:match("/aa", {method = "GET"}))
ngx.say(rx:match("/aa/bb", {method = "GET"}))
}
}
--- request
GET /t
--- no_error_log
[error]
--- response_body
metadata /aa
nil
nil
nil



=== TEST 12: Iterator
--- config
location /t {
content_by_lua_block {
Expand Down