Drop "@" from email sender to avoid spam filters (#29109)

Commit 360b3fd17c (Include username in email headers (#28981),
2024-02-03) adds usernames to the From field of notification emails in
the form of `Display Name (@username)`, to prevent spoofing. However,
some email filtering software flags "@" in the display name part of the
From field as potential spoofing, as you could set the display name part
to another email address than the one you are sending from (e.g.
`From: "apparent@email-address" <actual@email-address>`). To avoid
being flagged, instead send emails from `Display Name (username)`.

Closes: #29107
---------

Co-authored-by: Giteabot <teabot@gitea.io>

diff --git a/models/user/user.go b/models/user/user.go
index e5245dfbb0187519fcd324009c42ea9a500872be..536ec78a0b7e06114c56d82c9e0b61b3557e074c 100644 (file)
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -425,14 +425,14 @@ func (u *User) GetDisplayName() string {
 }
 
 // GetCompleteName returns the the full name and username in the form of
-// "Full Name (@username)" if full name is not empty, otherwise it returns
-// "@username".
+// "Full Name (username)" if full name is not empty, otherwise it returns
+// "username".
 func (u *User) GetCompleteName() string {
        trimmedFullName := strings.TrimSpace(u.FullName)
        if len(trimmedFullName) > 0 {
-               return fmt.Sprintf("%s (@%s)", trimmedFullName, u.Name)
+               return fmt.Sprintf("%s (%s)", trimmedFullName, u.Name)
        }
-       return fmt.Sprintf("@%s", u.Name)
+       return u.Name
 }
 
 func gitSafeName(name string) string {