Merge pull request #5100 from adisky/skip-tls-localHost

estesp · web-flow · commit e47400cbd2d5 · 2021-05-12T14:56:53.000-04:00
Skip TLS verification for localhost
diff --git a/pkg/cri/server/image_pull.go b/pkg/cri/server/image_pull.go
@@ -373,6 +373,9 @@ func (c *criService) registryHosts(ctx context.Context, auth *runtime.AuthConfig
 				if err != nil {
 					return nil, errors.Wrapf(err, "get TLSConfig for registry %q", e)
 				}
+			} else if isLocalHost(host) && u.Scheme == "http" {
+				// Skipping TLS verification for localhost
+				transport.TLSClientConfig.InsecureSkipVerify = true
 			}
 
 			// Make a copy of `auth`, so that different authorizers would not reference
@@ -406,13 +409,24 @@ func (c *criService) registryHosts(ctx context.Context, auth *runtime.AuthConfig
 
 // defaultScheme returns the default scheme for a registry host.
 func defaultScheme(host string) string {
+	if isLocalHost(host) {
+		return "http"
+	}
+	return "https"
+}
+
+// isLocalHost checks if the registry host is local.
+func isLocalHost(host string) bool {
 	if h, _, err := net.SplitHostPort(host); err == nil {
 		host = h
 	}
-	if host == "localhost" || host == "127.0.0.1" || host == "::1" {
-		return "http"
+
+	if host == "localhost" {
+		return true
 	}
-	return "https"
+
+	ip := net.ParseIP(host)
+	return ip.IsLoopback()
 }
 
 // addDefaultScheme returns the endpoint with default scheme
