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)
200 lines
5.8 KiB
Go
200 lines
5.8 KiB
Go
package oidc
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"time"
|
|
|
|
"gopkg.in/square/go-jose.v2"
|
|
)
|
|
|
|
const (
|
|
//GrantTypeCode defines the grant_type `authorization_code` used for the Token Request in the Authorization Code Flow
|
|
GrantTypeCode GrantType = "authorization_code"
|
|
|
|
//GrantTypeRefreshToken defines the grant_type `refresh_token` used for the Token Request in the Refresh Token Flow
|
|
GrantTypeRefreshToken GrantType = "refresh_token"
|
|
|
|
//GrantTypeBearer defines the grant_type `urn:ietf:params:oauth:grant-type:jwt-bearer` used for the JWT Authorization Grant
|
|
GrantTypeBearer GrantType = "urn:ietf:params:oauth:grant-type:jwt-bearer"
|
|
|
|
//GrantTypeTokenExchange defines the grant_type `urn:ietf:params:oauth:grant-type:token-exchange` used for the OAuth Token Exchange Grant
|
|
GrantTypeTokenExchange GrantType = "urn:ietf:params:oauth:grant-type:token-exchange"
|
|
|
|
//ClientAssertionTypeJWTAssertion defines the client_assertion_type `urn:ietf:params:oauth:client-assertion-type:jwt-bearer`
|
|
//used for the OAuth JWT Profile Client Authentication
|
|
ClientAssertionTypeJWTAssertion = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer"
|
|
)
|
|
|
|
type GrantType string
|
|
|
|
type TokenRequest interface {
|
|
// GrantType GrantType `schema:"grant_type"`
|
|
GrantType() GrantType
|
|
}
|
|
|
|
type TokenRequestType GrantType
|
|
|
|
type AccessTokenRequest struct {
|
|
Code string `schema:"code"`
|
|
RedirectURI string `schema:"redirect_uri"`
|
|
ClientID string `schema:"client_id"`
|
|
ClientSecret string `schema:"client_secret"`
|
|
CodeVerifier string `schema:"code_verifier"`
|
|
ClientAssertion string `schema:"client_assertion"`
|
|
ClientAssertionType string `schema:"client_assertion_type"`
|
|
}
|
|
|
|
func (a *AccessTokenRequest) GrantType() GrantType {
|
|
return GrantTypeCode
|
|
}
|
|
|
|
//SetClientID implements op.AuthenticatedTokenRequest
|
|
func (a *AccessTokenRequest) SetClientID(clientID string) {
|
|
a.ClientID = clientID
|
|
}
|
|
|
|
//SetClientSecret implements op.AuthenticatedTokenRequest
|
|
func (a *AccessTokenRequest) SetClientSecret(clientSecret string) {
|
|
a.ClientSecret = clientSecret
|
|
}
|
|
|
|
type RefreshTokenRequest struct {
|
|
RefreshToken string `schema:"refresh_token"`
|
|
Scopes SpaceDelimitedArray `schema:"scope"`
|
|
ClientID string `schema:"client_id"`
|
|
ClientSecret string `schema:"client_secret"`
|
|
ClientAssertion string `schema:"client_assertion"`
|
|
ClientAssertionType string `schema:"client_assertion_type"`
|
|
}
|
|
|
|
func (a *RefreshTokenRequest) GrantType() GrantType {
|
|
return GrantTypeRefreshToken
|
|
}
|
|
|
|
//SetClientID implements op.AuthenticatedTokenRequest
|
|
func (a *RefreshTokenRequest) SetClientID(clientID string) {
|
|
a.ClientID = clientID
|
|
}
|
|
|
|
//SetClientSecret implements op.AuthenticatedTokenRequest
|
|
func (a *RefreshTokenRequest) SetClientSecret(clientSecret string) {
|
|
a.ClientSecret = clientSecret
|
|
}
|
|
|
|
type JWTTokenRequest struct {
|
|
Issuer string `json:"iss"`
|
|
Subject string `json:"sub"`
|
|
Scopes SpaceDelimitedArray `json:"-"`
|
|
Audience Audience `json:"aud"`
|
|
IssuedAt Time `json:"iat"`
|
|
ExpiresAt Time `json:"exp"`
|
|
|
|
private map[string]interface{}
|
|
}
|
|
|
|
func (j *JWTTokenRequest) MarshalJSON() ([]byte, error) {
|
|
type Alias JWTTokenRequest
|
|
a := (*Alias)(j)
|
|
|
|
b, err := json.Marshal(a)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(j.private) == 0 {
|
|
return b, nil
|
|
}
|
|
|
|
err = json.Unmarshal(b, &j.private)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("jws: invalid map of custom claims %v", j.private)
|
|
}
|
|
|
|
return json.Marshal(j.private)
|
|
}
|
|
|
|
func (j *JWTTokenRequest) UnmarshalJSON(data []byte) error {
|
|
type Alias JWTTokenRequest
|
|
a := (*Alias)(j)
|
|
|
|
err := json.Unmarshal(data, a)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = json.Unmarshal(data, &j.private)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (j *JWTTokenRequest) GetCustomClaim(key string) interface{} {
|
|
return j.private[key]
|
|
}
|
|
|
|
//GetIssuer implements the Claims interface
|
|
func (j *JWTTokenRequest) GetIssuer() string {
|
|
return j.Issuer
|
|
}
|
|
|
|
//GetAudience implements the Claims and TokenRequest interfaces
|
|
func (j *JWTTokenRequest) GetAudience() []string {
|
|
return j.Audience
|
|
}
|
|
|
|
//GetExpiration implements the Claims interface
|
|
func (j *JWTTokenRequest) GetExpiration() time.Time {
|
|
return time.Time(j.ExpiresAt)
|
|
}
|
|
|
|
//GetIssuedAt implements the Claims interface
|
|
func (j *JWTTokenRequest) GetIssuedAt() time.Time {
|
|
return time.Time(j.IssuedAt)
|
|
}
|
|
|
|
//GetNonce implements the Claims interface
|
|
func (j *JWTTokenRequest) GetNonce() string {
|
|
return ""
|
|
}
|
|
|
|
//GetAuthenticationContextClassReference implements the Claims interface
|
|
func (j *JWTTokenRequest) GetAuthenticationContextClassReference() string {
|
|
return ""
|
|
}
|
|
|
|
//GetAuthTime implements the Claims interface
|
|
func (j *JWTTokenRequest) GetAuthTime() time.Time {
|
|
return time.Time{}
|
|
}
|
|
|
|
//GetAuthorizedParty implements the Claims interface
|
|
func (j *JWTTokenRequest) GetAuthorizedParty() string {
|
|
return ""
|
|
}
|
|
|
|
//SetSignatureAlgorithm implements the Claims interface
|
|
func (j *JWTTokenRequest) SetSignatureAlgorithm(_ jose.SignatureAlgorithm) {}
|
|
|
|
//GetSubject implements the TokenRequest interface
|
|
func (j *JWTTokenRequest) GetSubject() string {
|
|
return j.Subject
|
|
}
|
|
|
|
//GetScopes implements the TokenRequest interface
|
|
func (j *JWTTokenRequest) GetScopes() []string {
|
|
return j.Scopes
|
|
}
|
|
|
|
type TokenExchangeRequest struct {
|
|
subjectToken string `schema:"subject_token"`
|
|
subjectTokenType string `schema:"subject_token_type"`
|
|
actorToken string `schema:"actor_token"`
|
|
actorTokenType string `schema:"actor_token_type"`
|
|
resource []string `schema:"resource"`
|
|
audience Audience `schema:"audience"`
|
|
Scope SpaceDelimitedArray `schema:"scope"`
|
|
requestedTokenType string `schema:"requested_token_type"`
|
|
}
|