mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-13 20:08:33 +00:00

This PR summarizes multiple changes specifically only available with ZITADEL v3: - feat: Web Keys management (https://github.com/zitadel/zitadel/pull/9526) - fix(cmd): ensure proper working of mirror (https://github.com/zitadel/zitadel/pull/9509) - feat(Authz): system user support for permission check v2 (https://github.com/zitadel/zitadel/pull/9640) - chore(license): change from Apache to AGPL (https://github.com/zitadel/zitadel/pull/9597) - feat(console): list v2 sessions (https://github.com/zitadel/zitadel/pull/9539) - fix(console): add loginV2 feature flag (https://github.com/zitadel/zitadel/pull/9682) - fix(feature flags): allow reading "own" flags (https://github.com/zitadel/zitadel/pull/9649) - feat(console): add Actions V2 UI (https://github.com/zitadel/zitadel/pull/9591) BREAKING CHANGE - feat(webkey): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9445) - chore!: remove CockroachDB Support (https://github.com/zitadel/zitadel/pull/9444) - feat(actions): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9489) --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com> Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com> Co-authored-by: Ramon <mail@conblem.me> Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Kenta Yamaguchi <56732734+KEY60228@users.noreply.github.com> Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com> Co-authored-by: Livio Spring <livio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Iraq <66622793+kkrime@users.noreply.github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Max Peintner <peintnerm@gmail.com>
191 lines
6.2 KiB
Go
191 lines
6.2 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/command/preparation"
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/webkey"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
type WebKeyDetails struct {
|
|
KeyID string
|
|
ObjectDetails *domain.ObjectDetails
|
|
}
|
|
|
|
// CreateWebKey creates one web key pair for the instance.
|
|
// If the instance does not have an active key, the new key is activated.
|
|
func (c *Commands) CreateWebKey(ctx context.Context, conf crypto.WebKeyConfig) (_ *WebKeyDetails, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
_, activeID, err := c.getAllWebKeys(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
addedCmd, aggregate, err := c.generateWebKeyCommand(ctx, authz.GetInstance(ctx).InstanceID(), conf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
commands := []eventstore.Command{addedCmd}
|
|
if activeID == "" {
|
|
commands = append(commands, webkey.NewActivatedEvent(ctx, aggregate))
|
|
}
|
|
model := NewWebKeyWriteModel(aggregate.ID, authz.GetInstance(ctx).InstanceID())
|
|
err = c.pushAppendAndReduce(ctx, model, commands...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &WebKeyDetails{
|
|
KeyID: aggregate.ID,
|
|
ObjectDetails: writeModelToObjectDetails(&model.WriteModel),
|
|
}, nil
|
|
}
|
|
|
|
// GenerateInitialWebKeys creates 2 web key pairs for the instance.
|
|
// The first key is activated for signing use.
|
|
// If the instance already has keys, this is noop.
|
|
func (c *Commands) GenerateInitialWebKeys(ctx context.Context, conf crypto.WebKeyConfig) (err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
keys, _, err := c.getAllWebKeys(ctx)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(keys) != 0 {
|
|
return nil
|
|
}
|
|
commands, err := c.generateInitialWebKeysCommands(ctx, authz.GetInstance(ctx).InstanceID(), conf)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = c.eventstore.Push(ctx, commands...)
|
|
return err
|
|
}
|
|
|
|
func (c *Commands) generateInitialWebKeysCommands(ctx context.Context, instanceID string, conf crypto.WebKeyConfig) (_ []eventstore.Command, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
commands := make([]eventstore.Command, 0, 3)
|
|
for i := 0; i < 2; i++ {
|
|
addedCmd, aggregate, err := c.generateWebKeyCommand(ctx, instanceID, conf)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
commands = append(commands, addedCmd)
|
|
if i == 0 {
|
|
commands = append(commands, webkey.NewActivatedEvent(ctx, aggregate))
|
|
}
|
|
}
|
|
return commands, nil
|
|
}
|
|
|
|
func (c *Commands) generateWebKeyCommand(ctx context.Context, instanceID string, conf crypto.WebKeyConfig) (_ eventstore.Command, _ *eventstore.Aggregate, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
keyID, err := c.idGenerator.Next()
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
encryptedPrivate, public, err := c.webKeyGenerator(keyID, c.keyAlgorithm, conf)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
aggregate := webkey.NewAggregate(keyID, instanceID)
|
|
addedCmd, err := webkey.NewAddedEvent(ctx, aggregate, encryptedPrivate, public, conf)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
return addedCmd, aggregate, nil
|
|
}
|
|
|
|
// ActivateWebKey activates the key identified by keyID.
|
|
// Any previously activated key on the current instance is deactivated.
|
|
func (c *Commands) ActivateWebKey(ctx context.Context, keyID string) (_ *domain.ObjectDetails, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
keys, activeID, err := c.getAllWebKeys(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if activeID == keyID {
|
|
return writeModelToObjectDetails(
|
|
&keys[activeID].WriteModel,
|
|
), nil
|
|
}
|
|
nextActive, ok := keys[keyID]
|
|
if !ok {
|
|
return nil, zerrors.ThrowNotFound(nil, "COMMAND-teiG3", "Errors.WebKey.NotFound")
|
|
}
|
|
|
|
commands := make([]eventstore.Command, 0, 2)
|
|
commands = append(commands, webkey.NewActivatedEvent(ctx,
|
|
webkey.AggregateFromWriteModel(ctx, &nextActive.WriteModel),
|
|
))
|
|
if activeID != "" {
|
|
commands = append(commands, webkey.NewDeactivatedEvent(ctx,
|
|
webkey.AggregateFromWriteModel(ctx, &keys[activeID].WriteModel),
|
|
))
|
|
}
|
|
err = c.pushAppendAndReduce(ctx, nextActive, commands...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return writeModelToObjectDetails(&nextActive.WriteModel), nil
|
|
}
|
|
|
|
// getAllWebKeys searches for all web keys on the instance and returns a map of key IDs.
|
|
// activeID is the id of the currently active key.
|
|
func (c *Commands) getAllWebKeys(ctx context.Context) (_ map[string]*WebKeyWriteModel, activeID string, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
models := newWebKeyWriteModels(authz.GetInstance(ctx).InstanceID())
|
|
if err = c.eventstore.FilterToQueryReducer(ctx, models); err != nil {
|
|
return nil, "", err
|
|
}
|
|
return models.keys, models.activeID, nil
|
|
}
|
|
|
|
func (c *Commands) DeleteWebKey(ctx context.Context, keyID string) (_ time.Time, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
model := NewWebKeyWriteModel(keyID, authz.GetInstance(ctx).InstanceID())
|
|
if err = c.eventstore.FilterToQueryReducer(ctx, model); err != nil {
|
|
return time.Time{}, err
|
|
}
|
|
if model.State == domain.WebKeyStateUnspecified ||
|
|
model.State == domain.WebKeyStateRemoved {
|
|
return model.WriteModel.ChangeDate, nil
|
|
}
|
|
if model.State == domain.WebKeyStateActive {
|
|
return time.Time{}, zerrors.ThrowPreconditionFailed(nil, "COMMAND-Chai1", "Errors.WebKey.ActiveDelete")
|
|
}
|
|
err = c.pushAppendAndReduce(ctx, model, webkey.NewRemovedEvent(ctx,
|
|
webkey.AggregateFromWriteModel(ctx, &model.WriteModel),
|
|
))
|
|
if err != nil {
|
|
return time.Time{}, err
|
|
}
|
|
return model.WriteModel.ChangeDate, nil
|
|
}
|
|
|
|
func (c *Commands) prepareGenerateInitialWebKeys(instanceID string, conf crypto.WebKeyConfig) preparation.Validation {
|
|
return func() (preparation.CreateCommands, error) {
|
|
return func(ctx context.Context, _ preparation.FilterToQueryReducer) ([]eventstore.Command, error) {
|
|
return c.generateInitialWebKeysCommands(ctx, instanceID, conf)
|
|
}, nil
|
|
}
|
|
}
|