From 005f9f737849b9eceb31d68fb6db88236033feb8 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Fri, 9 Aug 2019 18:22:08 -0700
Subject: [PATCH] Consider endpoint path when checking default host.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 pkg/server/image_pull.go      | 17 ++++++++++-------
 pkg/server/image_pull_test.go | 13 +++++++++++++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkg/server/image_pull.go b/pkg/server/image_pull.go
index 4e68ed111..e738b83d6 100644
--- a/pkg/server/image_pull.go
+++ b/pkg/server/image_pull.go
@@ -32,7 +32,6 @@ import (
 	containerdimages "github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/remotes/docker"
-	"github.com/containerd/cri/pkg/util"
 	distribution "github.com/docker/distribution/reference"
 	imagespec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
@@ -336,15 +335,19 @@ func (c *criService) registryHosts(auth *runtime.AuthConfig) docker.RegistryHost
 func addDefaultEndpoint(endpoints []string, host string) ([]string, error) {
 	defaultHost, err := docker.DefaultHost(host)
 	if err != nil {
-		return nil, errors.Wrapf(err, "get default host")
+		return nil, errors.Wrap(err, "get default host")
 	}
-	// If the http endpoint is configured, do not try https.
-	if !util.InStringSlice(endpoints, "http://"+defaultHost) {
-		if !util.InStringSlice(endpoints, "https://"+defaultHost) {
-			return append(endpoints, "https://"+defaultHost), nil
+	for _, e := range endpoints {
+		u, err := url.Parse(e)
+		if err != nil {
+			return nil, errors.Wrap(err, "parse endpoint url")
+		}
+		if u.Host == host {
+			// Do not add default if the endpoint already exists.
+			return endpoints, nil
 		}
 	}
-	return endpoints, nil
+	return append(endpoints, "https://"+defaultHost), nil
 }
 
 // newTransport returns a new HTTP transport used to pull image.
diff --git a/pkg/server/image_pull_test.go b/pkg/server/image_pull_test.go
index 36fba0ce4..5ad1bbf39 100644
--- a/pkg/server/image_pull_test.go
+++ b/pkg/server/image_pull_test.go
@@ -147,6 +147,19 @@ func TestAddDefaultEndpoint(t *testing.T) {
 				"https://registry-3.io",
 			},
 		},
+		"default endpoint in list with path": {
+			endpoints: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"https://registry-3.io/path",
+			},
+			host: "registry-3.io",
+			expected: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"https://registry-3.io/path",
+			},
+		},
 	} {
 		t.Logf("TestCase %q", desc)
 		got, err := addDefaultEndpoint(test.endpoints, test.host)