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: pass associated oauth client data to token hook #3790

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+299 −20
Open

feat: pass associated oauth client data to token hook #3790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,3 +580,11 @@ type IDer interface{ GetID() string }
func CookieSuffix(client IDer) string {
return strconv.Itoa(int(murmur3.Sum32([]byte(client.GetID()))))
}

func GetSanitizedCopy(c *Client) *Client {
cc := new(Client)
// Remove the hashed secret here
*cc = *c
cc.Secret = ""
return cc
}
8 changes: 5 additions & 3 deletions consent/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"net/url"
"time"

"github.com/ory/hydra/v2/client"

"github.com/ory/hydra/v2/flow"
"github.com/ory/hydra/v2/oauth2/flowctx"
"github.com/ory/hydra/v2/x/events"
Expand Down Expand Up @@ -212,7 +214,7 @@ func (h *Handler) listOAuth2ConsentSessions(w http.ResponseWriter, r *http.Reque

var a []flow.OAuth2ConsentSession
for _, session := range s {
session.ConsentRequest.Client = sanitizeClient(session.ConsentRequest.Client)
session.ConsentRequest.Client = client.GetSanitizedCopy(session.ConsentRequest.Client)
a = append(a, flow.OAuth2ConsentSession(session))
}

Expand Down Expand Up @@ -372,7 +374,7 @@ func (h *Handler) getOAuth2LoginRequest(w http.ResponseWriter, r *http.Request,
request.RequestedAudience = []string{}
}

request.Client = sanitizeClient(request.Client)
request.Client = client.GetSanitizedCopy(request.Client)
h.r.Writer().Write(w, r, request)
}

Expand Down Expand Up @@ -679,7 +681,7 @@ func (h *Handler) getOAuth2ConsentRequest(w http.ResponseWriter, r *http.Request
request.RequestedAudience = []string{}
}

request.Client = sanitizeClient(request.Client)
request.Client = client.GetSanitizedCopy(request.Client)
h.r.Writer().Write(w, r, request)
}

Expand Down
10 changes: 1 addition & 9 deletions consent/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,7 @@ import (
)

func sanitizeClientFromRequest(ar fosite.AuthorizeRequester) *client.Client {
return sanitizeClient(ar.GetClient().(*client.Client))
}

func sanitizeClient(c *client.Client) *client.Client {
cc := new(client.Client)
// Remove the hashed secret here
*cc = *c
cc.Secret = ""
return cc
return client.GetSanitizedCopy(ar.GetClient().(*client.Client))
}

func matchScopes(scopeStrategy fosite.ScopeStrategy, previousConsent []flow.AcceptOAuth2ConsentRequest, requestedScope []string) *flow.AcceptOAuth2ConsentRequest {
Expand Down
2 changes: 2 additions & 0 deletions contrib/quickstart/5-min/hydra.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ oidc:
- public
pairwise:
salt: youReallyNeedToChangeThis
oauth2:
token_hook: http://localhost:8080
43 changes: 43 additions & 0 deletions ...ass_request_if_strategy_passes-should_call_refresh_token_hook_if_configured-hook=new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,49 @@
},
"request": {
"client_id": "app-client",
"client": {
"client_id": "app-client",
"client_name": "",
"grant_types": [
"implicit",
"refresh_token",
"authorization_code",
"password",
"client_credentials"
],
"response_types": [
"id_token",
"code",
"token"
],
"scope": "hydra.* offline openid",
"audience": [],
"owner": "",
"policy_uri": "",
"allowed_cors_origins": [],
"tos_uri": "",
"client_uri": "",
"logo_uri": "",
"contacts": [],
"client_secret_expires_at": 0,
"subject_type": "",
"jwks": {},
"metadata": {
"some-meta-key": "some-meta-value"
},
"skip_consent": false,
"skip_logout_consent": false,
"authorization_code_grant_access_token_lifespan": null,
"authorization_code_grant_id_token_lifespan": null,
"authorization_code_grant_refresh_token_lifespan": null,
"client_credentials_grant_access_token_lifespan": null,
"implicit_grant_access_token_lifespan": null,
"implicit_grant_id_token_lifespan": null,
"jwt_bearer_grant_access_token_lifespan": null,
"refresh_token_grant_id_token_lifespan": null,
"refresh_token_grant_access_token_lifespan": null,
"refresh_token_grant_refresh_token_lifespan": null
},
"granted_scopes": [
"offline",
"openid",
Expand Down
43 changes: 43 additions & 0 deletions ...max_age_is_less_than_auth_time-should_call_refresh_token_hook_if_configured-hook=new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,49 @@
},
"request": {
"client_id": "app-client",
"client": {
"client_id": "app-client",
"client_name": "",
"grant_types": [
"implicit",
"refresh_token",
"authorization_code",
"password",
"client_credentials"
],
"response_types": [
"id_token",
"code",
"token"
],
"scope": "hydra.* offline openid",
"audience": [],
"owner": "",
"policy_uri": "",
"allowed_cors_origins": [],
"tos_uri": "",
"client_uri": "",
"logo_uri": "",
"contacts": [],
"client_secret_expires_at": 0,
"subject_type": "",
"jwks": {},
"metadata": {
"some-meta-key": "some-meta-value"
},
"skip_consent": false,
"skip_logout_consent": false,
"authorization_code_grant_access_token_lifespan": null,
"authorization_code_grant_id_token_lifespan": null,
"authorization_code_grant_refresh_token_lifespan": null,
"client_credentials_grant_access_token_lifespan": null,
"implicit_grant_access_token_lifespan": null,
"implicit_grant_id_token_lifespan": null,
"jwt_bearer_grant_access_token_lifespan": null,
"refresh_token_grant_id_token_lifespan": null,
"refresh_token_grant_access_token_lifespan": null,
"refresh_token_grant_refresh_token_lifespan": null
},
"granted_scopes": [
"offline",
"openid",
Expand Down
43 changes: 43 additions & 0 deletions ..._authentication_time_is_recent-should_call_refresh_token_hook_if_configured-hook=new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,49 @@
},
"request": {
"client_id": "app-client",
"client": {
"client_id": "app-client",
"client_name": "",
"grant_types": [
"implicit",
"refresh_token",
"authorization_code",
"password",
"client_credentials"
],
"response_types": [
"id_token",
"code",
"token"
],
"scope": "hydra.* offline openid",
"audience": [],
"owner": "",
"policy_uri": "",
"allowed_cors_origins": [],
"tos_uri": "",
"client_uri": "",
"logo_uri": "",
"contacts": [],
"client_secret_expires_at": 0,
"subject_type": "",
"jwks": {},
"metadata": {
"some-meta-key": "some-meta-value"
},
"skip_consent": false,
"skip_logout_consent": false,
"authorization_code_grant_access_token_lifespan": null,
"authorization_code_grant_id_token_lifespan": null,
"authorization_code_grant_refresh_token_lifespan": null,
"client_credentials_grant_access_token_lifespan": null,
"implicit_grant_access_token_lifespan": null,
"implicit_grant_id_token_lifespan": null,
"jwt_bearer_grant_access_token_lifespan": null,
"refresh_token_grant_id_token_lifespan": null,
"refresh_token_grant_access_token_lifespan": null,
"refresh_token_grant_refresh_token_lifespan": null
},
"granted_scopes": [
"offline",
"openid",
Expand Down
43 changes: 43 additions & 0 deletions ...ass_request_if_strategy_passes-should_call_refresh_token_hook_if_configured-hook=new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,49 @@
},
"request": {
"client_id": "app-client",
"client": {
"client_id": "app-client",
"client_name": "",
"grant_types": [
"implicit",
"refresh_token",
"authorization_code",
"password",
"client_credentials"
],
"response_types": [
"id_token",
"code",
"token"
],
"scope": "hydra.* offline openid",
"audience": [],
"owner": "",
"policy_uri": "",
"allowed_cors_origins": [],
"tos_uri": "",
"client_uri": "",
"logo_uri": "",
"contacts": [],
"client_secret_expires_at": 0,
"subject_type": "",
"jwks": {},
"metadata": {
"some-meta-key": "some-meta-value"
},
"skip_consent": false,
"skip_logout_consent": false,
"authorization_code_grant_access_token_lifespan": null,
"authorization_code_grant_id_token_lifespan": null,
"authorization_code_grant_refresh_token_lifespan": null,
"client_credentials_grant_access_token_lifespan": null,
"implicit_grant_access_token_lifespan": null,
"implicit_grant_id_token_lifespan": null,
"jwt_bearer_grant_access_token_lifespan": null,
"refresh_token_grant_id_token_lifespan": null,
"refresh_token_grant_access_token_lifespan": null,
"refresh_token_grant_refresh_token_lifespan": null
},
"granted_scopes": [
"offline",
"openid",
Expand Down
43 changes: 43 additions & 0 deletions ...max_age_is_less_than_auth_time-should_call_refresh_token_hook_if_configured-hook=new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,49 @@
},
"request": {
"client_id": "app-client",
"client": {
"client_id": "app-client",
"client_name": "",
"grant_types": [
"implicit",
"refresh_token",
"authorization_code",
"password",
"client_credentials"
],
"response_types": [
"id_token",
"code",
"token"
],
"scope": "hydra.* offline openid",
"audience": [],
"owner": "",
"policy_uri": "",
"allowed_cors_origins": [],
"tos_uri": "",
"client_uri": "",
"logo_uri": "",
"contacts": [],
"client_secret_expires_at": 0,
"subject_type": "",
"jwks": {},
"metadata": {
"some-meta-key": "some-meta-value"
},
"skip_consent": false,
"skip_logout_consent": false,
"authorization_code_grant_access_token_lifespan": null,
"authorization_code_grant_id_token_lifespan": null,
"authorization_code_grant_refresh_token_lifespan": null,
"client_credentials_grant_access_token_lifespan": null,
"implicit_grant_access_token_lifespan": null,
"implicit_grant_id_token_lifespan": null,
"jwt_bearer_grant_access_token_lifespan": null,
"refresh_token_grant_id_token_lifespan": null,
"refresh_token_grant_access_token_lifespan": null,
"refresh_token_grant_refresh_token_lifespan": null
},
"granted_scopes": [
"offline",
"openid",
Expand Down
43 changes: 43 additions & 0 deletions ..._authentication_time_is_recent-should_call_refresh_token_hook_if_configured-hook=new.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,49 @@
},
"request": {
"client_id": "app-client",
"client": {
"client_id": "app-client",
"client_name": "",
"grant_types": [
"implicit",
"refresh_token",
"authorization_code",
"password",
"client_credentials"
],
"response_types": [
"id_token",
"code",
"token"
],
"scope": "hydra.* offline openid",
"audience": [],
"owner": "",
"policy_uri": "",
"allowed_cors_origins": [],
"tos_uri": "",
"client_uri": "",
"logo_uri": "",
"contacts": [],
"client_secret_expires_at": 0,
"subject_type": "",
"jwks": {},
"metadata": {
"some-meta-key": "some-meta-value"
},
"skip_consent": false,
"skip_logout_consent": false,
"authorization_code_grant_access_token_lifespan": null,
"authorization_code_grant_id_token_lifespan": null,
"authorization_code_grant_refresh_token_lifespan": null,
"client_credentials_grant_access_token_lifespan": null,
"implicit_grant_access_token_lifespan": null,
"implicit_grant_id_token_lifespan": null,
"jwt_bearer_grant_access_token_lifespan": null,
"refresh_token_grant_id_token_lifespan": null,
"refresh_token_grant_access_token_lifespan": null,
"refresh_token_grant_refresh_token_lifespan": null
},
"granted_scopes": [
"offline",
"openid",
Expand Down
Loading
Loading