]> source.dussan.org Git - gitea.git/commit
Include username in email headers (#28981)
authorGwyneth Morgan <gwymor@tilde.club>
Sat, 3 Feb 2024 00:41:27 +0000 (00:41 +0000)
committerGitHub <noreply@github.com>
Sat, 3 Feb 2024 00:41:27 +0000 (00:41 +0000)
commit360b3fd17c3315ad9ad9c4e6ac02eda73f48d8ae
treeeb38aa98eb545176148f23af28169749a4617aa8
parenta6cea595146d0de42aa83c9cca929b015aae4552
Include username in email headers (#28981)

Emails from Gitea comments do not contain the username of the commenter
anywhere, only their display name, so it is not possible to verify who
made a comment from the email itself:

From: "Alice" <email@gitea>
X-Gitea-Sender: Alice
X-Gitea-Recipient: Bob
X-GitHub-Sender: Alice
X-GitHub-Recipient: Bob

This comment looks like it's from @alice.

The X-Gitea/X-GitHub headers also use display names, which is not very
reliable for filtering, and inconsistent with GitHub's behavior:

X-GitHub-Sender: lunny
X-GitHub-Recipient: gwymor

This change includes both the display name and username in the From
header, and switches the other headers from display name to username:

From: "Alice (@fakealice)" <email@gitea>
X-Gitea-Sender: fakealice
X-Gitea-Recipient: bob
X-GitHub-Sender: fakealice
X-GitHub-Recipient: bob

This comment looks like it's from @alice.
models/user/user.go
services/mailer/mail.go
services/mailer/mail_test.go