Code review suggestions

Author: kdumontnu

models/user/user.go

@@ -516,13 +516,13 @@ func GetUserSalt() (string, error) {
 	return hex.EncodeToString(rBytes), nil
 }
 
-var normalizeRE = regexp.MustCompile(`[^\da-zA-Z-.\w]`)
+var validUsernameRE = regexp.MustCompile(`[^\w-.]`)
 
 // normalizeUserName returns a string with single-quotes removed,
 // and any other non-supported username characters replaced with
 // a `-` character
 func NormalizeUserName(s string) string {
-	return normalizeRE.ReplaceAllString(strings.ReplaceAll(s, "'", ""), "-")
+	return validUsernameRE.ReplaceAllString(strings.ReplaceAll(s, "'", ""), "-")
 }
 
 var (

models/user/user_test.go

@@ -546,19 +546,25 @@ func Test_ValidateUser(t *testing.T) {
 }
 
 func Test_NormalizeUserFromEmail(t *testing.T) {
-	testCases := [][]interface{}{
-		// input name, expected normalized name, is normalized name valid
+	testCases := []struct {
+		Input             string
+		Expected          string
+		IsNormalizedValid bool
+	}{
 		{"test", "test", true},
-		{"Sinéad.O'Connor", "Sin-ad.OConnor", true}, // We should consider allowing custom replacement characters (eg. é -> e)
+		{"Sinéad.O'Connor", "Sin-ad.OConnor", true},
+		{"Æsir", "-sir", false},
+		// \u00e9\u0065\u0301
+		{"éé", "-e-", false},
 		{"Awareness Hub", "Awareness-Hub", true},
 		{"double__underscore", "double__underscore", false}, // We should consider squashing double non-alpha characters
 		{".bad.", ".bad.", false},
+		{"new😀user", "new-user", true},
 	}
 	for _, testCase := range testCases {
-		fmt.Println(testCase...)
-		normalizedName := user_model.NormalizeUserName(testCase[0].(string))
-		assert.EqualValues(t, testCase[1].(string), normalizedName)
-		if testCase[2].(bool) {
+		normalizedName := user_model.NormalizeUserName(testCase.Input)
+		assert.EqualValues(t, testCase.Expected, normalizedName)
+		if testCase.IsNormalizedValid {
 			assert.NoError(t, user_model.IsUsableUsername(normalizedName))
 		} else {
 			assert.Error(t, user_model.IsUsableUsername(normalizedName))

routers/web/auth/auth.go

@@ -12,7 +12,6 @@ import (
 
 	"code.gitea.io/gitea/models/auth"
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/user"
 	user_model "code.gitea.io/gitea/models/user"
 	"code.gitea.io/gitea/modules/auth/password"
 	"code.gitea.io/gitea/modules/base"
@@ -374,7 +373,7 @@ func getUserName(gothUser *goth.User) string {
 	case setting.OAuth2UsernameEmail:
 		return strings.Split(gothUser.Email, "@")[0]
 	case setting.OAuth2UsernameEmailNormalized:
-		return user.NormalizeUserName(strings.Split(gothUser.Email, "@")[0])
+		return user_model.NormalizeUserName(strings.Split(gothUser.Email, "@")[0])
 	case setting.OAuth2UsernameNickname:
 		return gothUser.NickName
 	default: // OAuth2UsernameUserid