mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-18 05:52:51 +00:00
# Which Problems Are Solved Zitadel exposes the secrets generator configuration through its admin api. This allows instance admins to manage them on their own and they can create overwrite the system / runtime defaults (incl. expiration). This very much needed in multi-instance scenarios such as zitadel.cloud. Currently the invite code configuration was not manageable through the API, but only runtime config. # How the Problems Are Solved - added the `invite_code` type to the API allowing it to be set and retrieved. - added the type to console's management list - added the type to be stored on instance setup - change the `GetSecretGenerator` endpoint to fall back to the runtime config if no config is stored on the instance itself - ensure the `length` and at least one charset is enabled, return an error otherwise - expiry is not enforced, so 0 allows codes with no expiry (current state) # Additional Changes None # Additional Context - closes https://github.com/zitadel/zitadel/issues/10474
300 lines
9.9 KiB
Go
300 lines
9.9 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
"errors"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var (
|
|
secretGeneratorsTable = table{
|
|
name: projection.SecretGeneratorProjectionTable,
|
|
instanceIDCol: projection.SecretGeneratorColumnInstanceID,
|
|
}
|
|
SecretGeneratorColumnAggregateID = Column{
|
|
name: projection.SecretGeneratorColumnAggregateID,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnInstanceID = Column{
|
|
name: projection.SecretGeneratorColumnInstanceID,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnGeneratorType = Column{
|
|
name: projection.SecretGeneratorColumnGeneratorType,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnCreationDate = Column{
|
|
name: projection.SecretGeneratorColumnCreationDate,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnChangeDate = Column{
|
|
name: projection.SecretGeneratorColumnChangeDate,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnResourceOwner = Column{
|
|
name: projection.SecretGeneratorColumnResourceOwner,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnSequence = Column{
|
|
name: projection.SecretGeneratorColumnSequence,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnLength = Column{
|
|
name: projection.SecretGeneratorColumnLength,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnExpiry = Column{
|
|
name: projection.SecretGeneratorColumnExpiry,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnIncludeLowerLetters = Column{
|
|
name: projection.SecretGeneratorColumnIncludeLowerLetters,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnIncludeUpperLetters = Column{
|
|
name: projection.SecretGeneratorColumnIncludeUpperLetters,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnIncludeDigits = Column{
|
|
name: projection.SecretGeneratorColumnIncludeDigits,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
SecretGeneratorColumnIncludeSymbols = Column{
|
|
name: projection.SecretGeneratorColumnIncludeSymbols,
|
|
table: secretGeneratorsTable,
|
|
}
|
|
)
|
|
|
|
type SecretGenerators struct {
|
|
SearchResponse
|
|
SecretGenerators []*SecretGenerator
|
|
}
|
|
|
|
type SecretGenerator struct {
|
|
AggregateID string
|
|
CreationDate time.Time
|
|
ChangeDate time.Time
|
|
ResourceOwner string
|
|
Sequence uint64
|
|
|
|
GeneratorType domain.SecretGeneratorType
|
|
Length uint
|
|
Expiry time.Duration
|
|
IncludeLowerLetters bool
|
|
IncludeUpperLetters bool
|
|
IncludeDigits bool
|
|
IncludeSymbols bool
|
|
}
|
|
|
|
type SecretGeneratorSearchQueries struct {
|
|
SearchRequest
|
|
Queries []SearchQuery
|
|
}
|
|
|
|
func (q *Queries) InitEncryptionGenerator(ctx context.Context, generatorType domain.SecretGeneratorType, algorithm crypto.EncryptionAlgorithm) (_ crypto.Generator, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
generatorConfig, err := q.SecretGeneratorByType(ctx, generatorType)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cryptoConfig := crypto.GeneratorConfig{
|
|
Length: generatorConfig.Length,
|
|
Expiry: generatorConfig.Expiry,
|
|
IncludeLowerLetters: generatorConfig.IncludeLowerLetters,
|
|
IncludeUpperLetters: generatorConfig.IncludeUpperLetters,
|
|
IncludeDigits: generatorConfig.IncludeDigits,
|
|
IncludeSymbols: generatorConfig.IncludeSymbols,
|
|
}
|
|
return crypto.NewEncryptionGenerator(cryptoConfig, algorithm), nil
|
|
}
|
|
|
|
func (q *Queries) SecretGeneratorByType(ctx context.Context, generatorType domain.SecretGeneratorType) (generator *SecretGenerator, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
instanceID := authz.GetInstance(ctx).InstanceID()
|
|
stmt, scan := prepareSecretGeneratorQuery()
|
|
query, args, err := stmt.Where(sq.Eq{
|
|
SecretGeneratorColumnGeneratorType.identifier(): generatorType,
|
|
SecretGeneratorColumnInstanceID.identifier(): instanceID,
|
|
}).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-3k99f", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = q.client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
generator, err = scan(row)
|
|
return err
|
|
}, query, args...)
|
|
if err == nil {
|
|
return generator, nil
|
|
}
|
|
if !errors.Is(err, sql.ErrNoRows) {
|
|
logging.OnError(err).WithField("type", generatorType).WithField("instance_id", instanceID).Error("secret generator by type")
|
|
return nil, err
|
|
}
|
|
// if the config was not (yet) stored on the database, fall back to the system / runtime config
|
|
defaultConfig, ok := q.defaultSecretGenerators[generatorType]
|
|
if !ok {
|
|
return nil, err // return the initial not found error
|
|
}
|
|
return &SecretGenerator{
|
|
AggregateID: instanceID,
|
|
ResourceOwner: instanceID,
|
|
GeneratorType: generatorType,
|
|
Length: defaultConfig.Length,
|
|
Expiry: defaultConfig.Expiry,
|
|
IncludeLowerLetters: defaultConfig.IncludeLowerLetters,
|
|
IncludeUpperLetters: defaultConfig.IncludeUpperLetters,
|
|
IncludeDigits: defaultConfig.IncludeDigits,
|
|
IncludeSymbols: defaultConfig.IncludeSymbols,
|
|
}, nil
|
|
}
|
|
|
|
func (q *Queries) SearchSecretGenerators(ctx context.Context, queries *SecretGeneratorSearchQueries) (secretGenerators *SecretGenerators, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
query, scan := prepareSecretGeneratorsQuery()
|
|
stmt, args, err := queries.toQuery(query).
|
|
Where(sq.Eq{
|
|
SecretGeneratorColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}).ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInvalidArgument(err, "QUERY-sn9lw", "Errors.Query.InvalidRequest")
|
|
}
|
|
|
|
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
secretGenerators, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-4miii", "Errors.Internal")
|
|
}
|
|
secretGenerators.State, err = q.latestState(ctx, secretGeneratorsTable)
|
|
return secretGenerators, err
|
|
}
|
|
|
|
func (q *SecretGeneratorSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
|
query = q.SearchRequest.toQuery(query)
|
|
for _, q := range q.Queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
return query
|
|
}
|
|
|
|
func NewSecretGeneratorTypeSearchQuery(value int32) (SearchQuery, error) {
|
|
return NewNumberQuery(SecretGeneratorColumnGeneratorType, value, NumberEquals)
|
|
}
|
|
|
|
func prepareSecretGeneratorQuery() (sq.SelectBuilder, func(*sql.Row) (*SecretGenerator, error)) {
|
|
return sq.Select(
|
|
SecretGeneratorColumnAggregateID.identifier(),
|
|
SecretGeneratorColumnGeneratorType.identifier(),
|
|
SecretGeneratorColumnCreationDate.identifier(),
|
|
SecretGeneratorColumnChangeDate.identifier(),
|
|
SecretGeneratorColumnResourceOwner.identifier(),
|
|
SecretGeneratorColumnSequence.identifier(),
|
|
SecretGeneratorColumnLength.identifier(),
|
|
SecretGeneratorColumnExpiry.identifier(),
|
|
SecretGeneratorColumnIncludeLowerLetters.identifier(),
|
|
SecretGeneratorColumnIncludeUpperLetters.identifier(),
|
|
SecretGeneratorColumnIncludeDigits.identifier(),
|
|
SecretGeneratorColumnIncludeSymbols.identifier()).
|
|
From(secretGeneratorsTable.identifier()).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*SecretGenerator, error) {
|
|
secretGenerator := new(SecretGenerator)
|
|
err := row.Scan(
|
|
&secretGenerator.AggregateID,
|
|
&secretGenerator.GeneratorType,
|
|
&secretGenerator.CreationDate,
|
|
&secretGenerator.ChangeDate,
|
|
&secretGenerator.ResourceOwner,
|
|
&secretGenerator.Sequence,
|
|
&secretGenerator.Length,
|
|
&secretGenerator.Expiry,
|
|
&secretGenerator.IncludeLowerLetters,
|
|
&secretGenerator.IncludeUpperLetters,
|
|
&secretGenerator.IncludeDigits,
|
|
&secretGenerator.IncludeSymbols,
|
|
)
|
|
if err != nil {
|
|
if errors.Is(err, sql.ErrNoRows) {
|
|
return nil, zerrors.ThrowNotFound(err, "QUERY-m9wff", "Errors.SecretGenerator.NotFound")
|
|
}
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-2k99d", "Errors.Internal")
|
|
}
|
|
return secretGenerator, nil
|
|
}
|
|
}
|
|
|
|
func prepareSecretGeneratorsQuery() (sq.SelectBuilder, func(*sql.Rows) (*SecretGenerators, error)) {
|
|
return sq.Select(
|
|
SecretGeneratorColumnAggregateID.identifier(),
|
|
SecretGeneratorColumnGeneratorType.identifier(),
|
|
SecretGeneratorColumnCreationDate.identifier(),
|
|
SecretGeneratorColumnChangeDate.identifier(),
|
|
SecretGeneratorColumnResourceOwner.identifier(),
|
|
SecretGeneratorColumnSequence.identifier(),
|
|
SecretGeneratorColumnLength.identifier(),
|
|
SecretGeneratorColumnExpiry.identifier(),
|
|
SecretGeneratorColumnIncludeLowerLetters.identifier(),
|
|
SecretGeneratorColumnIncludeUpperLetters.identifier(),
|
|
SecretGeneratorColumnIncludeDigits.identifier(),
|
|
SecretGeneratorColumnIncludeSymbols.identifier(),
|
|
countColumn.identifier()).
|
|
From(secretGeneratorsTable.identifier()).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*SecretGenerators, error) {
|
|
secretGenerators := make([]*SecretGenerator, 0)
|
|
var count uint64
|
|
for rows.Next() {
|
|
secretGenerator := new(SecretGenerator)
|
|
err := rows.Scan(
|
|
&secretGenerator.AggregateID,
|
|
&secretGenerator.GeneratorType,
|
|
&secretGenerator.CreationDate,
|
|
&secretGenerator.ChangeDate,
|
|
&secretGenerator.ResourceOwner,
|
|
&secretGenerator.Sequence,
|
|
&secretGenerator.Length,
|
|
&secretGenerator.Expiry,
|
|
&secretGenerator.IncludeLowerLetters,
|
|
&secretGenerator.IncludeUpperLetters,
|
|
&secretGenerator.IncludeDigits,
|
|
&secretGenerator.IncludeSymbols,
|
|
&count,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
secretGenerators = append(secretGenerators, secretGenerator)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-em9fs", "Errors.Query.CloseRows")
|
|
}
|
|
|
|
return &SecretGenerators{
|
|
SecretGenerators: secretGenerators,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|