fix(replication): Normalise CORE_URL comparison in isLocalHarbor (#873)

Signed-off-by: Prasanth Baskar <prasanth@8gears.com>
(cherry picked from commit 51dda34)
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: bupd

src/pkg/reg/adapter/harbor/base/adapter.go

@@ -17,6 +17,7 @@ package base
 import (
 	"fmt"
 	"net/http"
+	neturl "net/url"
 	"os"
 	"strconv"
 	"strings"
@@ -317,8 +318,48 @@ type Project struct {
 	RegistryID int64          `json:"registry_id"`
 }
 
+// isLocalHarbor reports whether url points at this Harbor instance. Core and
+// jobservice each read their own CORE_URL, so the two may differ by an
+// explicit default port; compare normalized URLs instead of raw strings.
 func isLocalHarbor(url string) bool {
-	return url == os.Getenv("CORE_URL")
+	coreURL := os.Getenv("CORE_URL")
+	if url == coreURL {
+		return true
+	}
+	u, err := neturl.Parse(url)
+	if err != nil || !bareURL(u) {
+		return false
+	}
+	core, err := neturl.Parse(coreURL)
+	if err != nil || !bareURL(core) {
+		return false
+	}
+	return strings.EqualFold(u.Scheme, core.Scheme) &&
+		strings.EqualFold(hostPort(u), hostPort(core)) &&
+		strings.TrimSuffix(u.Path, "/") == strings.TrimSuffix(core.Path, "/")
+}
+
+// bareURL reports whether u is a plain scheme://host[:port][/path] URL, the
+// only shape isLocalHarbor normalizes: userinfo, query, or fragment must
+// match exactly, and a schemeless string parses entirely into Path.
+func bareURL(u *neturl.URL) bool {
+	return u.Scheme != "" && u.Host != "" &&
+		u.User == nil && u.RawQuery == "" && u.Fragment == ""
+}
+
+// hostPort returns host:port with the scheme's default port made explicit,
+// the inverse of the default-port strip in v2auth's match().
+func hostPort(u *neturl.URL) string {
+	port := u.Port()
+	if port == "" {
+		switch strings.ToLower(u.Scheme) {
+		case "http":
+			port = "80"
+		case "https":
+			port = "443"
+		}
+	}
+	return u.Hostname() + ":" + port
 }
 
 // check whether the current process is running inside core

src/pkg/reg/adapter/harbor/base/adapter_test.go

@@ -315,3 +315,43 @@ func TestListProjects(t *testing.T) {
 	require.Equal(t, "p1", projects[0].Name)
 	require.Equal(t, "p2", projects[1].Name)
 }
+
+func TestIsLocalHarbor(t *testing.T) {
+	cases := []struct {
+		name    string
+		coreURL string
+		url     string
+		want    bool
+	}{
+		{"identical", "http://harbor-core", "http://harbor-core", true},
+		// The 2.15.8 field failure: an extraEnv pinned the default port on
+		// core's CORE_URL only, and private replication answered 401.
+		{"core pins the port through extraEnv, jobservice does not", "http://harbor-core", "http://harbor-core:80", true},
+		{"jobservice pins the port through extraEnv, core does not", "http://harbor-core:80", "http://harbor-core", true},
+		{"explicit https default port on the registry URL", "https://harbor-core", "https://harbor-core:443", true},
+		{"explicit https default port on CORE_URL", "https://harbor-core:443", "https://harbor-core", true},
+		{"trailing slash", "http://harbor-core", "http://harbor-core/", true},
+		{"uppercase host", "http://harbor-core", "http://HARBOR-CORE", true},
+		{"non-default port on both", "http://harbor-core:8080", "http://harbor-core:8080", true},
+		{"different host", "http://harbor-core", "http://other-harbor", false},
+		{"different non-default port", "http://harbor-core:8080", "http://harbor-core:8081", false},
+		{"http default port against non-default", "http://harbor-core", "http://harbor-core:8080", false},
+		{"different scheme", "http://harbor-core", "https://harbor-core", false},
+		{"https default port is not http default port", "https://harbor-core", "http://harbor-core:443", false},
+		{"different path", "http://harbor-core", "http://harbor-core/registry", false},
+		{"unparseable registry URL", "http://harbor-core", "http://[::1", false},
+		{"schemeless registry URL", "http://harbor-core", "harbor-core", false},
+		{"empty CORE_URL against schemeless URL", "", "harbor-core", false},
+		{"empty CORE_URL against absolute URL", "", "http://harbor-core", false},
+		{"userinfo only matches exactly", "http://harbor-core", "http://user:pw@harbor-core", false},
+		{"query only matches exactly", "http://harbor-core", "http://harbor-core?x=1", false},
+		{"identical userinfo matches through the exact compare", "http://user:pw@harbor-core", "http://user:pw@harbor-core", true},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Setenv("CORE_URL", tc.coreURL)
+			assert.Equal(t, tc.want, isLocalHarbor(tc.url))
+		})
+	}
+}