Loosen regexp

mtojek · mtojek · commit 361a4281fd16 · 2022-11-10T12:15:15.000+01:00
diff --git a/coderd/httpapi/name.go b/coderd/httpapi/name.go
@@ -12,7 +12,7 @@ var (
 	UsernameValidRegex = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")
 	usernameReplace    = regexp.MustCompile("[^a-zA-Z0-9-]*")
 
-	templateDisplayName = regexp.MustCompile("^[a-zA-Z0-9]+(?: [a-zA-Z0-9]+)*$")
+	templateDisplayName = regexp.MustCompile("^[a-zA-Z0-9](.*[^ ])?$")
 )
 
 // UsernameFrom returns a best-effort username from the provided string.
diff --git a/coderd/httpapi/name_test.go b/coderd/httpapi/name_test.go
@@ -69,8 +69,8 @@ func TestTemplateDisplayNameValid(t *testing.T) {
 	t.Parallel()
 	// Tests whether display names are valid.
 	testCases := []struct {
-		Username string
-		Valid    bool
+		Name  string
+		Valid bool
 	}{
 		{"", true},
 		{"1", true},
@@ -88,6 +88,10 @@ func TestTemplateDisplayNameValid(t *testing.T) {
 		{"abcdefghijklmnopqrst", true},
 		{"abcdefghijklmnopqrstu", true},
 		{"Wow Test", true},
+		{"abcdefghijklmnopqrstu-", true},
+		{"a1b2c3d4e5f6g7h8i9j0k-", true},
+		{"BANANAS_wow", true},
+		{"test--now", true},
 
 		{" ", false},
 		{" a", false},
@@ -100,23 +104,19 @@ func TestTemplateDisplayNameValid(t *testing.T) {
 		{"12 ", false},
 		{" a1", false},
 		{"a1 ", false},
-		{"-abcdefghijKLmnopqrstu", false},
-		{"abcdefghijklmnopqrstu-", false},
 		{"-123456789012345678901", false},
 		{"-a1b2c3d4e5f6g7h8i9j0k", false},
-		{"a1b2c3d4e5f6g7h8i9j0k-", false},
-		{"BANANAS_wow", false},
-		{"test--now", false},
+		{"-abcdefghijKLmnopqrstu", false},
 
 		{"123456789012345678901234567890123", false},
 		{"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", false},
 		{"123456789012345678901234567890123123456789012345678901234567890123", false},
 	}
 	for _, testCase := range testCases {
 		testCase := testCase
-		t.Run(testCase.Username, func(t *testing.T) {
+		t.Run(testCase.Name, func(t *testing.T) {
 			t.Parallel()
-			valid := httpapi.TemplateDisplayNameValid(testCase.Username)
+			valid := httpapi.TemplateDisplayNameValid(testCase.Name)
 			require.Equal(t, testCase.Valid, valid == nil)
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ var (`
`12`	`12`	`UsernameValidRegex = regexp.MustCompile("^[a-zA-Z0-9]+(?:-[a-zA-Z0-9]+)*$")`
`13`	`13`	`usernameReplace = regexp.MustCompile("[^a-zA-Z0-9-]*")`
`14`	`14`
`15`		`- templateDisplayName = regexp.MustCompile("^[a-zA-Z0-9]+(?: [a-zA-Z0-9]+)*$")`
	`15`	`+ templateDisplayName = regexp.MustCompile("^[a-zA-Z0-9](.*[^ ])?$")`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// UsernameFrom returns a best-effort username from the provided string.`