Skip to content

Delegate images keychain to toolhive-core #6147

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
samuv merged 3 commits into from
Aug 7, 2026
Merged

Delegate images keychain to toolhive-core #6147

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1823e32
Delegate images keychain to toolhive-core
JAORMX Jul 30, 2026
97fb353
Merge remote-tracking branch 'origin/main' into chore/images-keychain…
amirejaz Aug 7, 2026
ffa93a2
Merge branch 'main' into chore/images-keychain-core
amirejaz Aug 7, 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
69 changes: 5 additions & 64 deletions pkg/container/images/keychain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,73 +4,14 @@
package images

import (
"os"
"strings"

"github.com/google/go-containerregistry/pkg/authn"
)

// envKeychain implements a keychain that reads credentials from environment variables
type envKeychain struct{}

// Resolve implements the authn.Keychain interface
func (*envKeychain) Resolve(target authn.Resource) (authn.Authenticator, error) {
registry := target.RegistryStr()

// Try registry-specific environment variables first
// Format: REGISTRY_<NORMALIZED_REGISTRY_NAME>_USERNAME/PASSWORD, i.e., REGISTRY_DOCKER_IO_USERNAME
normalizedRegistry := strings.ToUpper(strings.ReplaceAll(registry, ".", "_"))
normalizedRegistry = strings.ReplaceAll(normalizedRegistry, "-", "_")

username := os.Getenv("REGISTRY_" + normalizedRegistry + "_USERNAME")
password := os.Getenv("REGISTRY_" + normalizedRegistry + "_PASSWORD")

// If registry-specific vars not found, try generic one REGISTRY_USERNAME/PASSWORD
if username == "" || password == "" {
username = os.Getenv("REGISTRY_USERNAME")
password = os.Getenv("REGISTRY_PASSWORD")
}

if username != "" && password != "" {
return &authn.Basic{
Username: username,
Password: password,
}, nil
}

return authn.Anonymous, nil
}

// compositeKeychain combines multiple keychains and tries them in order
type compositeKeychain struct {
keychains []authn.Keychain
}

// Resolve implements the authn.Keychain interface
func (c *compositeKeychain) Resolve(target authn.Resource) (authn.Authenticator, error) {
for _, keychain := range c.keychains {
auth, err := keychain.Resolve(target)
if err != nil {
continue
}

// Check if we got actual credentials (not anonymous)
if auth != authn.Anonymous {
return auth, nil
}
}

// If no keychain provided credentials, return anonymous
return authn.Anonymous, nil
}
coreimages "github.com/stacklok/toolhive-core/container/images"
)

// NewCompositeKeychain creates a keychain that tries environment variables first,
// then falls back to the default keychain
// then falls back to the default keychain.
// Deprecated: use github.com/stacklok/toolhive-core/container/images.NewCompositeKeychain.
func NewCompositeKeychain() authn.Keychain {
return &compositeKeychain{
keychains: []authn.Keychain{
&envKeychain{}, // Try environment variables first
authn.DefaultKeychain, // Then try default keychain (Docker config, etc.)
},
}
return coreimages.NewCompositeKeychain()
}
Loading