test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

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>
This commit is contained in:
Gwyneth Morgan 2024-02-10 03:40:48 +00:00 committed by GitHub
parent c1f7249056
commit 5b2fd0fc19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/user/user.go
View File

@ -425,14 +425,14 @@ func (u *User) GetDisplayName() string {
} }
// GetCompleteName returns the the full name and username in the form of // GetCompleteName returns the the full name and username in the form of
// "Full Name (@username)" if full name is not empty, otherwise it returns // "Full Name (username)" if full name is not empty, otherwise it returns
// "@username". // "username".
func (u *User) GetCompleteName() string { func (u *User) GetCompleteName() string {
trimmedFullName := strings.TrimSpace(u.FullName) trimmedFullName := strings.TrimSpace(u.FullName)
if len(trimmedFullName) > 0 { 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 { func gitSafeName(name string) string {