Skip to content
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

Jump to bottom

fix: Basic auth plugin should run in rewrite phase. #2905

Merged
merged 4 commits into from
Dec 1, 2020
Merged

fix: Basic auth plugin should run in rewrite phase. #2905

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08db6fd
Change phase from access to rewrite.
jenskeiner Nov 30, 2020
e55e3f3
Add stub to verify that consumers are handled correctly.
jenskeiner Nov 30, 2020
e3a2df1
Merge branch 'master' into basic-auth-plugin-rewrite-phase
jenskeiner Dec 1, 2020
aad39d2
Remove setting debug log level.
jenskeiner Dec 1, 2020
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: 2 additions & 0 deletions apisix/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,8 @@ function _M.http_access_phase()
api_ctx.consumer,
api_ctx
)
core.log.debug("find consumer ", api_ctx.consumer.username,
jenskeiner marked this conversation as resolved.
Show resolved Hide resolved
", config changed: ", changed)
if changed then
core.table.clear(api_ctx.plugins)
api_ctx.plugins = plugin.filter(route, api_ctx.plugins)
Expand Down
2 changes: 1 addition & 1 deletion apisix/plugins/basic-auth.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ do
end
end

function _M.access(conf, ctx)
function _M.rewrite(conf, ctx)
core.log.info("plugin access phase, conf: ", core.json.delay_encode(conf))

-- 1. extract authorization from header
Expand Down
4 changes: 4 additions & 0 deletions t/plugin/basic-auth.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#
use t::APISIX 'no_plan';

log_level('debug');
repeat_each(2);
no_long_string();
no_root_location();
Expand Down Expand Up @@ -189,6 +190,7 @@ Authorization: Basic Zm9vOmZvbwo=


=== TEST 8: verify
--- yaml_config eval: $::yaml_config
jenskeiner marked this conversation as resolved.
Show resolved Hide resolved
--- request
GET /hello
--- more_headers
Expand All @@ -197,6 +199,8 @@ Authorization: Basic Zm9vOmJhcg==
hello world
--- no_error_log
[error]
--- error_log
find consumer foo



Expand Down