Fix GetUsersByEmails (again)

models/user/user.go

@@ -1151,8 +1151,8 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([
 	}
 
 	for _, c := range oldCommits {
-		user, ok := emailUserMap[c.Author.Email]
-		if !ok {
+		user := emailUserMap.GetByEmail(c.Author.Email)
+		if user == nil {
 			user = &User{
 				Name:  c.Author.Name,
 				Email: c.Author.Email,
@@ -1166,7 +1166,15 @@ func ValidateCommitsWithEmails(ctx context.Context, oldCommits []*git.Commit) ([
 	return newCommits, nil
 }
 
-func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, error) {
+type EmailUserMap struct {
+	m map[string]*User
+}
+
+func (eum *EmailUserMap) GetByEmail(email string) *User {
+	return eum.m[strings.ToLower(email)]
+}
+
+func GetUsersByEmails(ctx context.Context, emails []string) (*EmailUserMap, error) {
 	if len(emails) == 0 {
 		return nil, nil
 	}
@@ -1176,7 +1184,7 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
 	for _, email := range emails {
 		if strings.HasSuffix(email, "@"+setting.Service.NoReplyAddress) {
 			username := strings.TrimSuffix(email, "@"+setting.Service.NoReplyAddress)
-			needCheckUserNames.Add(username)
+			needCheckUserNames.Add(strings.ToLower(username))
 		} else {
 			needCheckEmails.Add(strings.ToLower(email))
 		}
@@ -1203,8 +1211,7 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
 		for _, email := range emailAddresses {
 			user := users[email.UID]
 			if user != nil {
-				results[user.Email] = user
-				results[user.GetPlaceholderEmail()] = user
+				results[email.Email] = user
 			}
 		}
 	}
@@ -1214,10 +1221,9 @@ func GetUsersByEmails(ctx context.Context, emails []string) (map[string]*User, e
 		return nil, err
 	}
 	for _, user := range users {
-		results[user.Email] = user
 		results[user.GetPlaceholderEmail()] = user
 	}
-	return results, nil
+	return &EmailUserMap{results}, nil
 }
 
 // GetUserByEmail returns the user object by given e-mail if exists.

models/user/user_test.go

@@ -58,13 +58,32 @@ func TestUserEmails(t *testing.T) {
 		assert.ElementsMatch(t, []string{"[email protected]"}, user_model.GetUserEmailsByNames(db.DefaultContext, []string{"user8", "org7"}))
 	})
 	t.Run("GetUsersByEmails", func(t *testing.T) {
-		m, err := user_model.GetUsersByEmails(db.DefaultContext, []string{"[email protected]", "user2@" + setting.Service.NoReplyAddress})
-		require.NoError(t, err)
-		require.Len(t, m, 4)
-		assert.EqualValues(t, 1, m["[email protected]"].ID)
-		assert.EqualValues(t, 1, m["user1@"+setting.Service.NoReplyAddress].ID)
-		assert.EqualValues(t, 2, m["[email protected]"].ID)
-		assert.EqualValues(t, 2, m["user2@"+setting.Service.NoReplyAddress].ID)
+		defer test.MockVariableValue(&setting.Service.NoReplyAddress, "no-reply.gitea.internal")()
+		testGetUserByEmail := func(t *testing.T, email string, uid int64) {
+			m, err := user_model.GetUsersByEmails(db.DefaultContext, []string{email})
+			require.NoError(t, err)
+			u := m.GetByEmail(email)
+			if uid == 0 {
+				require.Nil(t, u)
+			} else {
+				require.NotNil(t, u)
+				assert.EqualValues(t, uid, u.ID)
+			}
+		}
+		cases := []struct {
+			Email string
+			UID   int64
+		}{
+			{"[email protected]", 1},
+			{"[email protected]", 1},
+			{"USER2@" + setting.Service.NoReplyAddress, 2},
+			{"[email protected]", 4},
+		}
+		for _, c := range cases {
+			t.Run(c.Email, func(t *testing.T) {
+				testGetUserByEmail(t, c.Email, c.UID)
+			})
+		}
 	})
 }
 

services/git/commit.go

@@ -34,17 +34,17 @@ func ParseCommitsWithSignature(ctx context.Context, repo *repo_model.Repository,
 	}
 
 	for _, c := range oldCommits {
-		committer, ok := emailUsers[c.Committer.Email]
-		if !ok && c.Committer != nil {
-			committer = &user_model.User{
+		committerUser := emailUsers.GetByEmail(c.Committer.Email)
+		if committerUser == nil {
+			committerUser = &user_model.User{
 				Name:  c.Committer.Name,
 				Email: c.Committer.Email,
 			}
 		}
 
 		signCommit := &asymkey_model.SignCommit{
 			UserCommit:   c,
-			Verification: asymkey_service.ParseCommitWithSignatureCommitter(ctx, c.Commit, committer),
+			Verification: asymkey_service.ParseCommitWithSignatureCommitter(ctx, c.Commit, committerUser),
 		}
 
 		isOwnerMemberCollaborator := func(user *user_model.User) (bool, error) {