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
4.6 KiB
Go
139 lines
4.6 KiB
Go
package op
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
httphelper "github.com/caos/oidc/pkg/http"
|
|
"github.com/caos/oidc/pkg/oidc"
|
|
)
|
|
|
|
type Exchanger interface {
|
|
Issuer() string
|
|
Storage() Storage
|
|
Decoder() httphelper.Decoder
|
|
Signer() Signer
|
|
Crypto() Crypto
|
|
AuthMethodPostSupported() bool
|
|
AuthMethodPrivateKeyJWTSupported() bool
|
|
GrantTypeRefreshTokenSupported() bool
|
|
GrantTypeTokenExchangeSupported() bool
|
|
GrantTypeJWTAuthorizationSupported() bool
|
|
}
|
|
|
|
func tokenHandler(exchanger Exchanger) func(w http.ResponseWriter, r *http.Request) {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
grantType := r.FormValue("grant_type")
|
|
switch grantType {
|
|
case string(oidc.GrantTypeCode):
|
|
CodeExchange(w, r, exchanger)
|
|
return
|
|
case string(oidc.GrantTypeRefreshToken):
|
|
if exchanger.GrantTypeRefreshTokenSupported() {
|
|
RefreshTokenExchange(w, r, exchanger)
|
|
return
|
|
}
|
|
case string(oidc.GrantTypeBearer):
|
|
if ex, ok := exchanger.(JWTAuthorizationGrantExchanger); ok && exchanger.GrantTypeJWTAuthorizationSupported() {
|
|
JWTProfile(w, r, ex)
|
|
return
|
|
}
|
|
case string(oidc.GrantTypeTokenExchange):
|
|
if exchanger.GrantTypeTokenExchangeSupported() {
|
|
TokenExchange(w, r, exchanger)
|
|
return
|
|
}
|
|
case "":
|
|
RequestError(w, r, oidc.ErrInvalidRequest().WithDescription("grant_type missing"))
|
|
return
|
|
}
|
|
RequestError(w, r, oidc.ErrUnsupportedGrantType().WithDescription("%s not supported", grantType))
|
|
}
|
|
}
|
|
|
|
//AuthenticatedTokenRequest is a helper interface for ParseAuthenticatedTokenRequest
|
|
//it is implemented by oidc.AuthRequest and oidc.RefreshTokenRequest
|
|
type AuthenticatedTokenRequest interface {
|
|
SetClientID(string)
|
|
SetClientSecret(string)
|
|
}
|
|
|
|
//ParseAuthenticatedTokenRequest parses the client_id and client_secret from the HTTP request from either
|
|
//HTTP Basic Auth header or form body and sets them into the provided authenticatedTokenRequest interface
|
|
func ParseAuthenticatedTokenRequest(r *http.Request, decoder httphelper.Decoder, request AuthenticatedTokenRequest) error {
|
|
err := r.ParseForm()
|
|
if err != nil {
|
|
return oidc.ErrInvalidRequest().WithDescription("error parsing form").WithParent(err)
|
|
}
|
|
err = decoder.Decode(request, r.Form)
|
|
if err != nil {
|
|
return oidc.ErrInvalidRequest().WithDescription("error decoding form").WithParent(err)
|
|
}
|
|
clientID, clientSecret, ok := r.BasicAuth()
|
|
if !ok {
|
|
return nil
|
|
}
|
|
clientID, err = url.QueryUnescape(clientID)
|
|
if err != nil {
|
|
return oidc.ErrInvalidClient().WithDescription("invalid basic auth header").WithParent(err)
|
|
}
|
|
clientSecret, err = url.QueryUnescape(clientSecret)
|
|
if err != nil {
|
|
return oidc.ErrInvalidClient().WithDescription("invalid basic auth header").WithParent(err)
|
|
}
|
|
request.SetClientID(clientID)
|
|
request.SetClientSecret(clientSecret)
|
|
return nil
|
|
}
|
|
|
|
//AuthorizeClientIDSecret authorizes a client by validating the client_id and client_secret (Basic Auth and POST)
|
|
func AuthorizeClientIDSecret(ctx context.Context, clientID, clientSecret string, storage Storage) error {
|
|
err := storage.AuthorizeClientIDSecret(ctx, clientID, clientSecret)
|
|
if err != nil {
|
|
return oidc.ErrInvalidClient().WithDescription("invalid client_id / client_secret").WithParent(err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
//AuthorizeCodeChallenge authorizes a client by validating the code_verifier against the previously sent
|
|
//code_challenge of the auth request (PKCE)
|
|
func AuthorizeCodeChallenge(tokenReq *oidc.AccessTokenRequest, challenge *oidc.CodeChallenge) error {
|
|
if tokenReq.CodeVerifier == "" {
|
|
return oidc.ErrInvalidRequest().WithDescription("code_challenge required")
|
|
}
|
|
if !oidc.VerifyCodeChallenge(challenge, tokenReq.CodeVerifier) {
|
|
return oidc.ErrInvalidGrant().WithDescription("invalid code challenge")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
//AuthorizePrivateJWTKey authorizes a client by validating the client_assertion's signature with a previously
|
|
//registered public key (JWT Profile)
|
|
func AuthorizePrivateJWTKey(ctx context.Context, clientAssertion string, exchanger JWTAuthorizationGrantExchanger) (Client, error) {
|
|
jwtReq, err := VerifyJWTAssertion(ctx, clientAssertion, exchanger.JWTProfileVerifier())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
client, err := exchanger.Storage().GetClientByClientID(ctx, jwtReq.Issuer)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if client.AuthMethod() != oidc.AuthMethodPrivateKeyJWT {
|
|
return nil, oidc.ErrInvalidClient()
|
|
}
|
|
return client, nil
|
|
}
|
|
|
|
//ValidateGrantType ensures that the requested grant_type is allowed by the Client
|
|
func ValidateGrantType(client Client, grantType oidc.GrantType) bool {
|
|
if client == nil {
|
|
return false
|
|
}
|
|
for _, grant := range client.GrantTypes() {
|
|
if grantType == grant {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|