fix(proxy): don't replace -[0-9] with :[0-9] in domain name

enix · Aug 2, 2023 · a027d4d · a027d4d
1 parent 4b6aef1
commit a027d4d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/internal/proxy/server.go b/internal/proxy/server.go
@@ -276,12 +276,13 @@ func recoveryMiddleware() gin.HandlerFunc {
 }
 
 func handleOriginRegistryPort(originRegistry string) string {
-	re := regexp.MustCompile(`-([0-9]+)`)
+	re := regexp.MustCompile(`-([0-9]+)$`)
 	parts := re.FindStringSubmatch(originRegistry)
+	originRegistryBytes := []byte(originRegistry)
 
 	if len(parts) == 2 {
-		originRegistry = strings.ReplaceAll(originRegistry, parts[0], ":"+parts[1])
+		originRegistryBytes = re.ReplaceAll(originRegistryBytes, []byte(":$1"))
 	}
 
-	return originRegistry
+	return string(originRegistryBytes)
 }
diff --git a/internal/proxy/server_test.go b/internal/proxy/server_test.go
@@ -104,6 +104,17 @@ func Test_handleOriginRegistryPort(t *testing.T) {
 			originRegistry: "enix.io-5000",
 			expectedOutput: "enix.io:5000",
 		},
+		{
+			name:           "Domain name with number + port",
+			originRegistry: "regsitry-2.enix.io-5000",
+			expectedOutput: "regsitry-2.enix.io:5000",
+		},
+
+		{
+			name:           "Domain name with number + port with same value",
+			originRegistry: "regsitry-5000.enix.io-5000",
+			expectedOutput: "regsitry-5000.enix.io:5000",
+		},
 	}
 
 	g := NewWithT(t)