Skip to content

Migrate composer handler to OIDCRegistry #81

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

Open
kbukum1 wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −25
Open

Migrate composer handler to OIDCRegistry #81

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
a69a6c4
Migrate composer handler to OIDCRegistry
kbukum1 Apr 3, 2026
638d553
Retrigger CI
kbukum1 Apr 5, 2026
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
28 changes: 7 additions & 21 deletions internal/handlers/composer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package handlers

import (
"net/http"
"sync"

"github.com/elazarl/goproxy"

Expand All @@ -14,9 +13,8 @@ import (

// ComposerHandler handles requests to PHP registries, adding auth.
type ComposerHandler struct {
credentials []composerCredentials
oidcCredentials map[string]*oidc.OIDCCredential
mutex sync.RWMutex
credentials []composerCredentials
oidcRegistry *oidc.OIDCRegistry
}

type composerCredentials struct {
Expand All @@ -30,8 +28,8 @@ type composerCredentials struct {
// NewComposerHandler returns a new ComposerHandler.
func NewComposerHandler(creds config.Credentials) *ComposerHandler {
handler := ComposerHandler{
credentials: []composerCredentials{},
oidcCredentials: make(map[string]*oidc.OIDCCredential),
credentials: []composerCredentials{},
oidcRegistry: oidc.NewOIDCRegistry(),
}

for _, cred := range creds {
Expand All @@ -42,20 +40,8 @@ func NewComposerHandler(creds config.Credentials) *ComposerHandler {
registry := cred.GetString("registry")
url := cred.GetString("url")

oidcCredential, _ := oidc.CreateOIDCCredential(cred)
if oidcCredential != nil {
host := url
if host == "" {
host = registry
}
hostURL, err := helpers.ParseURLLax(host)
if err == nil {
host = hostURL.Hostname()
}
if host != "" {
handler.oidcCredentials[host] = oidcCredential
logging.RequestLogf(nil, "registered %s OIDC credentials for composer repository: %s", oidcCredential.Provider(), host)
}
// OIDC credentials are not used as static credentials.
if oidcCred, _, _ := handler.oidcRegistry.Register(cred, []string{"url", "registry"}, "composer repository"); oidcCred != nil {
continue
}

Expand All @@ -79,7 +65,7 @@ func (h *ComposerHandler) HandleRequest(req *http.Request, ctx *goproxy.ProxyCtx
}

// Try OIDC credentials first
if oidc.TryAuthOIDCRequestWithPrefix(&h.mutex, h.oidcCredentials, req, ctx) {
if h.oidcRegistry.TryAuth(req, ctx) {
return req, nil
}

Expand Down
8 changes: 4 additions & 4 deletions internal/handlers/oidc_handling_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func TestOIDCURLsAreAuthenticated(t *testing.T) {
},
urlMocks: []mockHttpRequest{},
expectedLogLines: []string{
"registered aws OIDC credentials for composer repository: composer.example.com",
"registered aws OIDC credentials for composer repository: https://composer.example.com",
},
urlsToAuthenticate: []string{
"https://composer.example.com/some-package",
Expand All @@ -177,7 +177,7 @@ func TestOIDCURLsAreAuthenticated(t *testing.T) {
},
urlMocks: []mockHttpRequest{},
expectedLogLines: []string{
"registered azure OIDC credentials for composer repository: composer.example.com",
"registered azure OIDC credentials for composer repository: https://composer.example.com",
},
urlsToAuthenticate: []string{
"https://composer.example.com/some-package",
Expand All @@ -199,7 +199,7 @@ func TestOIDCURLsAreAuthenticated(t *testing.T) {
},
urlMocks: []mockHttpRequest{},
expectedLogLines: []string{
"registered jfrog OIDC credentials for composer repository: jfrog.example.com",
"registered jfrog OIDC credentials for composer repository: https://jfrog.example.com",
},
urlsToAuthenticate: []string{
"https://jfrog.example.com/some-package",
Expand All @@ -222,7 +222,7 @@ func TestOIDCURLsAreAuthenticated(t *testing.T) {
},
urlMocks: []mockHttpRequest{},
expectedLogLines: []string{
"registered cloudsmith OIDC credentials for composer repository: cloudsmith.example.com",
"registered cloudsmith OIDC credentials for composer repository: https://cloudsmith.example.com",
},
urlsToAuthenticate: []string{
"https://cloudsmith.example.com/some-package",
Expand Down
Loading