You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by tz...@apache.org on 2022/09/22 10:28:14 UTC
[apisix] branch release/2.10 updated: fix: use modifiedIndex as lru key when merge plugins from route and consumer (#7967)
This is an automated email from the ASF dual-hosted git repository.
tzssangglass pushed a commit to branch release/2.10
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/release/2.10 by this push:
new 742180779 fix: use modifiedIndex as lru key when merge plugins from route and consumer (#7967)
742180779 is described below
commit 74218077998d5769beab02fee3422f240e86b235
Author: tzssangglass <tz...@gmail.com>
AuthorDate: Thu Sep 22 18:28:08 2022 +0800
fix: use modifiedIndex as lru key when merge plugins from route and consumer (#7967)
---
apisix/consumer.lua | 1 +
apisix/plugin.lua | 4 +-
t/node/consumer-plugin2.t | 178 ++++++++++++++++++++++++++++++++++++++++++++++
t/node/plugin-configs.t | 102 ++++++++++++++++++++++++++
4 files changed, 283 insertions(+), 2 deletions(-)
diff --git a/apisix/consumer.lua b/apisix/consumer.lua
index 9a4dc3c42..5e25b7521 100644
--- a/apisix/consumer.lua
+++ b/apisix/consumer.lua
@@ -56,6 +56,7 @@ local function plugin_consumer()
-- is 'username' field in admin
new_consumer.consumer_name = new_consumer.id
new_consumer.auth_conf = config
+ new_consumer.modifiedIndex = consumer.modifiedIndex
core.log.info("consumer:", core.json.delay_encode(new_consumer))
core.table.insert(plugins[name].nodes, new_consumer)
end
diff --git a/apisix/plugin.lua b/apisix/plugin.lua
index 7139a0b7a..f3622580b 100644
--- a/apisix/plugin.lua
+++ b/apisix/plugin.lua
@@ -27,7 +27,6 @@ local pairs = pairs
local type = type
local local_plugins = core.table.new(32, 0)
local ngx = ngx
-local tostring = tostring
local error = error
local is_http = ngx.config.subsystem == "http"
local local_plugins_hash = core.table.new(0, 32)
@@ -474,7 +473,8 @@ function _M.merge_consumer_route(route_conf, consumer_conf, api_ctx)
core.log.info("route conf: ", core.json.delay_encode(route_conf))
core.log.info("consumer conf: ", core.json.delay_encode(consumer_conf))
- local flag = tostring(route_conf) .. tostring(consumer_conf)
+ local flag = route_conf.value.id .. "#" .. route_conf.modifiedIndex
+ .. "#" .. consumer_conf.id .. "#" .. consumer_conf.modifiedIndex
local new_conf = merged_route(flag, nil,
merge_consumer_route, route_conf, consumer_conf)
diff --git a/t/node/consumer-plugin2.t b/t/node/consumer-plugin2.t
new file mode 100644
index 000000000..81d624e91
--- /dev/null
+++ b/t/node/consumer-plugin2.t
@@ -0,0 +1,178 @@
+#
+# 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';
+
+log_level('info');
+repeat_each(1);
+no_long_string();
+no_root_location();
+
+add_block_preprocessor(sub {
+ my ($block) = @_;
+
+ if (!$block->request) {
+ $block->set_value("request", "GET /t");
+ }
+
+ if (!$block->response_body) {
+ $block->set_value("response_body", "passed\n");
+ }
+
+ if (!$block->no_error_log && !$block->error_log) {
+ $block->set_value("no_error_log", "[error]\n[alert]");
+ }
+});
+
+
+our $debug_config = t::APISIX::read_file("conf/debug.yaml");
+$debug_config =~ s/basic:\n enable: false/basic:\n enable: true/;
+$debug_config =~ s/hook_conf:\n enable: false/hook_conf:\n enable: true/;
+
+run_tests;
+
+__DATA__
+
+=== TEST 1: use the latest consumer modifiedIndex as lrucache key
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/consumers',
+ ngx.HTTP_PUT,
+ [[{
+ "username": "foo",
+ "plugins": {
+ "basic-auth": {
+ "username": "foo",
+ "password": "bar"
+ }
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local code, body = t('/apisix/admin/plugin_configs/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "ip-restriction": {
+ "whitelist": ["1.1.1.1"]
+ },
+ "basic-auth": {}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugin_config_id": "1",
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uris": ["/hello"]
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.5)
+
+ local http = require "resty.http"
+ local httpc = http.new()
+ local uri = "http://127.0.0.1:" .. ngx.var.server_port
+ .. "/hello"
+ local headers = {
+ ["Authorization"] = "Basic Zm9vOmJhcg=="
+ }
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ ngx.print(res.body)
+
+ local code, body = t('/apisix/admin/plugin_configs/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "ip-restriction": {
+ "whitelist": ["1.1.1.1", "127.0.0.1"]
+ },
+ "basic-auth": {}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.5)
+
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ if not res then
+ ngx.say(err)
+ return
+ end
+ ngx.print(res.body)
+
+ local code, body = t('/apisix/admin/consumers',
+ ngx.HTTP_PUT,
+ [[{
+ "username": "foo",
+ "plugins": {
+ "basic-auth": {
+ "username": "foo",
+ "password": "bala"
+ }
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.5)
+
+ local headers = {
+ ["Authorization"] = "Basic Zm9vOmJhbGE="
+ }
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ if not res then
+ ngx.say(err)
+ return
+ end
+ ngx.print(res.body)
+ }
+ }
+--- response_body
+{"message":"Your IP address is not allowed"}
+hello world
+hello world
diff --git a/t/node/plugin-configs.t b/t/node/plugin-configs.t
index 16e317809..b52890264 100644
--- a/t/node/plugin-configs.t
+++ b/t/node/plugin-configs.t
@@ -253,3 +253,105 @@ property "block_rules" validation failed
--- response_body
hello
hello world
+
+
+
+=== TEST 5: use the latest plugin_consigs after merge the plugins from consumer and route
+--- config
+ location /t {
+ content_by_lua_block {
+ local t = require("lib.test_admin").test
+ local code, body = t('/apisix/admin/consumers',
+ ngx.HTTP_PUT,
+ [[{
+ "username": "foo",
+ "plugins": {
+ "basic-auth": {
+ "username": "foo",
+ "password": "bar"
+ }
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local code, body = t('/apisix/admin/plugin_configs/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "ip-restriction": {
+ "whitelist": ["1.1.1.1"]
+ },
+ "basic-auth": {}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+
+ local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugin_config_id": "1",
+ "upstream": {
+ "nodes": {
+ "127.0.0.1:1980": 1
+ },
+ "type": "roundrobin"
+ },
+ "uris": ["/hello"]
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.5)
+
+ local http = require "resty.http"
+ local httpc = http.new()
+ local uri = "http://127.0.0.1:" .. ngx.var.server_port
+ .. "/hello"
+ local headers = {
+ ["Authorization"] = "Basic Zm9vOmJhcg=="
+ }
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ ngx.print(res.body)
+
+ local code, body = t('/apisix/admin/plugin_configs/1',
+ ngx.HTTP_PUT,
+ [[{
+ "plugins": {
+ "ip-restriction": {
+ "whitelist": ["1.1.1.1", "127.0.0.1"]
+ },
+ "basic-auth": {}
+ }
+ }]]
+ )
+ if code >= 300 then
+ ngx.status = code
+ ngx.say(body)
+ return
+ end
+ ngx.sleep(0.5)
+
+ local res, err = httpc:request_uri(uri, {headers = headers})
+ if not res then
+ ngx.say(err)
+ return
+ end
+ ngx.print(res.body)
+ }
+ }
+--- response_body
+{"message":"Your IP address is not allowed"}
+hello world