Skip to content

fix(core)!: DSPX-2090 Removes unnamed key mgrs #2952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmihalcik-virtru merged 2 commits into from
Dec 18, 2025
+1 −27
Merged

fix(core)!: DSPX-2090 Removes unnamed key mgrs #2952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73ab509
chore(core): DSPX-2090 Removes unnamed key mgrs
dmihalcik-virtru Dec 9, 2025
d8f69e5
Update key_management.go
dmihalcik-virtru Dec 9, 2025
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
3 changes: 0 additions & 3 deletions service/kas/kas.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ func NewRegistration() *serviceregistry.Service[kasconnect.AccessServiceHandler]

// Configure new delegation service
p.KeyDelegator = trust.NewDelegatingKeyService(NewPlatformKeyIndexer(srp.SDK, kasURL.String(), srp.Logger), srp.Logger, cacheClient)
if len(srp.KeyManagerFactories) > 0 {
srp.Logger.Error("kas service ignores legacy KeyManagerFactories; using KeyManagerCtxFactories instead")
}
for _, manager := range srp.KeyManagerCtxFactories {
p.KeyDelegator.RegisterKeyManagerCtx(manager.Name, manager.Factory)
kmgrs = append(kmgrs, manager.Name)
Expand Down
13 changes: 0 additions & 13 deletions service/pkg/server/services.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,18 +142,6 @@ func startServices(ctx context.Context, params startServicesParams) (func(), err
cacheManager := params.cacheManager
keyManagerCtxFactories := params.keyManagerCtxFactories

// Create a copy of the key manager factories as the context version for legacy services that don't load the new version with context
var keyManagerFactories []trust.NamedKeyManagerFactory
for _, factory := range keyManagerCtxFactories {
keyManagerFactories = append(keyManagerFactories, trust.NamedKeyManagerFactory{
Name: factory.Name,
//nolint:contextcheck // This is called later, so will be in a new context
Factory: func(opts *trust.KeyManagerFactoryOptions) (trust.KeyManager, error) {
return factory.Factory(context.Background(), opts)
},
})
}

// Iterate through the registered namespaces
for _, nsInfo := range reg.GetNamespaces() {
ns := nsInfo.Name
Expand Down Expand Up @@ -229,7 +217,6 @@ func startServices(ctx context.Context, params startServicesParams) (func(), err
OTDF: otdf, // TODO: REMOVE THIS
Tracer: tracer,
NewCacheClient: createCacheClient,
KeyManagerFactories: keyManagerFactories,
KeyManagerCtxFactories: keyManagerCtxFactories,
})
if err != nil {
Expand Down
6 changes: 0 additions & 6 deletions service/pkg/serviceregistry/serviceregistry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ type RegistrationParams struct {
// NewCacheClient is a function that can be used to create a new cache instance for the service
NewCacheClient func(cache.Options) (*cache.Cache, error)

// KeyManagerFactories are the registered key manager factories that can be used to create
// key managers for the service to use.
// Prefer KeyManagerCtxFactories
// EXPERIMENTAL
KeyManagerFactories []trust.NamedKeyManagerFactory

// KeyManagerCtxFactories are the registered key manager context factories that can be used to create
// key managers for the service to use.
// EXPERIMENTAL
Expand Down
6 changes: 1 addition & 5 deletions service/policy/keymanagement/key_management.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,8 @@ func NewRegistration(ns string, dbRegister serviceregistry.DBRegister) *servicer
ksvc.config = cfg
ksvc.dbClient = policydb.NewClient(srp.DBClient, srp.Logger, int32(cfg.ListRequestLimitMax), int32(cfg.ListRequestLimitDefault))

// Register key managers in well-known configuration
ksvc.keyManagerFactories = make([]registeredManagers, 0, len(srp.KeyManagerFactories))
if len(srp.KeyManagerFactories) > 0 {
srp.Logger.Error("keymanagement: ignoring legacy KeyManagerFactories; using KeyManagerCtxFactories instead")
}
managersMap := make(map[string]any)
ksvc.keyManagerFactories = make([]registeredManagers, 0, len(srp.KeyManagerCtxFactories))
for i, factory := range srp.KeyManagerCtxFactories {
rm := registeredManagers{
Name: factory.Name,
Expand Down
Loading