FEATURES (and FIXES): - support OAuth 2.0 Token Revocation [RFC 7009](https://datatracker.ietf.org/doc/html/rfc7009) - handle request object using `request` parameter [OIDC Core 1.0 Request Object](https://openid.net/specs/openid-connect-core-1_0.html#RequestObject) - handle response mode - added some information to the discovery endpoint: - revocation_endpoint (added with token revocation) - revocation_endpoint_auth_methods_supported (added with token revocation) - revocation_endpoint_auth_signing_alg_values_supported (added with token revocation) - token_endpoint_auth_signing_alg_values_supported (was missing) - introspection_endpoint_auth_signing_alg_values_supported (was missing) - request_object_signing_alg_values_supported (added with request object) - request_parameter_supported (added with request object) - fixed `removeUserinfoScopes ` now returns the scopes without "userinfo" scopes (profile, email, phone, addedd) [source diff](https://github.com/caos/oidc/pull/130/files#diff-fad50c8c0f065d4dbc49d6c6a38f09c992c8f5d651a479ba00e31b500543559eL170-R171) - improved error handling (pkg/oidc/error.go) and fixed some wrong OAuth errors (e.g. `invalid_grant` instead of `invalid_request`) - improved MarshalJSON and added MarshalJSONWithStatus - removed deprecated PEM decryption from `BytesToPrivateKey` [source diff](https://github.com/caos/oidc/pull/130/files#diff-fe246e428e399ccff599627c71764de51387b60b4df84c67de3febd0954e859bL11-L19) - NewAccessTokenVerifier now uses correct (internal) `accessTokenVerifier` [source diff](https://github.com/caos/oidc/pull/130/files#diff-3a01c7500ead8f35448456ef231c7c22f8d291710936cac91de5edeef52ffc72L52-R52) BREAKING CHANGE: - move functions from `utils` package into separate packages - added various methods to the (OP) `Configuration` interface [source diff](https://github.com/caos/oidc/pull/130/files#diff-2538e0dfc772fdc37f057aecd6fcc2943f516c24e8be794cce0e368a26d20a82R19-R32) - added revocationEndpoint to `WithCustomEndpoints ` [source diff](https://github.com/caos/oidc/pull/130/files#diff-19ae13a743eb7cebbb96492798b1bec556673eb6236b1387e38d722900bae1c3L355-R391) - remove unnecessary context parameter from JWTProfileExchange [source diff](https://github.com/caos/oidc/pull/130/files#diff-4ed8f6affa4a9631fa8a034b3d5752fbb6a819107141aae00029014e950f7b4cL14)
139 lines
5.3 KiB
Go
139 lines
5.3 KiB
Go
package op
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"time"
|
|
|
|
httphelper "github.com/caos/oidc/pkg/http"
|
|
"github.com/caos/oidc/pkg/oidc"
|
|
"github.com/caos/oidc/pkg/strings"
|
|
)
|
|
|
|
type RefreshTokenRequest interface {
|
|
GetAMR() []string
|
|
GetAudience() []string
|
|
GetAuthTime() time.Time
|
|
GetClientID() string
|
|
GetScopes() []string
|
|
GetSubject() string
|
|
SetCurrentScopes(scopes []string)
|
|
}
|
|
|
|
//RefreshTokenExchange handles the OAuth 2.0 refresh_token grant, including
|
|
//parsing, validating, authorizing the client and finally exchanging the refresh_token for new tokens
|
|
func RefreshTokenExchange(w http.ResponseWriter, r *http.Request, exchanger Exchanger) {
|
|
tokenReq, err := ParseRefreshTokenRequest(r, exchanger.Decoder())
|
|
if err != nil {
|
|
RequestError(w, r, err)
|
|
}
|
|
validatedRequest, client, err := ValidateRefreshTokenRequest(r.Context(), tokenReq, exchanger)
|
|
if err != nil {
|
|
RequestError(w, r, err)
|
|
return
|
|
}
|
|
resp, err := CreateTokenResponse(r.Context(), validatedRequest, client, exchanger, true, "", tokenReq.RefreshToken)
|
|
if err != nil {
|
|
RequestError(w, r, err)
|
|
return
|
|
}
|
|
httphelper.MarshalJSON(w, resp)
|
|
}
|
|
|
|
//ParseRefreshTokenRequest parsed the http request into a oidc.RefreshTokenRequest
|
|
func ParseRefreshTokenRequest(r *http.Request, decoder httphelper.Decoder) (*oidc.RefreshTokenRequest, error) {
|
|
request := new(oidc.RefreshTokenRequest)
|
|
err := ParseAuthenticatedTokenRequest(r, decoder, request)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return request, nil
|
|
}
|
|
|
|
//ValidateRefreshTokenRequest validates the refresh_token request parameters including authorization check of the client
|
|
//and returns the data representing the original auth request corresponding to the refresh_token
|
|
func ValidateRefreshTokenRequest(ctx context.Context, tokenReq *oidc.RefreshTokenRequest, exchanger Exchanger) (RefreshTokenRequest, Client, error) {
|
|
if tokenReq.RefreshToken == "" {
|
|
return nil, nil, oidc.ErrInvalidRequest().WithDescription("refresh_token missing")
|
|
}
|
|
request, client, err := AuthorizeRefreshClient(ctx, tokenReq, exchanger)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if client.GetID() != request.GetClientID() {
|
|
return nil, nil, oidc.ErrInvalidGrant()
|
|
}
|
|
if err = ValidateRefreshTokenScopes(tokenReq.Scopes, request); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return request, client, nil
|
|
}
|
|
|
|
//ValidateRefreshTokenScopes validates that the requested scope is a subset of the original auth request scope
|
|
//it will set the requested scopes as current scopes onto RefreshTokenRequest
|
|
//if empty the original scopes will be used
|
|
func ValidateRefreshTokenScopes(requestedScopes []string, authRequest RefreshTokenRequest) error {
|
|
if len(requestedScopes) == 0 {
|
|
return nil
|
|
}
|
|
for _, scope := range requestedScopes {
|
|
if !strings.Contains(authRequest.GetScopes(), scope) {
|
|
return oidc.ErrInvalidScope()
|
|
}
|
|
}
|
|
authRequest.SetCurrentScopes(requestedScopes)
|
|
return nil
|
|
}
|
|
|
|
//AuthorizeRefreshClient checks the authorization of the client and that the used method was the one previously registered.
|
|
//It than returns the data representing the original auth request corresponding to the refresh_token
|
|
func AuthorizeRefreshClient(ctx context.Context, tokenReq *oidc.RefreshTokenRequest, exchanger Exchanger) (request RefreshTokenRequest, client Client, err error) {
|
|
if tokenReq.ClientAssertionType == oidc.ClientAssertionTypeJWTAssertion {
|
|
jwtExchanger, ok := exchanger.(JWTAuthorizationGrantExchanger)
|
|
if !ok || !exchanger.AuthMethodPrivateKeyJWTSupported() {
|
|
return nil, nil, errors.New("auth_method private_key_jwt not supported")
|
|
}
|
|
client, err = AuthorizePrivateJWTKey(ctx, tokenReq.ClientAssertion, jwtExchanger)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if !ValidateGrantType(client, oidc.GrantTypeRefreshToken) {
|
|
return nil, nil, oidc.ErrUnauthorizedClient()
|
|
}
|
|
request, err = RefreshTokenRequestByRefreshToken(ctx, exchanger.Storage(), tokenReq.RefreshToken)
|
|
return request, client, err
|
|
}
|
|
client, err = exchanger.Storage().GetClientByClientID(ctx, tokenReq.ClientID)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
if !ValidateGrantType(client, oidc.GrantTypeRefreshToken) {
|
|
return nil, nil, oidc.ErrUnauthorizedClient()
|
|
}
|
|
if client.AuthMethod() == oidc.AuthMethodPrivateKeyJWT {
|
|
return nil, nil, oidc.ErrInvalidClient()
|
|
}
|
|
if client.AuthMethod() == oidc.AuthMethodNone {
|
|
request, err = RefreshTokenRequestByRefreshToken(ctx, exchanger.Storage(), tokenReq.RefreshToken)
|
|
return request, client, err
|
|
}
|
|
if client.AuthMethod() == oidc.AuthMethodPost && !exchanger.AuthMethodPostSupported() {
|
|
return nil, nil, oidc.ErrInvalidClient().WithDescription("auth_method post not supported")
|
|
}
|
|
if err = AuthorizeClientIDSecret(ctx, tokenReq.ClientID, tokenReq.ClientSecret, exchanger.Storage()); err != nil {
|
|
return nil, nil, err
|
|
}
|
|
request, err = RefreshTokenRequestByRefreshToken(ctx, exchanger.Storage(), tokenReq.RefreshToken)
|
|
return request, client, err
|
|
}
|
|
|
|
//RefreshTokenRequestByRefreshToken returns the RefreshTokenRequest (data representing the original auth request)
|
|
//corresponding to the refresh_token from Storage or an error
|
|
func RefreshTokenRequestByRefreshToken(ctx context.Context, storage Storage, refreshToken string) (RefreshTokenRequest, error) {
|
|
request, err := storage.TokenRequestByRefreshToken(ctx, refreshToken)
|
|
if err != nil {
|
|
return nil, oidc.ErrInvalidGrant().WithParent(err)
|
|
}
|
|
return request, nil
|
|
}
|