mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 11:04:25 +00:00
e22689c125
* cleanup todo * pass id token details to oidc * feat(oidc): id token for device authorization This changes updates to the newest oidc version, so the Device Authorization grant can return ID tokens when the scope `openid` is set. There is also some refactoring done, so that the eventstore can be queried directly when polling for state. The projection is cleaned up to a minimum with only data required for the login UI. * try to be explicit wit hthe timezone to fix github * pin oidc v3.8.0 * remove TBD entry
319 lines
12 KiB
Go
319 lines
12 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"crypto/rand"
|
|
"crypto/x509"
|
|
"crypto/x509/pkix"
|
|
"encoding/pem"
|
|
"math/big"
|
|
"net/http"
|
|
"strconv"
|
|
"sync"
|
|
"time"
|
|
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
api_http "github.com/zitadel/zitadel/internal/api/http"
|
|
"github.com/zitadel/zitadel/internal/command/preparation"
|
|
sd "github.com/zitadel/zitadel/internal/config/systemdefaults"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/id"
|
|
"github.com/zitadel/zitadel/internal/repository/action"
|
|
"github.com/zitadel/zitadel/internal/repository/authrequest"
|
|
"github.com/zitadel/zitadel/internal/repository/deviceauth"
|
|
"github.com/zitadel/zitadel/internal/repository/feature"
|
|
"github.com/zitadel/zitadel/internal/repository/idpintent"
|
|
instance_repo "github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/repository/keypair"
|
|
"github.com/zitadel/zitadel/internal/repository/limits"
|
|
"github.com/zitadel/zitadel/internal/repository/milestone"
|
|
"github.com/zitadel/zitadel/internal/repository/oidcsession"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
proj_repo "github.com/zitadel/zitadel/internal/repository/project"
|
|
"github.com/zitadel/zitadel/internal/repository/quota"
|
|
"github.com/zitadel/zitadel/internal/repository/restrictions"
|
|
"github.com/zitadel/zitadel/internal/repository/session"
|
|
usr_repo "github.com/zitadel/zitadel/internal/repository/user"
|
|
usr_grant_repo "github.com/zitadel/zitadel/internal/repository/usergrant"
|
|
"github.com/zitadel/zitadel/internal/static"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
webauthn_helper "github.com/zitadel/zitadel/internal/webauthn"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type Commands struct {
|
|
httpClient *http.Client
|
|
|
|
jobs sync.WaitGroup
|
|
|
|
checkPermission domain.PermissionCheck
|
|
newCode cryptoCodeFunc
|
|
newCodeWithDefault cryptoCodeWithDefaultFunc
|
|
|
|
eventstore *eventstore.Eventstore
|
|
static static.Storage
|
|
idGenerator id.Generator
|
|
zitadelRoles []authz.RoleMapping
|
|
externalDomain string
|
|
externalSecure bool
|
|
externalPort uint16
|
|
|
|
idpConfigEncryption crypto.EncryptionAlgorithm
|
|
smtpEncryption crypto.EncryptionAlgorithm
|
|
smsEncryption crypto.EncryptionAlgorithm
|
|
userEncryption crypto.EncryptionAlgorithm
|
|
userPasswordHasher *crypto.PasswordHasher
|
|
codeAlg crypto.HashAlgorithm
|
|
machineKeySize int
|
|
applicationKeySize int
|
|
domainVerificationAlg crypto.EncryptionAlgorithm
|
|
domainVerificationGenerator crypto.Generator
|
|
domainVerificationValidator func(domain, token, verifier string, checkType api_http.CheckType) error
|
|
sessionTokenCreator func(sessionID string) (id string, token string, err error)
|
|
sessionTokenVerifier func(ctx context.Context, sessionToken, sessionID, tokenID string) (err error)
|
|
defaultAccessTokenLifetime time.Duration
|
|
defaultRefreshTokenLifetime time.Duration
|
|
defaultRefreshTokenIdleLifetime time.Duration
|
|
|
|
multifactors domain.MultifactorConfigs
|
|
webauthnConfig *webauthn_helper.Config
|
|
keySize int
|
|
keyAlgorithm crypto.EncryptionAlgorithm
|
|
certificateAlgorithm crypto.EncryptionAlgorithm
|
|
certKeySize int
|
|
privateKeyLifetime time.Duration
|
|
publicKeyLifetime time.Duration
|
|
certificateLifetime time.Duration
|
|
defaultSecretGenerators *SecretGenerators
|
|
|
|
samlCertificateAndKeyGenerator func(id string) ([]byte, []byte, error)
|
|
}
|
|
|
|
func StartCommands(
|
|
es *eventstore.Eventstore,
|
|
defaults sd.SystemDefaults,
|
|
zitadelRoles []authz.RoleMapping,
|
|
staticStore static.Storage,
|
|
webAuthN *webauthn_helper.Config,
|
|
externalDomain string,
|
|
externalSecure bool,
|
|
externalPort uint16,
|
|
idpConfigEncryption, otpEncryption, smtpEncryption, smsEncryption, userEncryption, domainVerificationEncryption, oidcEncryption, samlEncryption crypto.EncryptionAlgorithm,
|
|
httpClient *http.Client,
|
|
permissionCheck domain.PermissionCheck,
|
|
sessionTokenVerifier func(ctx context.Context, sessionToken string, sessionID string, tokenID string) (err error),
|
|
defaultAccessTokenLifetime,
|
|
defaultRefreshTokenLifetime,
|
|
defaultRefreshTokenIdleLifetime time.Duration,
|
|
defaultSecretGenerators *SecretGenerators,
|
|
) (repo *Commands, err error) {
|
|
if externalDomain == "" {
|
|
return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Df21s", "no external domain specified")
|
|
}
|
|
idGenerator := id.SonyFlakeGenerator()
|
|
// reuse the oidcEncryption to be able to handle both tokens in the interceptor later on
|
|
sessionAlg := oidcEncryption
|
|
repo = &Commands{
|
|
eventstore: es,
|
|
static: staticStore,
|
|
idGenerator: idGenerator,
|
|
zitadelRoles: zitadelRoles,
|
|
externalDomain: externalDomain,
|
|
externalSecure: externalSecure,
|
|
externalPort: externalPort,
|
|
keySize: defaults.KeyConfig.Size,
|
|
certKeySize: defaults.KeyConfig.CertificateSize,
|
|
privateKeyLifetime: defaults.KeyConfig.PrivateKeyLifetime,
|
|
publicKeyLifetime: defaults.KeyConfig.PublicKeyLifetime,
|
|
certificateLifetime: defaults.KeyConfig.CertificateLifetime,
|
|
idpConfigEncryption: idpConfigEncryption,
|
|
smtpEncryption: smtpEncryption,
|
|
smsEncryption: smsEncryption,
|
|
userEncryption: userEncryption,
|
|
domainVerificationAlg: domainVerificationEncryption,
|
|
keyAlgorithm: oidcEncryption,
|
|
certificateAlgorithm: samlEncryption,
|
|
webauthnConfig: webAuthN,
|
|
httpClient: httpClient,
|
|
checkPermission: permissionCheck,
|
|
newCode: newCryptoCode,
|
|
newCodeWithDefault: newCryptoCodeWithDefaultConfig,
|
|
sessionTokenCreator: sessionTokenCreator(idGenerator, sessionAlg),
|
|
sessionTokenVerifier: sessionTokenVerifier,
|
|
defaultAccessTokenLifetime: defaultAccessTokenLifetime,
|
|
defaultRefreshTokenLifetime: defaultRefreshTokenLifetime,
|
|
defaultRefreshTokenIdleLifetime: defaultRefreshTokenIdleLifetime,
|
|
defaultSecretGenerators: defaultSecretGenerators,
|
|
samlCertificateAndKeyGenerator: samlCertificateAndKeyGenerator(defaults.KeyConfig.Size),
|
|
}
|
|
|
|
instance_repo.RegisterEventMappers(repo.eventstore)
|
|
org.RegisterEventMappers(repo.eventstore)
|
|
usr_repo.RegisterEventMappers(repo.eventstore)
|
|
usr_grant_repo.RegisterEventMappers(repo.eventstore)
|
|
proj_repo.RegisterEventMappers(repo.eventstore)
|
|
keypair.RegisterEventMappers(repo.eventstore)
|
|
action.RegisterEventMappers(repo.eventstore)
|
|
quota.RegisterEventMappers(repo.eventstore)
|
|
limits.RegisterEventMappers(repo.eventstore)
|
|
restrictions.RegisterEventMappers(repo.eventstore)
|
|
session.RegisterEventMappers(repo.eventstore)
|
|
idpintent.RegisterEventMappers(repo.eventstore)
|
|
authrequest.RegisterEventMappers(repo.eventstore)
|
|
oidcsession.RegisterEventMappers(repo.eventstore)
|
|
milestone.RegisterEventMappers(repo.eventstore)
|
|
feature.RegisterEventMappers(repo.eventstore)
|
|
deviceauth.RegisterEventMappers(repo.eventstore)
|
|
|
|
repo.codeAlg = crypto.NewBCrypt(defaults.SecretGenerators.PasswordSaltCost)
|
|
repo.userPasswordHasher, err = defaults.PasswordHasher.PasswordHasher()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
repo.machineKeySize = int(defaults.SecretGenerators.MachineKeySize)
|
|
repo.applicationKeySize = int(defaults.SecretGenerators.ApplicationKeySize)
|
|
|
|
repo.multifactors = domain.MultifactorConfigs{
|
|
OTP: domain.OTPConfig{
|
|
CryptoMFA: otpEncryption,
|
|
Issuer: defaults.Multifactors.OTP.Issuer,
|
|
},
|
|
}
|
|
|
|
repo.domainVerificationGenerator = crypto.NewEncryptionGenerator(defaults.DomainVerification.VerificationGenerator, repo.domainVerificationAlg)
|
|
repo.domainVerificationValidator = api_http.ValidateDomain
|
|
return repo, nil
|
|
}
|
|
|
|
type AppendReducer interface {
|
|
AppendEvents(...eventstore.Event)
|
|
// TODO: Why is it allowed to return an error here?
|
|
Reduce() error
|
|
}
|
|
|
|
func (c *Commands) pushAppendAndReduce(ctx context.Context, object AppendReducer, cmds ...eventstore.Command) error {
|
|
events, err := c.eventstore.Push(ctx, cmds...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return AppendAndReduce(object, events...)
|
|
}
|
|
|
|
func AppendAndReduce(object AppendReducer, events ...eventstore.Event) error {
|
|
object.AppendEvents(events...)
|
|
return object.Reduce()
|
|
}
|
|
|
|
func queryAndReduce(ctx context.Context, filter preparation.FilterToQueryReducer, wm eventstore.QueryReducer) error {
|
|
events, err := filter(ctx, wm.Query())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(events) == 0 {
|
|
return nil
|
|
}
|
|
wm.AppendEvents(events...)
|
|
return wm.Reduce()
|
|
}
|
|
|
|
type existsWriteModel interface {
|
|
Exists() bool
|
|
eventstore.QueryReducer
|
|
}
|
|
|
|
func exists(ctx context.Context, filter preparation.FilterToQueryReducer, wm existsWriteModel) (bool, error) {
|
|
err := queryAndReduce(ctx, filter, wm)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
return wm.Exists(), nil
|
|
}
|
|
|
|
func samlCertificateAndKeyGenerator(keySize int) func(id string) ([]byte, []byte, error) {
|
|
return func(id string) ([]byte, []byte, error) {
|
|
priv, pub, err := crypto.GenerateKeyPair(keySize)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
|
|
serial, err := strconv.Atoi(id)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
template := x509.Certificate{
|
|
SerialNumber: big.NewInt(int64(serial)),
|
|
Subject: pkix.Name{
|
|
Organization: []string{"ZITADEL"},
|
|
SerialNumber: id,
|
|
},
|
|
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
|
|
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
|
|
BasicConstraintsValid: true,
|
|
}
|
|
|
|
derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, pub, priv)
|
|
if err != nil {
|
|
return nil, nil, zerrors.ThrowInternalf(err, "COMMAND-x92u101j", "failed to create certificate")
|
|
}
|
|
|
|
keyBlock := &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}
|
|
certBlock := &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}
|
|
return pem.EncodeToMemory(keyBlock), pem.EncodeToMemory(certBlock), nil
|
|
}
|
|
}
|
|
|
|
// Close blocks until all async jobs are finished,
|
|
// the context expires or after eventstore.PushTimeout.
|
|
func (c *Commands) Close(ctx context.Context) error {
|
|
if c.eventstore.PushTimeout != 0 {
|
|
var cancel context.CancelFunc
|
|
ctx, cancel = context.WithTimeout(ctx, c.eventstore.PushTimeout)
|
|
defer cancel()
|
|
}
|
|
|
|
done := make(chan struct{})
|
|
go func() {
|
|
c.jobs.Wait()
|
|
close(done)
|
|
}()
|
|
select {
|
|
case <-done:
|
|
return nil
|
|
case <-ctx.Done():
|
|
return ctx.Err()
|
|
}
|
|
}
|
|
|
|
// asyncPush attempts to push events to the eventstore in a separate Go routine.
|
|
// This can be used to speed up request times when the outcome of the push is
|
|
// not important for business logic but have a pure logging function.
|
|
// For example this can be used for Secret Check Success and Failed events.
|
|
// On push error, a log line describing the error will be emitted.
|
|
func (c *Commands) asyncPush(ctx context.Context, cmds ...eventstore.Command) {
|
|
// Create a new context, as the request scoped context might get
|
|
// canceled before we where able to push.
|
|
// The eventstore has its own PushTimeout setting,
|
|
// so we don't need to have a context with timeout here.
|
|
ctx = context.WithoutCancel(ctx)
|
|
|
|
c.jobs.Add(1)
|
|
|
|
go func() {
|
|
defer c.jobs.Done()
|
|
localCtx, span := tracing.NewSpan(ctx)
|
|
|
|
_, err := c.eventstore.Push(localCtx, cmds...)
|
|
if err != nil {
|
|
for _, cmd := range cmds {
|
|
logging.WithError(err).Errorf("could not push event %q", cmd.Type())
|
|
}
|
|
}
|
|
|
|
span.EndWithError(err)
|
|
}()
|
|
}
|