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)
124 lines
2.3 KiB
Go
124 lines
2.3 KiB
Go
package oidc
|
|
|
|
import (
|
|
"encoding/json"
|
|
"strings"
|
|
"time"
|
|
|
|
"golang.org/x/text/language"
|
|
"gopkg.in/square/go-jose.v2"
|
|
)
|
|
|
|
type Audience []string
|
|
|
|
func (a *Audience) UnmarshalJSON(text []byte) error {
|
|
var i interface{}
|
|
err := json.Unmarshal(text, &i)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
switch aud := i.(type) {
|
|
case []interface{}:
|
|
*a = make([]string, len(aud))
|
|
for i, audience := range aud {
|
|
(*a)[i] = audience.(string)
|
|
}
|
|
case string:
|
|
*a = []string{aud}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type Display string
|
|
|
|
func (d *Display) UnmarshalText(text []byte) error {
|
|
display := Display(text)
|
|
switch display {
|
|
case DisplayPage, DisplayPopup, DisplayTouch, DisplayWAP:
|
|
*d = display
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type Gender string
|
|
|
|
type Locales []language.Tag
|
|
|
|
func (l *Locales) UnmarshalText(text []byte) error {
|
|
locales := strings.Split(string(text), " ")
|
|
for _, locale := range locales {
|
|
tag, err := language.Parse(locale)
|
|
if err == nil && !tag.IsRoot() {
|
|
*l = append(*l, tag)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type MaxAge *uint
|
|
|
|
func NewMaxAge(i uint) MaxAge {
|
|
return &i
|
|
}
|
|
|
|
type SpaceDelimitedArray []string
|
|
|
|
type Prompt SpaceDelimitedArray
|
|
|
|
type ResponseType string
|
|
|
|
type ResponseMode string
|
|
|
|
func (s SpaceDelimitedArray) Encode() string {
|
|
return strings.Join(s, " ")
|
|
}
|
|
|
|
func (s *SpaceDelimitedArray) UnmarshalText(text []byte) error {
|
|
*s = strings.Split(string(text), " ")
|
|
return nil
|
|
}
|
|
|
|
func (s SpaceDelimitedArray) MarshalText() ([]byte, error) {
|
|
return []byte(s.Encode()), nil
|
|
}
|
|
|
|
func (s SpaceDelimitedArray) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal((s).Encode())
|
|
}
|
|
|
|
func (s *SpaceDelimitedArray) UnmarshalJSON(data []byte) error {
|
|
var str string
|
|
if err := json.Unmarshal(data, &str); err != nil {
|
|
return err
|
|
}
|
|
*s = strings.Split(str, " ")
|
|
return nil
|
|
}
|
|
|
|
type Time time.Time
|
|
|
|
func (t *Time) UnmarshalJSON(data []byte) error {
|
|
var i int64
|
|
if err := json.Unmarshal(data, &i); err != nil {
|
|
return err
|
|
}
|
|
*t = Time(time.Unix(i, 0).UTC())
|
|
return nil
|
|
}
|
|
|
|
func (t *Time) MarshalJSON() ([]byte, error) {
|
|
return json.Marshal(time.Time(*t).UTC().Unix())
|
|
}
|
|
|
|
type RequestObject struct {
|
|
Issuer string `json:"iss"`
|
|
Audience Audience `json:"aud"`
|
|
AuthRequest
|
|
}
|
|
|
|
func (r *RequestObject) GetIssuer() string {
|
|
return r.Issuer
|
|
}
|
|
|
|
func (r *RequestObject) SetSignatureAlgorithm(algorithm jose.SignatureAlgorithm) {
|
|
}
|