Skip to content

Follow the OCI Image specification for the contents of a ref-name #323

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

Closed
owtaylor wants to merge 1 commit into from
Closed

Follow the OCI Image specification for the contents of a ref-name #323

Show file tree
Hide file tree
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
15 changes: 8 additions & 7 deletions oci/layout/oci_transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,20 @@ func (t ociTransport) ParseReference(reference string) (types.ImageReference, er
return ParseReference(reference)
}

var refRegexp = regexp.MustCompile(`^([A-Za-z0-9._-]+)+$`)
// See https://github.com/opencontainers/image-spec/blob/master/annotations.md
const separator = `(?:[-._:@+]|--)`
const alphanum = `(?:[A-Za-z0-9]+)`
const component = `(?:` + alphanum + `(?:` + separator + alphanum + `)*)`

var refRegexp = regexp.MustCompile(`^` + component + `(?:/` + component + `)*$`)

// ValidatePolicyConfigurationScope checks that scope is a valid name for a signature.PolicyTransportScopes keys
// (i.e. a valid PolicyConfigurationIdentity() or PolicyConfigurationNamespaces() return value).
// It is acceptable to allow an invalid value which will never be matched, it can "only" cause user confusion.
// scope passed to this function will not be "", that value is always allowed.
func (t ociTransport) ValidatePolicyConfigurationScope(scope string) error {
var dir string
sep := strings.LastIndex(scope, ":")
sep := strings.Index(scope, ":")
if sep == -1 {
dir = scope
} else {
Expand All @@ -55,10 +60,6 @@ func (t ociTransport) ValidatePolicyConfigurationScope(scope string) error {
}
}

if strings.Contains(dir, ":") {
return errors.Errorf("Invalid OCI reference %s: path contains a colon", scope)
}

if !strings.HasPrefix(dir, "/") {
return errors.Errorf("Invalid scope %s: must be an absolute path", scope)
}
Expand Down Expand Up @@ -91,7 +92,7 @@ type ociReference struct {
// ParseReference converts a string, which should not start with the ImageTransport.Name prefix, into an OCI ImageReference.
func ParseReference(reference string) (types.ImageReference, error) {
var dir, tag string
sep := strings.LastIndex(reference, ":")
sep := strings.Index(reference, ":")
if sep == -1 {
dir = reference
tag = "latest"
Expand Down
13 changes: 7 additions & 6 deletions oci/layout/oci_transport_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ func TestTransportValidatePolicyConfigurationScope(t *testing.T) {
"/etc:notlatest",
"/this/does/not/exist",
"/this/does/not/exist:notlatest",
"/this/does/not/exist:a-b.c_d:e@f+g--h",
"/this/does/not/exist:ABZabz019",
"/:strangecornercase",
} {
err := Transport.ValidatePolicyConfigurationScope(scope)
Expand All @@ -38,9 +40,10 @@ func TestTransportValidatePolicyConfigurationScope(t *testing.T) {
"/has/./dot",
"/has/dot/../dot",
"/trailing/slash/",
"/etc:invalid'tag!value@",
"/path:with/colons",
"/path:with/colons/and:tag",
"/etc:invalid!character!in!tag",
"/etc:_leading_separator",
"/etc:trailing_separator_",
"/etc:double__separator",
} {
err := Transport.ValidatePolicyConfigurationScope(scope)
assert.Error(t, err, scope)
Expand All @@ -66,6 +69,7 @@ func testParseReference(t *testing.T, fn func(string) (types.ImageReference, err
} {
for _, tag := range []struct{ suffix, tag string }{
{":notlatest", "notlatest"},
{":notlatest:with:colons", "notlatest:with:colons"},
{"", "latest"},
} {
input := path + tag.suffix
Expand All @@ -78,9 +82,6 @@ func testParseReference(t *testing.T, fn func(string) (types.ImageReference, err
}
}

_, err = fn(tmpDir + "/with:multiple:colons:and:tag")
assert.Error(t, err)

_, err = fn(tmpDir + ":invalid'tag!value@")
assert.Error(t, err)
}
Expand Down