fix username sanitation #278

Author: d-rk

internal/common-operation.go

@@ -23,7 +23,7 @@ import (
 	"github.com/spf13/viper"
 )
 
-var invalidClientIDCharactersRegExp = regexp.MustCompile(`[^a-zA-Z0-9_-]`)
+var invalidClientIDCharactersRegExp = regexp.MustCompile(`[^a-zA-Z0-9-]+`)
 
 type TokenProvider struct {
 	PluginName string
@@ -374,7 +374,7 @@ func sanitizeUsername(u string) string {
 	u = s[len(s)-1]
 	// Windows account can contain spaces or other special characters not supported
 	// in client ID. Keep the bare minimum and ditch the rest.
-	return invalidClientIDCharactersRegExp.ReplaceAllString(u, "")
+	return invalidClientIDCharactersRegExp.ReplaceAllString(u, "-")
 }
 
 // setupTlsConfig takes the paths to a tls certificate, CA, and certificate key in

internal/common-operation_test.go

@@ -81,3 +81,35 @@ func TestListConfigsFromEntries(t *testing.T) {
 		})
 	}
 }
+
+func TestSanitizeUsername(t *testing.T) {
+	testCases := []struct {
+		descriptions string
+		username     string
+		want         string
+	}{
+		{
+			descriptions: "windows user with domain",
+			username:     "DOMAIN|MACHINE\\username",
+			want:         "username",
+		},
+		{
+			descriptions: "user with email",
+			username:     "[email protected]",
+			want:         "user-domain-com",
+		},
+		{
+			descriptions: "user with underscores",
+			username:     "user_with__underscores",
+			want:         "user-with-underscores",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.descriptions, func(t *testing.T) {
+			if tc.want != sanitizeUsername(tc.username) {
+				t.Fatalf("expected:\n--\n%s\n--\nactual:\n--\n%s\n--", tc.want, sanitizeUsername(tc.username))
+			}
+		})
+	}
+}