Skip to content

Migrate pub handler to OIDCRegistry #89

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 1 commit into
base: main
Choose a base branch
from
+12 −12
Open

Migrate pub handler to OIDCRegistry #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions internal/handlers/pub_repository.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"
"github.com/sirupsen/logrus"
Expand All @@ -17,9 +16,8 @@ import (
// the v2 spec.
// https://github.com/dart-lang/pub/blob/db003f2ec3a0751337a1c8d4ff22d4863a28afe6/doc/repository-spec-v2.md
type PubRepositoryHandler struct {
credentials []pubRepositoryCredentials
oidcCredentials map[string]*oidc.OIDCCredential
mutex sync.RWMutex
credentials []pubRepositoryCredentials
oidcRegistry *oidc.OIDCRegistry
}

type pubRepositoryCredentials struct {
Expand All @@ -29,8 +27,8 @@ type pubRepositoryCredentials struct {

func NewPubRepositoryHandler(credentials config.Credentials) *PubRepositoryHandler {
handler := PubRepositoryHandler{
credentials: []pubRepositoryCredentials{},
oidcCredentials: make(map[string]*oidc.OIDCCredential),
credentials: []pubRepositoryCredentials{},
oidcRegistry: oidc.NewOIDCRegistry(),
}

for _, credential := range credentials {
Expand All @@ -40,12 +38,14 @@ func NewPubRepositoryHandler(credentials config.Credentials) *PubRepositoryHandl

url := credential.GetString("url")

oidcCredential, _ := oidc.CreateOIDCCredential(credential)
if oidcCredential != nil {
if url != "" {
handler.oidcCredentials[url] = oidcCredential
logging.RequestLogf(nil, "registered %s OIDC credentials for pub repository: %s", oidcCredential.Provider(), url)
// Pub credentials must remain URL-scoped; do not allow OIDC
// registration to fall back to host-only matching when url is empty.
// OIDC credentials are not used as static credentials.
if url != "" {
if oidcCred, _, _ := handler.oidcRegistry.Register(credential, []string{"url"}, "pub repository"); oidcCred != nil {
continue
}
} else if oidcCred, _ := oidc.CreateOIDCCredential(credential); oidcCred != nil {
continue
}

Expand All @@ -72,7 +72,7 @@ func (h *PubRepositoryHandler) HandleRequest(req *http.Request, ctx *goproxy.Pro
}

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

Expand Down
Loading