Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 57 additions & 1 deletion lib/auth/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -799,7 +799,10 @@ func initializeAuthority(ctx context.Context, asrv *Server, caID types.CertAuthI
"key_types", []string{strings.Join(allKeyTypes[:numKeyTypes-1], ", "), allKeyTypes[numKeyTypes-1]},
)
}

ca, err = applyAuthorityConfig(ctx, asrv, ca)
if err != nil {
return nil, nil, trace.Wrap(err)
}
keysInUse := collectKeysInUse(ca.GetActiveKeys(), ca.GetAdditionalTrustedKeys())
return usableKeysResult, keysInUse, nil
}
Expand All @@ -819,6 +822,59 @@ func collectKeysInUse(cas ...types.CAKeySet) (keysInUse [][]byte) {
return keysInUse
}

// applyAuthorityConfig applies the latest keystore config to active keys updating
// the stored CA if any changes occur.
func applyAuthorityConfig(ctx context.Context, asrv *Server, ca types.CertAuthority) (types.CertAuthority, error) {
activeKeys := ca.GetActiveKeys()
var (
changed bool
err error
)

apply := func(curr []byte) ([]byte, error) {
next, err := asrv.keyStore.ApplyMultiRegionConfig(ctx, curr)
if err != nil {
return nil, trace.Wrap(err)
}
if !slices.Equal(curr, next) {
changed = true
}
return next, nil
}

for _, key := range activeKeys.SSH {
key.PrivateKey, err = apply(key.PrivateKey)
if err != nil {
return nil, trace.Wrap(err)
}
}
for _, key := range activeKeys.TLS {
key.Key, err = apply(key.Key)
if err != nil {
return nil, trace.Wrap(err)
}
}
for _, key := range activeKeys.JWT {
key.PrivateKey, err = apply(key.PrivateKey)
if err != nil {
return nil, trace.Wrap(err)
}
}
if !changed {
return ca, nil
}
if err := ca.SetActiveKeys(activeKeys); err != nil {
return nil, trace.Wrap(err)
}
// This is only executed during cluster init while holding a lock to prevent
// other auth servers from updating CAs simulaniously.
ca, err = asrv.UpdateCertAuthority(ctx, ca)
Comment thread
dboslee marked this conversation as resolved.
if err != nil {
return nil, trace.Wrap(err)
}
return ca, nil
}

// generateAuthority creates a new self-signed authority of the provided type
// and returns it to the caller. It is the responsibility of callers to persist
// the authority.
Expand Down
Loading
Loading