TrueCloudLab/distribution
13
0
Fork 3
Code Issues 3 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #7609 from ewindisch/max_imgname

Browse source 
Restrict length of repository names
This commit is contained in:
Michael Crosby 2014-09-08 11:06:54 -07:00
commit 5e47333091
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/registry.go
View file

@ -23,6 +23,7 @@ var (
ErrAlreadyExists = errors.New("Image already exists") ErrAlreadyExists = errors.New("Image already exists")
ErrInvalidRepositoryName = errors.New("Invalid repository name (ex: \"registry.domain.tld/myrepos\")") ErrInvalidRepositoryName = errors.New("Invalid repository name (ex: \"registry.domain.tld/myrepos\")")
errLoginRequired = errors.New("Authentication is required.") errLoginRequired = errors.New("Authentication is required.")
validHex = regexp.MustCompile(`^([a-f0-9]{64})$`)
) )
type TimeoutType uint32 type TimeoutType uint32
@ -207,6 +208,10 @@ func validateRepositoryName(repositoryName string) error {
if len(nameParts) < 2 { if len(nameParts) < 2 {
namespace = "library" namespace = "library"
name = nameParts[0] name = nameParts[0]
if validHex.MatchString(name) {
return fmt.Errorf("Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", name)
}
} else { } else {
namespace = nameParts[0] namespace = nameParts[0]
name = nameParts[1] name = nameParts[1]

8
docs/registry_test.go
View file

@ -224,6 +224,10 @@ func TestValidRepositoryName(t *testing.T) {
if err := validateRepositoryName("docker/docker"); err != nil { if err := validateRepositoryName("docker/docker"); err != nil {
t.Fatal(err) t.Fatal(err)
} }
// Support 64-byte non-hexadecimal names (hexadecimal names are forbidden)
if err := validateRepositoryName("thisisthesongthatneverendsitgoesonandonandonthisisthesongthatnev"); err != nil {
t.Fatal(err)
}
if err := validateRepositoryName("docker/Docker"); err == nil { if err := validateRepositoryName("docker/Docker"); err == nil {
t.Log("Repository name should be invalid") t.Log("Repository name should be invalid")
t.Fail() t.Fail()
@ -232,6 +236,10 @@ func TestValidRepositoryName(t *testing.T) {
t.Log("Repository name should be invalid") t.Log("Repository name should be invalid")
t.Fail() t.Fail()
} }
if err := validateRepositoryName("1a3f5e7d9c1b3a5f7e9d1c3b5a7f9e1d3c5b7a9f1e3d5d7c9b1a3f5e7d9c1b3a"); err == nil {
t.Log("Repository name should be invalid, 64-byte hexadecimal names forbidden")
t.Fail()
}
} }
func TestTrustedLocation(t *testing.T) { func TestTrustedLocation(t *testing.T) {