Open
Conversation
742aa47 to
d4d9d16
Compare
There was a problem hiding this comment.
Pull request overview
Migrates the Cargo registry handler’s OIDC credential storage and request authentication from a per-handler map+mutex to the shared oidc.OIDCRegistry (added in #78), to avoid credential collisions and centralize OIDC handling.
Changes:
- Replace
map[string]*oidc.OIDCCredential+sync.RWMutexwith*oidc.OIDCRegistryin the Cargo handler. - Use
oidcRegistry.Register(...)during handler construction instead of manualCreateOIDCCredential+ map insertion. - Use
oidcRegistry.TryAuth(req, ctx)during request handling instead ofTryAuthOIDCRequestWithPrefix(...).
d4d9d16 to
dfef832
Compare
This was referenced Apr 3, 2026
7c3a59f to
6da585c
Compare
Replace manual OIDC credential map and mutex with the shared OIDCRegistry type. Cargo already used full URL keys, so this is a pure structural refactor with no behavior change.
6da585c to
fb2da19
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 cargo 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). Cargo already used full URL keys, so this is a pure structural refactor with no behavior change.
What changes
oidcCredentials map[string]*oidc.OIDCCredential+sync.RWMutexwith*oidc.OIDCRegistryoidcRegistry.Register()instead of manualCreateOIDCCredential+ map insertionHandleRequestusesoidcRegistry.TryAuth()instead ofTryAuthOIDCRequestWithPrefix()if url != ""to preserve the original URL-scoped behavior and prevent host-only fallback from widening auth scopeAll existing tests pass unchanged.
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.