-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
fix(authz-keycloak): do not expose internal errors to the client #6854
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -721,13 +721,13 @@ local function generate_token_using_password_grant(conf,ctx) | |
|
||
if not username then | ||
local err = "username is missing." | ||
log.error(err) | ||
return 422, err | ||
log.warn(err) | ||
return 422, {message = err} | ||
end | ||
if not password then | ||
local err = "password is missing." | ||
log.error(err) | ||
return 422, err | ||
log.warn(err) | ||
return 422, {message = err} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditto There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. add |
||
end | ||
|
||
local client_id = authz_keycloak_get_client_id(conf) | ||
|
@@ -737,7 +737,7 @@ local function generate_token_using_password_grant(conf,ctx) | |
if not token_endpoint then | ||
local err = "Unable to determine token endpoint." | ||
log.error(err) | ||
return 503, err | ||
return 503, {message = err} | ||
end | ||
local httpc = authz_keycloak_get_http_client(conf) | ||
|
||
|
@@ -763,7 +763,7 @@ local function generate_token_using_password_grant(conf,ctx) | |
err = "Accessing token endpoint URL (" .. token_endpoint | ||
.. ") failed: " .. err | ||
log.error(err) | ||
return 401, {message = err} | ||
return 401, {message = "Accessing token endpoint URL failed."} | ||
end | ||
|
||
log.debug("Response data: " .. res.body) | ||
|
@@ -773,7 +773,7 @@ local function generate_token_using_password_grant(conf,ctx) | |
err = "Could not decode JSON from response" | ||
.. (err and (": " .. err) or '.') | ||
log.error(err) | ||
return 401, {message = err} | ||
return 401, {message = "Could not decode JSON from response."} | ||
end | ||
|
||
return res.status, res.body | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -623,3 +623,76 @@ GET /t | |||||
true | ||||||
--- no_error_log | ||||||
[error] | ||||||
|
||||||
|
||||||
|
||||||
=== TEST 19: no username of password | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
--- 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, | ||||||
[[{ | ||||||
"plugins": { | ||||||
"authz-keycloak": { | ||||||
"token_endpoint": "https://127.0.0.1:8443/auth/realms/University/protocol/openid-connect/token", | ||||||
"permissions": ["course_resource#view"], | ||||||
"client_id": "course_management", | ||||||
"client_secret": "d1ec69e9-55d2-4109-a3ea-befa071579d5", | ||||||
"grant_type": "urn:ietf:params:oauth:grant-type:uma-ticket", | ||||||
"timeout": 3000, | ||||||
"ssl_verify": false, | ||||||
"password_grant_token_generation_incoming_uri": "/api/token" | ||||||
} | ||||||
}, | ||||||
"upstream": { | ||||||
"nodes": { | ||||||
"127.0.0.1:1982": 1 | ||||||
}, | ||||||
"type": "roundrobin" | ||||||
}, | ||||||
"uri": "/api/token" | ||||||
}]] | ||||||
) | ||||||
|
||||||
if code >= 300 then | ||||||
ngx.status = code | ||||||
end | ||||||
|
||||||
local json_decode = require("toolkit.json").decode | ||||||
local http = require "resty.http" | ||||||
local httpc = http.new() | ||||||
local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/api/token" | ||||||
local headers = { | ||||||
["Content-Type"] = "application/x-www-form-urlencoded", | ||||||
} | ||||||
|
||||||
-- no username | ||||||
local res, err = httpc:request_uri(uri, { | ||||||
method = "POST", | ||||||
headers = headers, | ||||||
body = ngx.encode_args({ | ||||||
password = "123456", | ||||||
}), | ||||||
}) | ||||||
ngx.print(res.body) | ||||||
|
||||||
-- no password | ||||||
local res, err = httpc:request_uri(uri, { | ||||||
method = "POST", | ||||||
headers = headers, | ||||||
body = ngx.encode_args({ | ||||||
username = "teacher@gmail.com", | ||||||
}), | ||||||
}) | ||||||
ngx.print(res.body) | ||||||
} | ||||||
} | ||||||
--- request | ||||||
GET /t | ||||||
--- response_body | ||||||
{"message":"username is missing."} | ||||||
{"message":"password is missing."} | ||||||
--- no_error_log | ||||||
[error] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be better to add test to cover this branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
add