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

feat: add token request hooks for all grant types #3427

Merged
merged 9 commits into from
Mar 26, 2023
Merged

feat: add token request hooks for all grant types #3427

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2ca2980
feat: add token hooks for all grant types
sgal Jan 29, 2023
1e419f3
Add tests for webhook in client_credentials grant_type
sgal Jan 29, 2023
05606f9
Add tests for webhook in jwt_bearer grant_type
sgal Jan 29, 2023
923557c
Add tests for hook in authorization_code grant_type
sgal Jan 29, 2023
4d5fb14
Fix openapi description fro payload field
sgal Jan 30, 2023
fb5bd4b
fix: address review comments
sgal Mar 7, 2023
272b1a7
fix: strip sensitive values from the hook payload
sgal Mar 23, 2023
8a37a90
fix:make a generic token hook config that is run for all grant types
sgal Mar 24, 2023
d06cdf0
fix:add hook tests for authorization code grant
sgal Mar 24, 2023
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
21 changes: 16 additions & 5 deletions driver/config/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,10 @@ const (
KeyOAuth2GrantJWTIDOptional = "oauth2.grant.jwt.jti_optional"
KeyOAuth2GrantJWTIssuedDateOptional = "oauth2.grant.jwt.iat_optional"
KeyOAuth2GrantJWTMaxDuration = "oauth2.grant.jwt.max_ttl"
KeyRefreshTokenHookURL = "oauth2.refresh_token_hook" // #nosec G101
KeyRefreshTokenHookURL = "oauth2.refresh_token_hook" // #nosec G101
KeyAuthorizationCodeHookURL = "oauth2.authorization_code_hook" // #nosec G101
KeyClientCredentialsHookURL = "oauth2.client_credentials_hook" // #nosec G101
KeyJWTBearerHookURL = "oauth2.jwt_bearer_hook" // #nosec G101
KeyDevelopmentMode = "dev"
)

Expand Down Expand Up @@ -420,14 +423,22 @@ func (p *DefaultProvider) AccessTokenStrategy(ctx context.Context, additionalSou
return s
}

func (p *DefaultProvider) TokenRefreshHookURL(ctx context.Context) *url.URL {
if len(p.getProvider(ctx).String(KeyRefreshTokenHookURL)) == 0 {
return nil
}
func (p *DefaultProvider) AuthorizationCodeHookURL(ctx context.Context) *url.URL {
return p.getProvider(ctx).RequestURIF(KeyAuthorizationCodeHookURL, nil)
}

func (p *DefaultProvider) ClientCredentialsHookURL(ctx context.Context) *url.URL {
return p.getProvider(ctx).RequestURIF(KeyClientCredentialsHookURL, nil)
}

func (p *DefaultProvider) TokenRefreshHookURL(ctx context.Context) *url.URL {
return p.getProvider(ctx).RequestURIF(KeyRefreshTokenHookURL, nil)
}

func (p *DefaultProvider) JWTBearerRefreshHookURL(ctx context.Context) *url.URL {
return p.getProvider(ctx).RequestURIF(KeyJWTBearerHookURL, nil)
}

func (p *DefaultProvider) DbIgnoreUnknownTableColumns() bool {
return p.p.Bool(KeyDBIgnoreUnknownTableColumns)
}
Expand Down
3 changes: 3 additions & 0 deletions driver/registry_base.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,9 @@ func (m *RegistryBase) AccessRequestHooks() []oauth2.AccessRequestHook {
if m.arhs == nil {
m.arhs = []oauth2.AccessRequestHook{
oauth2.RefreshTokenHook(m),
oauth2.AuthorizationCodeHook(m),
oauth2.ClientCredentialsHook(m),
oauth2.JWTBearerHook(m),
}
}
return m.arhs
Expand Down
10 changes: 2 additions & 8 deletions ...=should_pass_request_if_strategy_passes-should_call_refresh_token_hook_if_configured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@
"allowed_top_level_claims": []
},
"requester": {
"client_id": "app-client",
"granted_scopes": [
"offline",
"openid",
"hydra.*"
],
"granted_audience": [],
"grant_types": [
"refresh_token"
]
],
"payload": {}
},
"client_id": "app-client",
"granted_scopes": [
Expand Down
10 changes: 2 additions & 8 deletions ...none_and_max_age_is_less_than_auth_time-should_call_refresh_token_hook_if_configured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@
"allowed_top_level_claims": []
},
"requester": {
"client_id": "app-client",
"granted_scopes": [
"offline",
"openid",
"hydra.*"
],
"granted_audience": [],
"grant_types": [
"refresh_token"
]
],
"payload": {}
},
"client_id": "app-client",
"granted_scopes": [
Expand Down
10 changes: 2 additions & 8 deletions ...ogin_when_authentication_time_is_recent-should_call_refresh_token_hook_if_configured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@
"allowed_top_level_claims": []
},
"requester": {
"client_id": "app-client",
"granted_scopes": [
"offline",
"openid",
"hydra.*"
],
"granted_audience": [],
"grant_types": [
"refresh_token"
]
],
"payload": {}
},
"client_id": "app-client",
"granted_scopes": [
Expand Down
10 changes: 2 additions & 8 deletions ...=should_pass_request_if_strategy_passes-should_call_refresh_token_hook_if_configured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@
"allowed_top_level_claims": []
},
"requester": {
"client_id": "app-client",
sgal marked this conversation as resolved.
Show resolved Hide resolved
"granted_scopes": [
"offline",
"openid",
"hydra.*"
],
"granted_audience": [],
"grant_types": [
"refresh_token"
]
],
"payload": {}
},
"client_id": "app-client",
"granted_scopes": [
Expand Down
10 changes: 2 additions & 8 deletions ...none_and_max_age_is_less_than_auth_time-should_call_refresh_token_hook_if_configured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@
"allowed_top_level_claims": []
},
"requester": {
"client_id": "app-client",
"granted_scopes": [
"offline",
"openid",
"hydra.*"
],
"granted_audience": [],
"grant_types": [
"refresh_token"
]
],
"payload": {}
},
"client_id": "app-client",
"granted_scopes": [
Expand Down
10 changes: 2 additions & 8 deletions ...ogin_when_authentication_time_is_recent-should_call_refresh_token_hook_if_configured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,10 @@
"allowed_top_level_claims": []
},
"requester": {
"client_id": "app-client",
"granted_scopes": [
"offline",
"openid",
"hydra.*"
],
"granted_audience": [],
"grant_types": [
"refresh_token"
]
],
"payload": {}
},
"client_id": "app-client",
"granted_scopes": [
Expand Down
Loading