Open
Conversation
12 tasks
There was a problem hiding this comment.
Pull request overview
Refactors the Docker registry handler’s OIDC credential storage to use the shared oidc.OIDCRegistry type (introduced in #78) instead of a per-handler map+mutex, as part of the phased migration to prevent OIDC credential collisions (#87).
Changes:
- Replace
oidcCredentials map + RWMutexwithoidcRegistry *oidc.OIDCRegistryinDockerRegistryHandler. - Register OIDC credentials via
oidcRegistry.Register(...)during handler construction. - Authenticate requests via
oidcRegistry.TryAuth(...)instead ofTryAuthOIDCRequestWithPrefix(...).
kbukum1
force-pushed
the
kamil/oidc-migrate-docker
branch
from
72928b2 to
9b6cfa7
Compare
kbukum1
force-pushed
the
kamil/oidc-migrate-docker
branch
2 times, most recently
from
e19c62a to
5135566
Compare
kbukum1
force-pushed
the
kamil/oidc-migrate-docker
branch
from
5135566 to
10c5fd3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Migrate the Docker registry handler from manual OIDC credential map + mutex to the shared
OIDCRegistrytype introduced in #78.Why
Part of the phased migration to fix OIDC credential collisions when multiple registries share a host (#87).
Docker already stored the raw
registryvalue as the OIDC key, so this is a pure structural refactor with no behavior change. Single-file diff, no test changes.Behavior changes
Credential selection is now deterministic. The old code iterated over a Go map (
map[string]*OIDCCredential), so with multiple OIDC credentials on the same host, which one matched was nondeterministic.OIDCRegistry.TryAuthuses longest path-prefix matching, ensuring the most specific credential always wins. This is the core fix for OIDC credential collision when multiple registries share a host #87.Host matching uses
strings.ToLowerinstead of IDNA normalization. The oldTryAuthOIDCRequestWithPrefixusedhelpers.AreHostnamesEqual(IDNAToASCII), whileOIDCRegistry.TryAuthuses lowercase comparison. This is acceptable because all real OIDC registries (Azure DevOps, JFrog, AWS CodeArtifact, Cloudsmith) use ASCII hostnames — no package registry uses internationalized domain names.