Skip to content

fix(buildpack): allow port numbers in registry reference URIs #2625

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
AruneshDwivedi wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix(buildpack): allow port numbers in registry reference URIs #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d644f32
fix(buildpack): allow port numbers in registry reference URIs
AruneshDwivedi Jun 8, 2026
563089a
fix(buildpack): allow port numbers in registry reference URIs
AruneshDwivedi Jun 8, 2026
1d42f28
fix(buildpack): strip docker:// prefix before parsing Docker image re…
AruneshDwivedi Jun 8, 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
14 changes: 8 additions & 6 deletions internal/registry/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,19 @@ import (
)

var (
validCharsPattern = "[a-z0-9\\-.]+"
validCharsRegexp = regexp.MustCompile(fmt.Sprintf("^%s$", validCharsPattern))
validCharsPattern = "[a-z0-9\\-.]+"
validCharsPatternWithPort = "[a-z0-9\\-.:]+"
validCharsRegexp = regexp.MustCompile(fmt.Sprintf("^%s$", validCharsPattern))
validCharsPortRegexp = regexp.MustCompile(fmt.Sprintf("^%s$", validCharsPatternWithPort))
)

// IndexPath resolves the path for a specific namespace and name of buildpack
func IndexPath(rootDir, ns, name string) (string, error) {
if err := validateField("namespace", ns); err != nil {
if err := validateField("namespace", ns, validCharsPortRegexp); err != nil {
return "", err
}

if err := validateField("name", name); err != nil {
if err := validateField("name", name, validCharsRegexp); err != nil {
return "", err
}

Expand All @@ -40,7 +42,7 @@ func IndexPath(rootDir, ns, name string) (string, error) {
return filepath.Join(rootDir, indexDir, fmt.Sprintf("%s_%s", ns, name)), nil
}

func validateField(field, value string) error {
func validateField(field, value string, re *regexp.Regexp) error {
length := len(value)
switch {
case length == 0:
Expand All @@ -49,7 +51,7 @@ func validateField(field, value string) error {
return errors.Errorf("%s too long (max 253 chars)", style.Symbol(field))
}

if !validCharsRegexp.MatchString(value) {
if !re.MatchString(value) {
return errors.Errorf("%s contains illegal characters (must match %s)", style.Symbol(field), style.Symbol(validCharsPattern))
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/buildpack/locator_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func GetLocatorType(locator string, relativeBaseDir string, buildpacksFromBuilde

if paths.IsURI(locator) {
if HasDockerLocator(locator) {
if _, err := name.ParseReference(locator); err == nil {
if _, err := name.ParseReference(ParsePackageLocator(locator)); err == nil {
return PackageLocator, nil
}
}
Expand Down
Loading