vbatts/registry
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #13070 from shishir-a412ed/cleanup_cmd_tag

Browse source 
Use distribution's ValidateRepositoryName for remote name validation.
This commit is contained in:
Sebastiaan van Stijn 2015-06-17 23:26:27 +02:00
commit fbec8ef772
2 changed files with 12 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
docs/config.go
View file

@ -6,9 +6,9 @@ import (
"fmt" "fmt"
"net" "net"
"net/url" "net/url"
"regexp"
"strings" "strings"
"github.com/docker/distribution/registry/api/v2"
"github.com/docker/docker/image" "github.com/docker/docker/image"
"github.com/docker/docker/opts" "github.com/docker/docker/opts"
flag "github.com/docker/docker/pkg/mflag" flag "github.com/docker/docker/pkg/mflag"
@ -32,8 +32,6 @@ const (
var ( var (
ErrInvalidRepositoryName = errors.New("Invalid repository name (ex: \"registry.domain.tld/myrepos\")") ErrInvalidRepositoryName = errors.New("Invalid repository name (ex: \"registry.domain.tld/myrepos\")")
emptyServiceConfig = NewServiceConfig(nil) emptyServiceConfig = NewServiceConfig(nil)
validNamespaceChars = regexp.MustCompile(`^([a-z0-9-_]*)$`)
validRepo = regexp.MustCompile(`^([a-z0-9-_.]+)$`)
) )
func IndexServerAddress() string { func IndexServerAddress() string {
@ -206,42 +204,16 @@ func ValidateIndexName(val string) (string, error) {
} }
func validateRemoteName(remoteName string) error { func validateRemoteName(remoteName string) error {
var (
namespace string if !strings.Contains(remoteName, "/") {
name string
)
nameParts := strings.SplitN(remoteName, "/", 2)
if len(nameParts) < 2 {
namespace = "library"
name = nameParts[0]
// the repository name must not be a valid image ID // the repository name must not be a valid image ID
if err := image.ValidateID(name); err == nil { if err := image.ValidateID(remoteName); err == nil {
return fmt.Errorf("Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", name) return fmt.Errorf("Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", remoteName)
} }
} else {
namespace = nameParts[0]
name = nameParts[1]
} }
if !validNamespaceChars.MatchString(namespace) {
return fmt.Errorf("Invalid namespace name (%s). Only [a-z0-9-_] are allowed.", namespace) return v2.ValidateRepositoryName(remoteName)
}
if len(namespace) < 2 || len(namespace) > 255 {
return fmt.Errorf("Invalid namespace name (%s). Cannot be fewer than 2 or more than 255 characters.", namespace)
}
if strings.HasPrefix(namespace, "-") || strings.HasSuffix(namespace, "-") {
return fmt.Errorf("Invalid namespace name (%s). Cannot begin or end with a hyphen.", namespace)
}
if strings.Contains(namespace, "--") {
return fmt.Errorf("Invalid namespace name (%s). Cannot contain consecutive hyphens.", namespace)
}
if !validRepo.MatchString(name) {
return fmt.Errorf("Invalid repository name (%s), only [a-z0-9-_.] are allowed", name)
}
if strings.HasPrefix(name, "-") || strings.HasSuffix(name, "-") {
return fmt.Errorf("Invalid repository name (%s). Cannot begin or end with a hyphen.", name)
}
return nil
} }
func validateNoSchema(reposName string) error { func validateNoSchema(reposName string) error {

8
docs/registry_test.go
View file

@ -757,9 +757,6 @@ func TestValidRemoteName(t *testing.T) {
// Allow embedded hyphens. // Allow embedded hyphens.
"docker-rules/docker", "docker-rules/docker",
// Allow underscores everywhere (as opposed to hyphens).
"____/____",
//Username doc and image name docker being tested. //Username doc and image name docker being tested.
"doc/docker", "doc/docker",
} }
@ -784,6 +781,11 @@ func TestValidRemoteName(t *testing.T) {
"docker-/docker", "docker-/docker",
"-docker-/docker", "-docker-/docker",
// Don't allow underscores everywhere (as opposed to hyphens).
"____/____",
"_docker/_docker",
// Disallow consecutive hyphens. // Disallow consecutive hyphens.
"dock--er/docker", "dock--er/docker",