mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-11 16:47:32 +00:00
feat: generate webkeys setup step (#10105)
# Which Problems Are Solved We are preparing to roll-out and stabilize webkeys in the next version of Zitadel. Before removing legacy signing-key code, we must ensure all existing instances have their webkeys generated. # How the Problems Are Solved Add a setup step which generate 2 webkeys for each existing instance that didn't have webkeys yet. # Additional Changes Return an error from the config type-switch, when the type is unknown. # Additional Context - Part 1/2 of https://github.com/zitadel/zitadel/issues/10029 - Should be back-ported to v3
This commit is contained in:
54
cmd/setup/59.go
Normal file
54
cmd/setup/59.go
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
package setup
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
|
"github.com/zitadel/logging"
|
||||||
|
|
||||||
|
"github.com/zitadel/zitadel/internal/api/authz"
|
||||||
|
"github.com/zitadel/zitadel/internal/command"
|
||||||
|
"github.com/zitadel/zitadel/internal/crypto"
|
||||||
|
"github.com/zitadel/zitadel/internal/eventstore"
|
||||||
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
||||||
|
)
|
||||||
|
|
||||||
|
type SetupWebkeys struct {
|
||||||
|
eventstore *eventstore.Eventstore
|
||||||
|
commands *command.Commands
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mig *SetupWebkeys) Execute(ctx context.Context, _ eventstore.Event) error {
|
||||||
|
instances, err := mig.eventstore.InstanceIDs(
|
||||||
|
ctx,
|
||||||
|
eventstore.NewSearchQueryBuilder(eventstore.ColumnsInstanceIDs).
|
||||||
|
OrderDesc().
|
||||||
|
AddQuery().
|
||||||
|
AggregateTypes(instance.AggregateType).
|
||||||
|
EventTypes(instance.InstanceAddedEventType).
|
||||||
|
Builder().ExcludeAggregateIDs().
|
||||||
|
AggregateTypes(instance.AggregateType).
|
||||||
|
EventTypes(instance.InstanceRemovedEventType).
|
||||||
|
Builder(),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("%s get instance IDs: %w", mig, err)
|
||||||
|
}
|
||||||
|
conf := &crypto.WebKeyRSAConfig{
|
||||||
|
Bits: crypto.RSABits2048,
|
||||||
|
Hasher: crypto.RSAHasherSHA256,
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, instance := range instances {
|
||||||
|
ctx := authz.WithInstanceID(ctx, instance)
|
||||||
|
logging.Info("prepare initial webkeys for instance", "instance_id", instance, "migration", mig)
|
||||||
|
if err := mig.commands.GenerateInitialWebKeys(ctx, conf); err != nil {
|
||||||
|
return fmt.Errorf("%s generate initial webkeys: %w", mig, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (mig *SetupWebkeys) String() string {
|
||||||
|
return "59_setup_webkeys"
|
||||||
|
}
|
@@ -155,6 +155,7 @@ type Steps struct {
|
|||||||
s56IDPTemplate6SAMLFederatedLogout *IDPTemplate6SAMLFederatedLogout
|
s56IDPTemplate6SAMLFederatedLogout *IDPTemplate6SAMLFederatedLogout
|
||||||
s57CreateResourceCounts *CreateResourceCounts
|
s57CreateResourceCounts *CreateResourceCounts
|
||||||
s58ReplaceLoginNames3View *ReplaceLoginNames3View
|
s58ReplaceLoginNames3View *ReplaceLoginNames3View
|
||||||
|
s59SetupWebkeys *SetupWebkeys
|
||||||
}
|
}
|
||||||
|
|
||||||
func MustNewSteps(v *viper.Viper) *Steps {
|
func MustNewSteps(v *viper.Viper) *Steps {
|
||||||
|
@@ -272,6 +272,7 @@ func Setup(ctx context.Context, config *Config, steps *Steps, masterKey string)
|
|||||||
}
|
}
|
||||||
|
|
||||||
commands, _, _, _ := startCommandsQueries(ctx, eventstoreClient, eventstoreV4, dbClient, masterKey, config)
|
commands, _, _, _ := startCommandsQueries(ctx, eventstoreClient, eventstoreV4, dbClient, masterKey, config)
|
||||||
|
steps.s59SetupWebkeys = &SetupWebkeys{eventstore: eventstoreClient, commands: commands}
|
||||||
|
|
||||||
repeatableSteps := []migration.RepeatableMigration{
|
repeatableSteps := []migration.RepeatableMigration{
|
||||||
&externalConfigChange{
|
&externalConfigChange{
|
||||||
@@ -321,6 +322,7 @@ func Setup(ctx context.Context, config *Config, steps *Steps, masterKey string)
|
|||||||
steps.s42Apps7OIDCConfigsLoginVersion,
|
steps.s42Apps7OIDCConfigsLoginVersion,
|
||||||
steps.s43CreateFieldsDomainIndex,
|
steps.s43CreateFieldsDomainIndex,
|
||||||
steps.s48Apps7SAMLConfigsLoginVersion,
|
steps.s48Apps7SAMLConfigsLoginVersion,
|
||||||
|
steps.s59SetupWebkeys, // this step needs commands.
|
||||||
} {
|
} {
|
||||||
setupErr = executeMigration(ctx, eventstoreClient, step, "migration failed")
|
setupErr = executeMigration(ctx, eventstoreClient, step, "migration failed")
|
||||||
if setupErr != nil {
|
if setupErr != nil {
|
||||||
|
@@ -7,6 +7,7 @@ import (
|
|||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
|
||||||
"github.com/go-jose/go-jose/v4"
|
"github.com/go-jose/go-jose/v4"
|
||||||
"github.com/muhlemmer/gu"
|
"github.com/muhlemmer/gu"
|
||||||
@@ -219,6 +220,8 @@ func generateWebKey(keyID string, genConfig WebKeyConfig) (private, public *jose
|
|||||||
key, err = ecdsa.GenerateKey(conf.GetCurve(), rand.Reader)
|
key, err = ecdsa.GenerateKey(conf.GetCurve(), rand.Reader)
|
||||||
case *WebKeyED25519Config:
|
case *WebKeyED25519Config:
|
||||||
_, key, err = ed25519.GenerateKey(rand.Reader)
|
_, key, err = ed25519.GenerateKey(rand.Reader)
|
||||||
|
default:
|
||||||
|
return nil, nil, fmt.Errorf("unknown webkey config type %T", genConfig)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
|
Reference in New Issue
Block a user