Merge pull request #337 from gosuda/fix/loopback-http-portal-url

fix(utils): accept loopback http relay URLs

Author: gosunuts

utils/relayurl_test.go

@@ -0,0 +1,24 @@
+package utils
+
+import "testing"
+
+func TestNormalizeRelayURLRewritesLoopbackHTTP(t *testing.T) {
+	t.Parallel()
+
+	got, err := NormalizeRelayURL("http://127.0.0.1:14017")
+	if err != nil {
+		t.Fatalf("NormalizeRelayURL(loopback http) error = %v", err)
+	}
+	if got != "https://127.0.0.1:14017" {
+		t.Fatalf("NormalizeRelayURL(loopback http) = %q, want https://127.0.0.1:14017", got)
+	}
+}
+
+func TestNormalizeRelayURLRejectsNonLoopbackHTTP(t *testing.T) {
+	t.Parallel()
+
+	_, err := NormalizeRelayURL("http://relay.example")
+	if err == nil {
+		t.Fatal("NormalizeRelayURL(non-loopback http) error = nil, want https required")
+	}
+}

utils/utils.go

@@ -158,6 +158,9 @@ func NormalizeRelayURL(raw string) (string, error) {
 	if parsed.Host == "" {
 		return "", fmt.Errorf("relay url host is empty: %q", raw)
 	}
+	if strings.EqualFold(parsed.Scheme, "http") && IsLocalRelayHost(parsed.Hostname()) {
+		parsed.Scheme = "https"
+	}
 	if !strings.EqualFold(parsed.Scheme, "https") {
 		return "", fmt.Errorf("relay url must use https: %q", raw)
 	}