Refactor IsSecure change
Fix issue with restoring the tag store and setting static configuration from the daemon. i.e. the field on the TagStore struct must be made internal or the json.Unmarshal in restore will overwrite the insecure registries to be an empty struct. Signed-off-by: Michael Crosby <michael@docker.com> Conflicts: graph/pull.go graph/push.go graph/tags.go
This commit is contained in:
parent
8b1c40732a
commit
2b9798fa19
1 changed files with 19 additions and 25 deletions
|
@ -204,51 +204,45 @@ func ResolveRepositoryName(reposName string) (string, string, error) {
|
||||||
|
|
||||||
// this method expands the registry name as used in the prefix of a repo
|
// this method expands the registry name as used in the prefix of a repo
|
||||||
// to a full url. if it already is a url, there will be no change.
|
// to a full url. if it already is a url, there will be no change.
|
||||||
func ExpandAndVerifyRegistryUrl(hostname string, secure bool) (endpoint string, err error) {
|
func ExpandAndVerifyRegistryUrl(hostname string, secure bool) (string, error) {
|
||||||
if strings.HasPrefix(hostname, "http:") || strings.HasPrefix(hostname, "https:") {
|
if hostname == IndexServerAddress() {
|
||||||
// if there is no slash after https:// (8 characters) then we have no path in the url
|
|
||||||
if strings.LastIndex(hostname, "/") < 9 {
|
|
||||||
// there is no path given. Expand with default path
|
|
||||||
hostname = hostname + "/v1/"
|
|
||||||
}
|
|
||||||
if _, err := pingRegistryEndpoint(hostname); err != nil {
|
|
||||||
return "", errors.New("Invalid Registry endpoint: " + err.Error())
|
|
||||||
}
|
|
||||||
return hostname, nil
|
return hostname, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// use HTTPS if secure, otherwise use HTTP
|
endpoint := fmt.Sprintf("http://%s/v1/", hostname)
|
||||||
|
|
||||||
if secure {
|
if secure {
|
||||||
endpoint = fmt.Sprintf("https://%s/v1/", hostname)
|
endpoint = fmt.Sprintf("https://%s/v1/", hostname)
|
||||||
} else {
|
|
||||||
endpoint = fmt.Sprintf("http://%s/v1/", hostname)
|
|
||||||
}
|
}
|
||||||
_, err = pingRegistryEndpoint(endpoint)
|
|
||||||
if err != nil {
|
if _, oerr := pingRegistryEndpoint(endpoint); oerr != nil {
|
||||||
//TODO: triggering highland build can be done there without "failing"
|
//TODO: triggering highland build can be done there without "failing"
|
||||||
err = fmt.Errorf("Invalid registry endpoint '%s': %s ", endpoint, err)
|
err := fmt.Errorf("Invalid registry endpoint '%s': %s ", endpoint, oerr)
|
||||||
|
|
||||||
if secure {
|
if secure {
|
||||||
err = fmt.Errorf("%s. If this private registry supports only HTTP, please add `--insecure-registry %s` to the daemon's arguments.", err, hostname)
|
err = fmt.Errorf("%s. If this private registry supports only HTTP, please add `--insecure-registry %s` to the daemon's arguments.", oerr, hostname)
|
||||||
}
|
}
|
||||||
|
|
||||||
return "", err
|
return "", err
|
||||||
}
|
}
|
||||||
|
|
||||||
return endpoint, nil
|
return endpoint, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// this method verifies if the provided hostname is part of the list of
|
// this method verifies if the provided hostname is part of the list of
|
||||||
// insecure registries and returns false if HTTP should be used
|
// insecure registries and returns false if HTTP should be used
|
||||||
func IsSecure(hostname string, insecureRegistries []string) (secure bool) {
|
func IsSecure(hostname string, insecureRegistries []string) bool {
|
||||||
secure = true
|
if hostname == IndexServerAddress() {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
for _, h := range insecureRegistries {
|
for _, h := range insecureRegistries {
|
||||||
if hostname == h {
|
if hostname == h {
|
||||||
secure = false
|
return false
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if hostname == IndexServerAddress() {
|
|
||||||
secure = true
|
return true
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func trustedLocation(req *http.Request) bool {
|
func trustedLocation(req *http.Request) bool {
|
||||||
|
|
Loading…
Reference in a new issue