Fix IsValidAddress() to support leading digit (#4)

lni · Dec 21, 2023 · 3aba1da · 3aba1da
1 parent 384b590
commit 3aba1da
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/stringutil/regex.go b/stringutil/regex.go
@@ -26,7 +26,7 @@ import (
 
 var (
 	// HostnameRegex is the regex for valid hostnames.
-	HostnameRegex = regexp.MustCompile(`^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$`)
+	HostnameRegex = regexp.MustCompile(`^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$`)
 	// IPV4Regex is the regex for valid IPv4 addresses.
 	IPV4Regex = regexp.MustCompile(`^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$`)
 )

diff --git a/stringutil/regex_test.go b/stringutil/regex_test.go
@@ -30,6 +30,22 @@ func TestIsValidAddressErr(t *testing.T) {
 			value:    "service_1.dc1.ru:6060",
 			positive: false,
 		},
+		{
+			value:    "123service:6060",
+			positive: true,
+		},
+		{
+			value:    "123service.dc1.ru:6060",
+			positive: true,
+		},
+		{
+			value:    "1:6060",
+			positive: true,
+		},
+		{
+			value:    "1.dc1.ru:6060",
+			positive: true,
+		},
 	} {
 		tc := tc
 		t.Run(tc.value, func(t *testing.T) {