Fix the pattern to match v2 catalog URI

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
This commit is contained in:
Daniel Jiang 2020-12-03 12:53:04 +08:00
parent ddb29f2243
commit 73c3f7c7ea
2 changed files with 24 additions and 1 deletions

View File

@ -27,7 +27,7 @@ var (
// V2BlobUploadURLRe is the regular expression for matching the request to v2 handler to upload a blob, the upload uuid currently is not put into a group
V2BlobUploadURLRe = regexp.MustCompile(fmt.Sprintf(`^/v2/(?P<%s>%s)/blobs/uploads[/a-zA-Z0-9\-_\.=]*$`, RepositorySubexp, reference.NameRegexp.String()))
// V2CatalogURLRe is the regular expression for mathing the request to v2 handler to list catalog
V2CatalogURLRe = regexp.MustCompile(`^/v2/_catalog$`)
V2CatalogURLRe = regexp.MustCompile(`^/v2/_catalog/?$`)
)
// MatchManifestURLPattern checks whether the provided path matches the manifest URL pattern,

View File

@ -66,3 +66,26 @@ func TestMatchBlobUploadURLPattern(t *testing.T) {
assert.True(t, ok)
assert.Equal(t, "library/hello-world", repository)
}
func TestMatchCatalogURLPattern(t *testing.T) {
cases := []struct {
url string
match bool
}{
{
url: "/v2/_catalog",
match: true,
},
{
url: "/v2/_catalog/",
match: true,
},
{
url: "/v2/_catalog/xxx",
match: false,
},
}
for _, c := range cases {
assert.Equal(t, c.match, len(V2CatalogURLRe.FindStringSubmatch(c.url)) == 1)
}
}