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

identity/oidc: fixes validation of the request and request_uri parameters #16600

Merged
merged 2 commits into from
Aug 5, 2022
Merged

identity/oidc: fixes validation of the request and request_uri parameters #16600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6af3f0
identity/oidc: add request_parameter_supported to discovery document
austingebauer Aug 5, 2022
297e617
adds changelog
austingebauer Aug 5, 2022
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
3 changes: 3 additions & 0 deletions changelog/16600.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
identity/oidc: Fixes validation of the `request` and `request_uri` parameters.
```
4 changes: 4 additions & 0 deletions ui/app/controllers/vault/cluster/oidc-provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ export default class VaultClusterOidcProviderController extends Controller {
'max_age',
'code_challenge',
'code_challenge_method',
'request',
'request_uri',
];
scope = null;
response_type = null;
Expand All @@ -25,4 +27,6 @@ export default class VaultClusterOidcProviderController extends Controller {
max_age = null;
code_challenge = null;
code_challenge_method = null;
request = null;
request_uri = null;
}
2 changes: 2 additions & 0 deletions vault/identity_store_oidc_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ type providerDiscovery struct {
AuthorizationEndpoint string `json:"authorization_endpoint"`
TokenEndpoint string `json:"token_endpoint"`
UserinfoEndpoint string `json:"userinfo_endpoint"`
RequestParameter bool `json:"request_parameter_supported"`
RequestURIParameter bool `json:"request_uri_parameter_supported"`
IDTokenAlgs []string `json:"id_token_signing_alg_values_supported"`
ResponseTypes []string `json:"response_types_supported"`
Expand Down Expand Up @@ -1474,6 +1475,7 @@ func (i *IdentityStore) pathOIDCProviderDiscovery(ctx context.Context, req *logi
UserinfoEndpoint: p.effectiveIssuer + "/userinfo",
IDTokenAlgs: supportedAlgs,
Scopes: scopes,
RequestParameter: false,
RequestURIParameter: false,
ResponseTypes: []string{"code"},
Subjects: []string{"public"},
Expand Down
2 changes: 2 additions & 0 deletions vault/identity_store_oidc_provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3615,6 +3615,7 @@ func TestOIDC_Path_OpenIDProviderConfig(t *testing.T) {
UserinfoEndpoint: basePath + "/userinfo",
GrantTypes: []string{"authorization_code"},
AuthMethods: []string{"none", "client_secret_basic"},
RequestParameter: false,
RequestURIParameter: false,
}
discoveryResp := &providerDiscovery{}
Expand Down Expand Up @@ -3669,6 +3670,7 @@ func TestOIDC_Path_OpenIDProviderConfig(t *testing.T) {
UserinfoEndpoint: basePath + "/userinfo",
GrantTypes: []string{"authorization_code"},
AuthMethods: []string{"none", "client_secret_basic"},
RequestParameter: false,
RequestURIParameter: false,
}
discoveryResp = &providerDiscovery{}
Expand Down
1 change: 1 addition & 0 deletions website/content/api-docs/secret/identity/oidc-provider.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,7 @@ $ curl \
"authorization_endpoint": "http:https://127.0.0.1:8200/ui/vault/identity/oidc/provider/test-provider/authorize",
"token_endpoint": "http:https://127.0.0.1:8200/v1/identity/oidc/provider/test-provider/token",
"userinfo_endpoint": "http:https://127.0.0.1:8200/v1/identity/oidc/provider/test-provider/userinfo",
"request_parameter_supported": false,
"request_uri_parameter_supported": false,
"id_token_signing_alg_values_supported": [
"RS256",
Expand Down
1 change: 1 addition & 0 deletions website/content/docs/secrets/identity/oidc-provider.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ Any Vault auth method may be used within the OIDC flow. For simplicity, enable t
"authorization_endpoint": "http:https://127.0.0.1:8200/ui/vault/identity/oidc/provider/default/authorize",
"token_endpoint": "http:https://127.0.0.1:8200/v1/identity/oidc/provider/default/token",
"userinfo_endpoint": "http:https://127.0.0.1:8200/v1/identity/oidc/provider/default/userinfo",
"request_parameter_supported": false,
"request_uri_parameter_supported": false,
"id_token_signing_alg_values_supported": [
"RS256",
Expand Down