2022-06-07 23:32:19 +00:00
// Copyright 2020-2022 the Pinniped contributors. All Rights Reserved.
2020-12-09 01:33:08 +00:00
// SPDX-License-Identifier: Apache-2.0
2020-12-08 01:28:51 +00:00
package oidc
import (
"context"
2020-12-09 16:04:58 +00:00
"net/url"
2022-06-07 23:32:19 +00:00
"strings"
2020-12-08 01:28:51 +00:00
2020-12-09 16:04:58 +00:00
"github.com/ory/fosite"
2020-12-08 18:17:03 +00:00
"github.com/ory/fosite/handler/oauth2"
"github.com/ory/fosite/handler/openid"
"github.com/pkg/errors"
2022-07-14 16:51:11 +00:00
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
oidcapi "go.pinniped.dev/generated/latest/apis/supervisor/oidc"
"go.pinniped.dev/internal/psession"
2020-12-09 16:04:58 +00:00
)
2020-12-08 18:17:03 +00:00
2020-12-09 16:04:58 +00:00
const (
2022-08-26 18:35:35 +00:00
tokenTypeAccessToken = "urn:ietf:params:oauth:token-type:access_token" //nolint:gosec
tokenTypeJWT = "urn:ietf:params:oauth:token-type:jwt" //nolint:gosec
2020-12-08 01:28:51 +00:00
)
2020-12-09 16:04:58 +00:00
type stsParams struct {
subjectAccessToken string
requestedAudience string
}
2022-12-14 00:18:51 +00:00
func TokenExchangeFactory ( config fosite . Configurator , storage interface { } , strategy interface { } ) interface { } {
2020-12-08 18:17:03 +00:00
return & TokenExchangeHandler {
2020-12-09 16:04:58 +00:00
idTokenStrategy : strategy . ( openid . OpenIDConnectTokenStrategy ) ,
accessTokenStrategy : strategy . ( oauth2 . AccessTokenStrategy ) ,
accessTokenStorage : storage . ( oauth2 . AccessTokenStorage ) ,
2022-12-14 00:18:51 +00:00
fositeConfig : config ,
2020-12-08 18:17:03 +00:00
}
2020-12-08 01:28:51 +00:00
}
type TokenExchangeHandler struct {
2020-12-08 18:17:03 +00:00
idTokenStrategy openid . OpenIDConnectTokenStrategy
accessTokenStrategy oauth2 . AccessTokenStrategy
accessTokenStorage oauth2 . AccessTokenStorage
2022-12-14 00:18:51 +00:00
fositeConfig fosite . Configurator
2020-12-08 01:28:51 +00:00
}
2021-03-01 19:08:41 +00:00
var _ fosite . TokenEndpointHandler = ( * TokenExchangeHandler ) ( nil )
2020-12-08 01:28:51 +00:00
func ( t * TokenExchangeHandler ) HandleTokenEndpointRequest ( ctx context . Context , requester fosite . AccessRequester ) error {
2022-12-14 00:18:51 +00:00
if ! t . CanHandleTokenEndpointRequest ( ctx , requester ) {
2020-12-08 18:17:03 +00:00
return errors . WithStack ( fosite . ErrUnknownRequest )
}
2020-12-08 01:28:51 +00:00
return nil
}
func ( t * TokenExchangeHandler ) PopulateTokenEndpointResponse ( ctx context . Context , requester fosite . AccessRequester , responder fosite . AccessResponder ) error {
2020-12-09 16:04:58 +00:00
// Skip this request if it's for a different grant type.
if err := t . HandleTokenEndpointRequest ( ctx , requester ) ; err != nil {
2020-12-08 18:17:03 +00:00
return errors . WithStack ( err )
}
2020-12-09 16:04:58 +00:00
// Validate the basic RFC8693 parameters we support.
params , err := t . validateParams ( requester . GetRequestForm ( ) )
2020-12-08 18:17:03 +00:00
if err != nil {
return errors . WithStack ( err )
}
2020-12-09 16:04:58 +00:00
// Validate the incoming access token and lookup the information about the original authorize request.
originalRequester , err := t . validateAccessToken ( ctx , requester , params . subjectAccessToken )
if err != nil {
return errors . WithStack ( err )
2020-12-08 18:17:03 +00:00
}
2020-12-09 16:04:58 +00:00
2022-07-20 20:55:56 +00:00
// Check that the currently authenticated client and the client which was originally used to get the access token are the same.
if originalRequester . GetClient ( ) . GetID ( ) != requester . GetClient ( ) . GetID ( ) {
// This error message is copied from the similar check in fosite's flow_authorize_code_token.go.
2022-07-21 20:50:33 +00:00
return errors . WithStack ( fosite . ErrInvalidGrant . WithHint ( "The OAuth 2.0 Client ID from this request does not match the one from the authorize request." ) )
2022-07-20 20:55:56 +00:00
}
// Check that the client is allowed to perform this grant type.
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
if ! requester . GetClient ( ) . GetGrantTypes ( ) . Has ( oidcapi . GrantTypeTokenExchange ) {
2022-07-20 20:55:56 +00:00
// This error message is trying to be similar to the analogous one in fosite's flow_authorize_code_token.go.
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
return errors . WithStack ( fosite . ErrUnauthorizedClient . WithHintf ( ` The OAuth 2.0 Client is not allowed to use token exchange grant "%s". ` , oidcapi . GrantTypeTokenExchange ) )
2022-07-20 20:55:56 +00:00
}
2020-12-16 03:59:57 +00:00
// Require that the incoming access token has the pinniped:request-audience and OpenID scopes.
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
if ! originalRequester . GetGrantedScopes ( ) . Has ( oidcapi . ScopeRequestAudience ) {
2022-08-26 18:35:35 +00:00
return errors . WithStack ( fosite . ErrAccessDenied . WithHintf ( "Missing the %q scope." , oidcapi . ScopeRequestAudience ) )
2020-12-09 19:56:53 +00:00
}
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
if ! originalRequester . GetGrantedScopes ( ) . Has ( oidcapi . ScopeOpenID ) {
2022-08-26 18:35:35 +00:00
return errors . WithStack ( fosite . ErrAccessDenied . WithHintf ( "Missing the %q scope." , oidcapi . ScopeOpenID ) )
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
}
// Check that the stored session meets the minimum requirements for token exchange.
if err := t . validateSession ( originalRequester ) ; err != nil {
return errors . WithStack ( err )
2020-12-09 23:15:50 +00:00
}
2020-12-09 19:56:53 +00:00
2020-12-09 16:04:58 +00:00
// Use the original authorize request information, along with the requested audience, to mint a new JWT.
responseToken , err := t . mintJWT ( ctx , originalRequester , params . requestedAudience )
2020-12-08 18:17:03 +00:00
if err != nil {
return errors . WithStack ( err )
}
2020-12-09 16:04:58 +00:00
// Format the response parameters according to RFC8693.
responder . SetAccessToken ( responseToken )
2020-12-08 18:17:03 +00:00
responder . SetTokenType ( "N_A" )
2020-12-09 19:56:53 +00:00
responder . SetExtra ( "issued_token_type" , tokenTypeJWT )
2020-12-08 01:28:51 +00:00
return nil
}
2020-12-09 16:04:58 +00:00
func ( t * TokenExchangeHandler ) mintJWT ( ctx context . Context , requester fosite . Requester , audience string ) ( string , error ) {
downscoped := fosite . NewAccessRequest ( requester . GetSession ( ) )
downscoped . Client . ( * fosite . DefaultClient ) . ID = audience
2022-12-14 00:18:51 +00:00
// Note: if we wanted to support clients with custom token lifespans, then we would need to call
// fosite.GetEffectiveLifespan() to determine the lifespan here.
idTokenLifespan := t . fositeConfig . GetIDTokenLifespan ( ctx )
return t . idTokenStrategy . GenerateIDToken ( ctx , idTokenLifespan , downscoped )
2020-12-09 16:04:58 +00:00
}
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
func ( t * TokenExchangeHandler ) validateSession ( requester fosite . Requester ) error {
pSession , ok := requester . GetSession ( ) . ( * psession . PinnipedSession )
if ! ok {
// This shouldn't really happen.
return fosite . ErrServerError . WithHint ( "Invalid session storage." )
}
username , ok := pSession . IDTokenClaims ( ) . Extra [ oidcapi . IDTokenClaimUsername ] . ( string )
if ! ok || username == "" {
// No username was stored in the session's ID token claims (or the stored username was not a string, which
// shouldn't really happen). Usernames will not be stored in the session's ID token claims when the username
// scope was not requested/granted, but otherwise they should be stored.
return fosite . ErrAccessDenied . WithHintf ( "No username found in session. Ensure that the %q scope was requested and granted at the authorization endpoint." , oidcapi . ScopeUsername )
}
return nil
}
2020-12-09 16:04:58 +00:00
func ( t * TokenExchangeHandler ) validateParams ( params url . Values ) ( * stsParams , error ) {
var result stsParams
// Validate some required parameters.
result . requestedAudience = params . Get ( "audience" )
if result . requestedAudience == "" {
2022-08-24 00:20:30 +00:00
return nil , fosite . ErrInvalidRequest . WithHint ( "Missing 'audience' parameter." )
2020-12-09 16:04:58 +00:00
}
result . subjectAccessToken = params . Get ( "subject_token" )
if result . subjectAccessToken == "" {
2022-08-24 00:20:30 +00:00
return nil , fosite . ErrInvalidRequest . WithHint ( "Missing 'subject_token' parameter." )
2020-12-09 16:04:58 +00:00
}
// Validate some parameters with hardcoded values we support.
if params . Get ( "subject_token_type" ) != tokenTypeAccessToken {
2022-08-24 00:20:30 +00:00
return nil , fosite . ErrInvalidRequest . WithHintf ( "Unsupported 'subject_token_type' parameter value, must be %q." , tokenTypeAccessToken )
2020-12-09 16:04:58 +00:00
}
if params . Get ( "requested_token_type" ) != tokenTypeJWT {
2022-08-24 00:20:30 +00:00
return nil , fosite . ErrInvalidRequest . WithHintf ( "Unsupported 'requested_token_type' parameter value, must be %q." , tokenTypeJWT )
2020-12-09 16:04:58 +00:00
}
// Validate that none of these unsupported parameters were sent. These are optional and we do not currently support them.
for _ , param := range [ ] string {
"resource" ,
"scope" ,
"actor_token" ,
"actor_token_type" ,
} {
if params . Get ( param ) != "" {
2022-08-24 00:20:30 +00:00
return nil , fosite . ErrInvalidRequest . WithHintf ( "Unsupported parameter %q." , param )
2020-12-09 16:04:58 +00:00
}
}
2022-06-07 23:32:19 +00:00
// Validate that the requested audience is not one of the reserved strings. All possible requested audience strings
// are subdivided into these classifications:
// 1. pinniped-cli is reserved for the statically defined OAuth client, which is disallowed for this token exchange.
2022-06-13 19:08:11 +00:00
// 2. client.oauth.pinniped.dev-* is reserved to be the names of user-defined dynamic OAuth clients, which is also
2022-06-07 23:32:19 +00:00
// disallowed for this token exchange.
2022-06-13 19:08:11 +00:00
// 3. Anything else matching *.pinniped.dev* is reserved for future use, in case we want to create more
// buckets of names some day, e.g. something.pinniped.dev/*. These names are also disallowed for this
2022-06-07 23:32:19 +00:00
// token exchange.
// 4. Any other string is reserved to conceptually mean the name of a workload cluster (technically, it's the
// configured audience of its Concierge JWTAuthenticator or other OIDC JWT validator). These are the only
// allowed values for this token exchange.
2022-06-13 19:08:11 +00:00
if strings . Contains ( result . requestedAudience , ".pinniped.dev" ) {
return nil , fosite . ErrInvalidRequest . WithHintf ( "requested audience cannot contain '.pinniped.dev'" )
2022-06-07 23:32:19 +00:00
}
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
if result . requestedAudience == oidcapi . ClientIDPinnipedCLI {
return nil , fosite . ErrInvalidRequest . WithHintf ( "requested audience cannot equal '%s'" , oidcapi . ClientIDPinnipedCLI )
2022-06-07 23:32:19 +00:00
}
2020-12-09 16:04:58 +00:00
return & result , nil
}
func ( t * TokenExchangeHandler ) validateAccessToken ( ctx context . Context , requester fosite . AccessRequester , accessToken string ) ( fosite . Requester , error ) {
2022-08-24 00:20:30 +00:00
// Look up the access token's stored session data.
2022-12-14 00:18:51 +00:00
signature := t . accessTokenStrategy . AccessTokenSignature ( ctx , accessToken )
2020-12-09 16:04:58 +00:00
originalRequester , err := t . accessTokenStorage . GetAccessTokenSession ( ctx , signature , requester . GetSession ( ) )
if err != nil {
2022-08-24 00:20:30 +00:00
// The access token was not found, or there was some other error while reading it.
return nil , fosite . ErrRequestUnauthorized . WithWrap ( err ) . WithHint ( "Invalid 'subject_token' parameter value." )
}
// Validate the access token using its stored session data, which includes its expiration time.
if err := t . accessTokenStrategy . ValidateAccessToken ( ctx , originalRequester , accessToken ) ; err != nil {
return nil , errors . WithStack ( err )
2020-12-09 16:04:58 +00:00
}
return originalRequester , nil
}
2021-03-01 19:08:41 +00:00
2022-12-14 00:18:51 +00:00
func ( t * TokenExchangeHandler ) CanSkipClientAuth ( _ context . Context , _ fosite . AccessRequester ) bool {
2021-03-01 19:08:41 +00:00
return false
}
2022-12-14 00:18:51 +00:00
func ( t * TokenExchangeHandler ) CanHandleTokenEndpointRequest ( _ context . Context , requester fosite . AccessRequester ) bool {
Create username scope, required for clients to get username in ID token
- For backwards compatibility with older Pinniped CLIs, the pinniped-cli
client does not need to request the username or groups scopes for them
to be granted. For dynamic clients, the usual OAuth2 rules apply:
the client must be allowed to request the scopes according to its
configuration, and the client must actually request the scopes in the
authorization request.
- If the username scope was not granted, then there will be no username
in the ID token, and the cluster-scoped token exchange will fail since
there would be no username in the resulting cluster-scoped ID token.
- The OIDC well-known discovery endpoint lists the username and groups
scopes in the scopes_supported list, and lists the username and groups
claims in the claims_supported list.
- Add username and groups scopes to the default list of scopes
put into kubeconfig files by "pinniped get kubeconfig" CLI command,
and the default list of scopes used by "pinniped login oidc" when
no list of scopes is specified in the kubeconfig file
- The warning header about group memberships changing during upstream
refresh will only be sent to the pinniped-cli client, since it is
only intended for kubectl and it could leak the username to the
client (which may not have the username scope granted) through the
warning message text.
- Add the user's username to the session storage as a new field, so that
during upstream refresh we can compare the original username from the
initial authorization to the refreshed username, even in the case when
the username scope was not granted (and therefore the username is not
stored in the ID token claims of the session storage)
- Bump the Supervisor session storage format version from 2 to 3
due to the username field being added to the session struct
- Extract commonly used string constants related to OIDC flows to api
package.
- Change some import names to make them consistent:
- Always import github.com/coreos/go-oidc/v3/oidc as "coreosoidc"
- Always import go.pinniped.dev/generated/latest/apis/supervisor/oidc
as "oidcapi"
- Always import go.pinniped.dev/internal/oidc as "oidc"
2022-08-08 23:29:22 +00:00
return requester . GetGrantTypes ( ) . ExactOne ( oidcapi . GrantTypeTokenExchange )
2021-03-01 19:08:41 +00:00
}