fix: allow ports in wildcard url configuration

Emyrk · Emyrk · commit c770ff2d688f · 2024-01-16T20:19:12.000-06:00
This just forwards the port to the ui that generates urls.
Our existing parsing + regex already supported ports for
subdomain app requests.
diff --git a/coderd/workspaceapps/appurl/appurl.go b/coderd/workspaceapps/appurl/appurl.go
@@ -140,9 +140,7 @@ func CompileHostnamePattern(pattern string) (*regexp.Regexp, error) {
 	if strings.Contains(pattern, "http:") || strings.Contains(pattern, "https:") {
 		return nil, xerrors.Errorf("hostname pattern must not contain a scheme: %q", pattern)
 	}
-	if strings.Contains(pattern, ":") {
-		return nil, xerrors.Errorf("hostname pattern must not contain a port: %q", pattern)
-	}
+
 	if strings.HasPrefix(pattern, ".") || strings.HasSuffix(pattern, ".") {
 		return nil, xerrors.Errorf("hostname pattern must not start or end with a period: %q", pattern)
 	}
@@ -155,7 +153,17 @@ func CompileHostnamePattern(pattern string) (*regexp.Regexp, error) {
 	if !strings.HasPrefix(pattern, "*") {
 		return nil, xerrors.Errorf("hostname pattern must only contain an asterisk at the beginning: %q", pattern)
 	}
-	for i, label := range strings.Split(pattern, ".") {
+
+	// If there is a hostname:port, we only care about the hostname. For hostname
+	// pattern reasons, we do not actually care what port the client is requesting.
+	// Any port provided here is used for generating urls for the ui, not for
+	// validation.
+	hostname, _, err := net.SplitHostPort(pattern)
+	if err == nil {
+		pattern = hostname
+	}
+
+	for i, label := range strings.Split(hostname, ".") {
 		if i == 0 {
 			// We have to allow the asterisk to be a valid hostname label, so
 			// we strip the asterisk (which is only on the first one).
diff --git a/coderd/workspaceapps/appurl/appurl_test.go b/coderd/workspaceapps/appurl/appurl_test.go
@@ -193,11 +193,6 @@ func TestCompileHostnamePattern(t *testing.T) {
 			pattern:       "https://*.hi.com",
 			errorContains: "must not contain a scheme",
 		},
-		{
-			name:          "Invalid_ContainsPort",
-			pattern:       "*.hi.com:8080",
-			errorContains: "must not contain a port",
-		},
 		{
 			name:          "Invalid_StartPeriod",
 			pattern:       ".hi.com",
@@ -249,6 +244,13 @@ func TestCompileHostnamePattern(t *testing.T) {
 			errorContains: "contains invalid label",
 		},
 
+		{
+			name:    "Valid_ContainsPort",
+			pattern: "*.hi.com:8080",
+			// Although a port is provided, the regex already matches any port.
+			// So it is ignored for validation purposes.
+			expectedRegex: `([^.]+)\.hi\.com`,
+		},
 		{
 			name:          "Valid_Simple",
 			pattern:       "*.hi",
