github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Handle an image ref with scheme

Browse Source 
An image ref must be a scheme-less URI. A reference with scheme (such
as `http://`) must return ErrInvalid.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
This commit is contained in:
Kazuyoshi Kato 2020-11-16 15:06:35 -08:00
parent cc3785c815
commit fd01744a0c
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reference/reference.go
View File

@ -85,6 +85,10 @@ var splitRe = regexp.MustCompile(`[:@]`)
// Parse parses the string into a structured ref. // Parse parses the string into a structured ref.
func Parse(s string) (Spec, error) { func Parse(s string) (Spec, error) {
if strings.Contains(s, "://") {
return Spec{}, ErrInvalid
}
u, err := url.Parse("dummy://" + s) u, err := url.Parse("dummy://" + s)
if err != nil { if err != nil {
return Spec{}, err return Spec{}, err

6
reference/reference_test.go
View File

@ -151,7 +151,6 @@ func TestReferenceParser(t *testing.T) {
}, },
}, },
{ {
Skip: true, // TODO(stevvooe): Implement this case.
Name: "SchemeDefined", Name: "SchemeDefined",
Input: "http://xn--7o8h.com/myimage:xn--7o8h.com@sha512:fffffff", Input: "http://xn--7o8h.com/myimage:xn--7o8h.com@sha512:fffffff",
Hostname: "xn--7o8h.com", Hostname: "xn--7o8h.com",
@ -160,11 +159,6 @@ func TestReferenceParser(t *testing.T) {
}, },
} { } {
t.Run(testcase.Name, func(t *testing.T) { t.Run(testcase.Name, func(t *testing.T) {
if testcase.Skip {
t.Skip("testcase disabled")
return
}
ref, err := Parse(testcase.Input) ref, err := Parse(testcase.Input)
if err != testcase.Err { if err != testcase.Err {
if testcase.Err != nil { if testcase.Err != nil {