* first draft of a new server interface * allow any response type * complete interface docs * refelct the format from the proposal * intermediate commit with some methods implemented * implement remaining token grant type methods * implement remaining server methods * error handling * rewrite auth request validation * define handlers, routes * input validation and concrete handlers * check if client credential client is authenticated * copy and modify the routes test for the legacy server * run integration tests against both Server and Provider * remove unuse ValidateAuthRequestV2 function * unit tests for error handling * cleanup tokenHandler * move server routest test * unit test authorize * handle client credentials in VerifyClient * change code exchange route test * finish http unit tests * review server interface docs and spelling * add withClient unit test * server options * cleanup unused GrantType method * resolve typo comments * make endpoints pointers to enable/disable them * jwt profile base work * jwt: correct the test expect --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
164 lines
5.4 KiB
Go
164 lines
5.4 KiB
Go
package op
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
|
|
httphelper "github.com/zitadel/oidc/v3/pkg/http"
|
|
"github.com/zitadel/oidc/v3/pkg/oidc"
|
|
)
|
|
|
|
type Revoker interface {
|
|
Decoder() httphelper.Decoder
|
|
Crypto() Crypto
|
|
Storage() Storage
|
|
AccessTokenVerifier(context.Context) *AccessTokenVerifier
|
|
AuthMethodPrivateKeyJWTSupported() bool
|
|
AuthMethodPostSupported() bool
|
|
}
|
|
|
|
type RevokerJWTProfile interface {
|
|
Revoker
|
|
JWTProfileVerifier(context.Context) *JWTProfileVerifier
|
|
}
|
|
|
|
func revocationHandler(revoker Revoker) func(http.ResponseWriter, *http.Request) {
|
|
return func(w http.ResponseWriter, r *http.Request) {
|
|
Revoke(w, r, revoker)
|
|
}
|
|
}
|
|
|
|
func Revoke(w http.ResponseWriter, r *http.Request, revoker Revoker) {
|
|
token, tokenTypeHint, clientID, err := ParseTokenRevocationRequest(r, revoker)
|
|
if err != nil {
|
|
RevocationRequestError(w, r, err)
|
|
return
|
|
}
|
|
var subject string
|
|
doDecrypt := true
|
|
if tokenTypeHint != "access_token" {
|
|
userID, tokenID, err := revoker.Storage().GetRefreshTokenInfo(r.Context(), clientID, token)
|
|
if err != nil {
|
|
// An invalid refresh token means that we'll try other things (leaving doDecrypt==true)
|
|
if !errors.Is(err, ErrInvalidRefreshToken) {
|
|
RevocationRequestError(w, r, oidc.ErrServerError().WithParent(err))
|
|
return
|
|
}
|
|
} else {
|
|
token = tokenID
|
|
subject = userID
|
|
doDecrypt = false
|
|
}
|
|
}
|
|
if doDecrypt {
|
|
tokenID, userID, ok := getTokenIDAndSubjectForRevocation(r.Context(), revoker, token)
|
|
if ok {
|
|
token = tokenID
|
|
subject = userID
|
|
}
|
|
}
|
|
if err := revoker.Storage().RevokeToken(r.Context(), token, subject, clientID); err != nil {
|
|
RevocationRequestError(w, r, err)
|
|
return
|
|
}
|
|
httphelper.MarshalJSON(w, nil)
|
|
}
|
|
|
|
func ParseTokenRevocationRequest(r *http.Request, revoker Revoker) (token, tokenTypeHint, clientID string, err error) {
|
|
err = r.ParseForm()
|
|
if err != nil {
|
|
return "", "", "", oidc.ErrInvalidRequest().WithDescription("unable to parse request").WithParent(err)
|
|
}
|
|
req := new(struct {
|
|
oidc.RevocationRequest
|
|
oidc.ClientAssertionParams // for auth_method private_key_jwt
|
|
ClientID string `schema:"client_id"` // for auth_method none and post
|
|
ClientSecret string `schema:"client_secret"` // for auth_method post
|
|
})
|
|
err = revoker.Decoder().Decode(req, r.Form)
|
|
if err != nil {
|
|
return "", "", "", oidc.ErrInvalidRequest().WithDescription("error decoding form").WithParent(err)
|
|
}
|
|
if req.ClientAssertionType == oidc.ClientAssertionTypeJWTAssertion {
|
|
revokerJWTProfile, ok := revoker.(RevokerJWTProfile)
|
|
if !ok || !revoker.AuthMethodPrivateKeyJWTSupported() {
|
|
return "", "", "", oidc.ErrInvalidClient().WithDescription("auth_method private_key_jwt not supported")
|
|
}
|
|
profile, err := VerifyJWTAssertion(r.Context(), req.ClientAssertion, revokerJWTProfile.JWTProfileVerifier(r.Context()))
|
|
if err == nil {
|
|
return req.Token, req.TokenTypeHint, profile.Issuer, nil
|
|
}
|
|
return "", "", "", err
|
|
}
|
|
clientID, clientSecret, ok := r.BasicAuth()
|
|
if ok {
|
|
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)
|
|
}
|
|
if err = AuthorizeClientIDSecret(r.Context(), clientID, clientSecret, revoker.Storage()); err != nil {
|
|
return "", "", "", err
|
|
}
|
|
return req.Token, req.TokenTypeHint, clientID, nil
|
|
}
|
|
if req.ClientID == "" {
|
|
return "", "", "", oidc.ErrInvalidClient().WithDescription("invalid authorization")
|
|
}
|
|
client, err := revoker.Storage().GetClientByClientID(r.Context(), req.ClientID)
|
|
if err != nil {
|
|
return "", "", "", oidc.ErrInvalidClient().WithParent(err)
|
|
}
|
|
if req.ClientSecret == "" {
|
|
if client.AuthMethod() != oidc.AuthMethodNone {
|
|
return "", "", "", oidc.ErrInvalidClient().WithDescription("invalid authorization")
|
|
}
|
|
return req.Token, req.TokenTypeHint, req.ClientID, nil
|
|
}
|
|
if client.AuthMethod() == oidc.AuthMethodPost && !revoker.AuthMethodPostSupported() {
|
|
return "", "", "", oidc.ErrInvalidClient().WithDescription("auth_method post not supported")
|
|
}
|
|
if err = AuthorizeClientIDSecret(r.Context(), req.ClientID, req.ClientSecret, revoker.Storage()); err != nil {
|
|
return "", "", "", err
|
|
}
|
|
return req.Token, req.TokenTypeHint, req.ClientID, nil
|
|
}
|
|
|
|
func RevocationRequestError(w http.ResponseWriter, r *http.Request, err error) {
|
|
statusErr := RevocationError(err)
|
|
httphelper.MarshalJSONWithStatus(w, statusErr.parent, statusErr.statusCode)
|
|
}
|
|
|
|
func RevocationError(err error) StatusError {
|
|
e := oidc.DefaultToServerError(err, err.Error())
|
|
status := http.StatusBadRequest
|
|
switch e.ErrorType {
|
|
case oidc.InvalidClient:
|
|
status = 401
|
|
case oidc.ServerError:
|
|
status = 500
|
|
}
|
|
return NewStatusError(e, status)
|
|
}
|
|
|
|
func getTokenIDAndSubjectForRevocation(ctx context.Context, userinfoProvider UserinfoProvider, accessToken string) (string, string, bool) {
|
|
tokenIDSubject, err := userinfoProvider.Crypto().Decrypt(accessToken)
|
|
if err == nil {
|
|
splitToken := strings.Split(tokenIDSubject, ":")
|
|
if len(splitToken) != 2 {
|
|
return "", "", false
|
|
}
|
|
return splitToken[0], splitToken[1], true
|
|
}
|
|
accessTokenClaims, err := VerifyAccessToken[*oidc.AccessTokenClaims](ctx, accessToken, userinfoProvider.AccessTokenVerifier(ctx))
|
|
if err != nil {
|
|
return "", "", false
|
|
}
|
|
return accessTokenClaims.JWTID, accessTokenClaims.Subject, true
|
|
}
|