feat: enhance URL scheme functions to replace existing schemes with HTTP/HTTPS

Author: root4loot

urlutil/urlutil.go

@@ -98,20 +98,34 @@ func HasScheme(rawURL string) bool {
 	return re.MatchString(rawURL)
 }
 
-// EnsureHTTP ensures a URL has an HTTP scheme
+// EnsureHTTP ensures that the URL has an HTTP scheme, replacing any existing scheme.
 func EnsureHTTP(rawURL string) string {
 	if !HasScheme(rawURL) {
-		rawURL = "http://" + rawURL
+		return "http://" + rawURL
 	}
-	return rawURL
+
+	u, err := url.Parse(rawURL)
+	if err != nil {
+		return "http://" + rawURL
+	}
+
+	u.Scheme = "http"
+	return u.String()
 }
 
-// EnsureHTTPS ensures a URL has an HTTPS scheme
+// EnsureHTTPS ensures that the URL has an HTTPS scheme, replacing any existing scheme.
 func EnsureHTTPS(rawURL string) string {
 	if !HasScheme(rawURL) {
-		rawURL = "https://" + rawURL
+		return "https://" + rawURL
 	}
-	return rawURL
+
+	u, err := url.Parse(rawURL)
+	if err != nil {
+		return "https://" + rawURL
+	}
+
+	u.Scheme = "https"
+	return u.String()
 }
 
 // HasFileExtension checks if the given rawURL string has a file extension in its path

urlutil/urlutil_test.go

@@ -250,13 +250,14 @@ func TestEnsureHTTP(t *testing.T) {
 	}{
 		{"example.com", "http://example.com"},
 		{"http://example.com", "http://example.com"},
-		{"https://example.com", "https://example.com"},
+		{"https://example.com", "http://example.com"},
 		{"example.com/path", "http://example.com/path"},
 		{"localhost", "http://localhost"},
 		{"http://localhost", "http://localhost"},
-		{"https://localhost", "https://localhost"},
+		{"https://localhost", "http://localhost"},
 		{"192.168.0.1", "http://192.168.0.1"},
-		{"http://192.168.0.1", "http://192.168.0.1"},
+		{"https://192.168.0.1", "http://192.168.0.1"},
+		{"ftp://example.com", "http://example.com"},
 	}
 
 	for _, tt := range tests {
@@ -275,13 +276,14 @@ func TestEnsureHTTPS(t *testing.T) {
 		expected string
 	}{
 		{"example.com", "https://example.com"},
-		{"http://example.com", "http://example.com"},
+		{"http://example.com", "https://example.com"},
 		{"https://example.com", "https://example.com"},
 		{"example.com/path", "https://example.com/path"},
 		{"localhost", "https://localhost"},
-		{"https://localhost", "https://localhost"},
+		{"http://localhost", "https://localhost"},
 		{"192.168.0.1", "https://192.168.0.1"},
-		{"https://192.168.0.1", "https://192.168.0.1"},
+		{"http://192.168.0.1", "https://192.168.0.1"},
+		{"ftp://example.com", "https://example.com"},
 	}
 
 	for _, tt := range tests {