You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by mo...@apache.org on 2024/01/12 07:54:59 UTC
(apisix) branch master updated: feat: support `uri_arg_` when use `radixtree_uri_with_parameter` (#10645)
This is an automated email from the ASF dual-hosted git repository.
monkeydluffy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new c11782a60 feat: support `uri_arg_` when use `radixtree_uri_with_parameter` (#10645)
c11782a60 is described below
commit c11782a607db58298bc2f848fd3ff0ae63fb7e09
Author: Warnar Boekkooi <88...@users.noreply.github.com>
AuthorDate: Fri Jan 12 08:54:53 2024 +0100
feat: support `uri_arg_` when use `radixtree_uri_with_parameter` (#10645)
---
apisix/core/ctx.lua | 8 +++
t/core/ctx_with_params.t | 153 +++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 161 insertions(+)
diff --git a/apisix/core/ctx.lua b/apisix/core/ctx.lua
index 6d77b4381..36b8788bd 100644
--- a/apisix/core/ctx.lua
+++ b/apisix/core/ctx.lua
@@ -274,6 +274,14 @@ do
end
end
+ elseif core_str.has_prefix(key, "uri_param_") then
+ -- `uri_param_<name>` provides access to the uri parameters when using
+ -- radixtree_uri_with_parameter
+ if t._ctx.curr_req_matched then
+ local arg_key = sub_str(key, 11)
+ val = t._ctx.curr_req_matched[arg_key]
+ end
+
elseif core_str.has_prefix(key, "http_") then
key = key:lower()
key = re_gsub(key, "-", "_", "jo")
diff --git a/t/core/ctx_with_params.t b/t/core/ctx_with_params.t
new file mode 100644
index 000000000..6bff7dc3a
--- /dev/null
+++ b/t/core/ctx_with_params.t
@@ -0,0 +1,153 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+use t::APISIX 'no_plan';
+
+repeat_each(1);
+no_long_string();
+no_root_location();
+no_shuffle();
+
+our $yaml_config = <<_EOC_;
+apisix:
+ router:
+ http: 'radixtree_uri_with_parameter'
+_EOC_
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ if (!$block->yaml_config) {
+ $block->set_value("yaml_config", $yaml_config);
+ }
+});
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: add route and get `uri_param_`
+--- 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,
+ [[{
+ "methods": ["GET"],
+ "plugins": {
+ "serverless-pre-function": {
+ "phase": "access",
+ "functions" : ["return function() ngx.log(ngx.INFO, \"uri_param_id: \", ngx.ctx.api_ctx.var.uri_param_id) end"]
+ }
+ },
+ "upstream": {
+ "type": "roundrobin",
+ "nodes": {
+ "127.0.0.1:1980": 1
+ }
+ },
+ "uri": "/:id"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+
+
+
+=== TEST 2: `uri_param_id` exist (hello)
+--- request
+GET /hello
+--- response_body
+hello world
+--- error_log
+uri_param_id: hello
+
+
+
+=== TEST 3: `uri_param_id` exist (hello1)
+--- request
+GET /hello1
+--- response_body
+hello1 world
+--- error_log
+uri_param_id: hello1
+
+
+
+=== TEST 4: `uri_param_id` nonexisting route
+--- request
+GET /not_a_route
+--- error_code: 404
+--- error_log
+uri_param_id: not_a_route
+
+
+
+=== TEST 5: add route and get unknown `uri_param_id`
+--- 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,
+ [[{
+ "methods": ["GET"],
+ "plugins": {
+ "serverless-pre-function": {
+ "phase": "access",
+ "functions" : ["return function() ngx.log(ngx.INFO, \"uri_param_id: \", ngx.ctx.api_ctx.var.uri_param_id) end"]
+ }
+ },
+ "upstream": {
+ "type": "roundrobin",
+ "nodes": {
+ "127.0.0.1:1980": 1
+ }
+ },
+ "uri": "/hello"
+ }]]
+ )
+
+ if code >= 300 then
+ ngx.status = code
+ end
+ ngx.say(body)
+ }
+ }
+--- request
+GET /t
+--- response_body
+passed
+
+
+
+=== TEST 6: `uri_param_id` not in uri
+--- request
+GET /hello
+--- response_body
+hello world
+--- error_log
+uri_param_id: