-
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
feat: add support for password grant in authz-keycloak plugin #6586
Merged
spacewander
merged 11 commits into
apache:master
from
Azilen:feat-6574-keycloak-plugin-password-grant-support
Mar 21, 2022
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
f952324
Removed unnecessary file (+2 squashed commit)
Rushabh-Sukhadia fc96102
Refactored code.
azilentech 07ae576
Test cases added.
azilentech a2b0d40
Used apisix util split method.
azilentech fbdf244
I have combined test cases where route is set and token is generated …
azilentech 250040b
used local str_find
azilentech eb60718
Review comments incorporated.
azilentech 7cea982
Review comments incorporated.
azilentech 8f34241
Incorporated review comments:
azilentech c1d1c8d
introduced need_grant_token for composite conditions for better reada…
azilentech bd91138
used ctx.var instead of ngx.var
azilentech 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
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
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 |
---|---|---|
|
@@ -179,6 +179,7 @@ done | |
access_token_expires_leeway = 0, | ||
refresh_token_expires_in = 3600, | ||
refresh_token_expires_leeway = 0, | ||
password_grant_token_generation_incoming_uri = "/api/token", | ||
}) | ||
if not ok then | ||
ngx.say(err) | ||
|
@@ -621,3 +622,77 @@ GET /t | |
--- response_headers | ||
Location: http://127.0.0.1/test | ||
--- error_code: 307 | ||
|
||
|
||
|
||
=== TEST 18: Add https endpoint with password_grant_token_generation_incoming_uri | ||
--- 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 res, err = httpc:request_uri(uri, { | ||
method = "POST", | ||
headers = { | ||
["Content-Type"] = "application/x-www-form-urlencoded", | ||
}, | ||
|
||
body = ngx.encode_args({ | ||
username = "[email protected]", | ||
password = "123456", | ||
}), | ||
}) | ||
|
||
if res.status == 200 then | ||
local body = json_decode(res.body) | ||
local accessToken = body["access_token"] | ||
local refreshToken = body["refresh_token"] | ||
|
||
if accessToken and refreshToken then | ||
ngx.say(true) | ||
else | ||
ngx.say(false) | ||
end | ||
else | ||
ngx.say(false) | ||
end | ||
} | ||
} | ||
--- request | ||
GET /t | ||
--- response_body | ||
true | ||
--- 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.
We should also check the "Content-Type"?
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.
Yes. it was missed. I introduced that now.