mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 11:34:26 +00:00
ba9b807854
* get key by id and cache them
* userinfo from events for v2 tokens
* improve keyset caching
* concurrent token and client checks
* client and project in single query
* logging and otel
* drop owner_removed column on apps and authN tables
* userinfo and project roles in go routines
* get oidc user info from projections and add actions
* add avatar URL
* some cleanup
* pull oidc work branch
* remove storage from server
* add config flag for experimental introspection
* legacy introspection flag
* drop owner_removed column on user projections
* drop owner_removed column on useer_metadata
* query userinfo unit test
* query introspection client test
* add user_grants to the userinfo query
* handle PAT scopes
* bring triggers back
* test instance keys query
* add userinfo unit tests
* unit test keys
* go mod tidy
* solve some bugs
* fix missing preferred login name
* do not run triggers in go routines, they seem to deadlock
* initialize the trigger handlers late with a sync.OnceValue
* Revert "do not run triggers in go routines, they seem to deadlock"
This reverts commit 2a03da2127
.
* add missing translations
* chore: update go version for linting
* pin oidc version
* parse a global time location for query test
* fix linter complains
* upgrade go lint
* fix more linting issues
---------
Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
105 lines
3.1 KiB
Go
105 lines
3.1 KiB
Go
package oidc
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/zitadel/oidc/v3/pkg/oidc"
|
|
"github.com/zitadel/oidc/v3/pkg/op"
|
|
|
|
"github.com/zitadel/zitadel/internal/command"
|
|
errz "github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/query"
|
|
"github.com/zitadel/zitadel/internal/user/model"
|
|
)
|
|
|
|
type accessToken struct {
|
|
tokenID string
|
|
userID string
|
|
subject string
|
|
clientID string
|
|
audience []string
|
|
scope []string
|
|
tokenCreation time.Time
|
|
tokenExpiration time.Time
|
|
isPAT bool
|
|
}
|
|
|
|
func (s *Server) verifyAccessToken(ctx context.Context, tkn string) (*accessToken, error) {
|
|
var tokenID, subject string
|
|
|
|
if tokenIDSubject, err := s.Provider().Crypto().Decrypt(tkn); err == nil {
|
|
split := strings.Split(tokenIDSubject, ":")
|
|
if len(split) != 2 {
|
|
return nil, errors.New("invalid token format")
|
|
}
|
|
tokenID, subject = split[0], split[1]
|
|
} else {
|
|
verifier := op.NewAccessTokenVerifier(op.IssuerFromContext(ctx), s.keySet)
|
|
claims, err := op.VerifyAccessToken[*oidc.AccessTokenClaims](ctx, tkn, verifier)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
tokenID, subject = claims.JWTID, claims.Subject
|
|
}
|
|
|
|
if strings.HasPrefix(tokenID, command.IDPrefixV2) {
|
|
token, err := s.query.ActiveAccessTokenByToken(ctx, tokenID)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return accessTokenV2(tokenID, subject, token), nil
|
|
}
|
|
|
|
token, err := s.repo.TokenByIDs(ctx, subject, tokenID)
|
|
if err != nil {
|
|
return nil, errz.ThrowPermissionDenied(err, "OIDC-Dsfb2", "token is not valid or has expired")
|
|
}
|
|
return accessTokenV1(tokenID, subject, token), nil
|
|
}
|
|
|
|
func accessTokenV1(tokenID, subject string, token *model.TokenView) *accessToken {
|
|
return &accessToken{
|
|
tokenID: tokenID,
|
|
userID: token.UserID,
|
|
subject: subject,
|
|
clientID: token.ApplicationID,
|
|
audience: token.Audience,
|
|
scope: token.Scopes,
|
|
tokenCreation: token.CreationDate,
|
|
tokenExpiration: token.Expiration,
|
|
isPAT: token.IsPAT,
|
|
}
|
|
}
|
|
|
|
func accessTokenV2(tokenID, subject string, token *query.OIDCSessionAccessTokenReadModel) *accessToken {
|
|
return &accessToken{
|
|
tokenID: tokenID,
|
|
userID: token.UserID,
|
|
subject: subject,
|
|
clientID: token.ClientID,
|
|
audience: token.Audience,
|
|
scope: token.Scope,
|
|
tokenCreation: token.AccessTokenCreation,
|
|
tokenExpiration: token.AccessTokenExpiration,
|
|
}
|
|
}
|
|
|
|
func (s *Server) assertClientScopesForPAT(ctx context.Context, token *accessToken, clientID, projectID string) error {
|
|
token.audience = append(token.audience, clientID)
|
|
projectIDQuery, err := query.NewProjectRoleProjectIDSearchQuery(projectID)
|
|
if err != nil {
|
|
return errz.ThrowInternal(err, "OIDC-Cyc78", "Errors.Internal")
|
|
}
|
|
roles, err := s.query.SearchProjectRoles(ctx, s.features.TriggerIntrospectionProjections, &query.ProjectRoleSearchQueries{Queries: []query.SearchQuery{projectIDQuery}})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, role := range roles.ProjectRoles {
|
|
token.scope = append(token.scope, ScopeProjectRolePrefix+role.Key)
|
|
}
|
|
return nil
|
|
}
|