Skip to content

Commit 06beb6f

Browse files
fix(core): Load in-process key manager, too
- when key management is enabled and the in-process key manager has some configured keys, load it - these keys will still be accessible with the provider `opentdf.io/in-process` for the key ids present in the config file
1 parent a9e556b commit 06beb6f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

service/kas/kas.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ func NewRegistration() *serviceregistry.Service[kasconnect.AccessServiceHandler]
6161
}
6262
}
6363

64-
if kasCfg.Preview.KeyManagement {
64+
useKeyManagement := kasCfg.Preview.KeyManagement
65+
if useKeyManagement {
6566
srp.Logger.Info("preview feature: key management is enabled")
6667

6768
kasURL, err := determineKASURL(srp, kasCfg)
@@ -89,7 +90,8 @@ func NewRegistration() *serviceregistry.Service[kasconnect.AccessServiceHandler]
8990
// Explicitly set the default manager for session key generation.
9091
// This should be configurable, e.g., defaulting to BasicManager or an HSM if available.
9192
p.KeyDelegator.SetDefaultMode(security.BasicManagerName) // Example: default to BasicManager
92-
} else {
93+
}
94+
if !useKeyManagement || len(kasCfg.Keyring) > 0 || kasCfg.ECCertID != "" || kasCfg.RSACertID != "" {
9395
// Set up both the legacy CryptoProvider and the new SecurityProvider
9496
kasCfg.UpgradeMapToKeyring(srp.OTDF.CryptoProvider)
9597
p.CryptoProvider = srp.OTDF.CryptoProvider

0 commit comments

Comments
 (0)