nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 21:48:12 -05:00
Code

add message id header to smtp mail

Browse Source
This commit is contained in:
Kyle Spearrin 2018-09-10 08:45:57 -04:00
parent fb45f75bc8
commit 0fda72c6b0
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Services/Implementations/SmtpMailDeliveryService.cs
View File

@ -11,6 +11,7 @@ namespace Bit.Core.Services
{ {
private readonly GlobalSettings _globalSettings; private readonly GlobalSettings _globalSettings;
private readonly ILogger<SmtpMailDeliveryService> _logger; private readonly ILogger<SmtpMailDeliveryService> _logger;
private readonly string _replyDomain;
public SmtpMailDeliveryService( public SmtpMailDeliveryService(
GlobalSettings globalSettings, GlobalSettings globalSettings,
@ -20,6 +21,10 @@ namespace Bit.Core.Services
{ {
throw new ArgumentNullException(nameof(globalSettings.Mail.Smtp.Host)); throw new ArgumentNullException(nameof(globalSettings.Mail.Smtp.Host));
} }
if(globalSettings.Mail?.ReplyToEmail?.Contains("@") ?? false)
{
_replyDomain = globalSettings.Mail.ReplyToEmail.Split('@')[1];
}
_globalSettings = globalSettings; _globalSettings = globalSettings;
_logger = logger; _logger = logger;
@ -57,6 +62,10 @@ namespace Bit.Core.Services
smtpMessage.SubjectEncoding = Encoding.UTF8; smtpMessage.SubjectEncoding = Encoding.UTF8;
smtpMessage.BodyEncoding = Encoding.UTF8; smtpMessage.BodyEncoding = Encoding.UTF8;
smtpMessage.BodyTransferEncoding = System.Net.Mime.TransferEncoding.QuotedPrintable; smtpMessage.BodyTransferEncoding = System.Net.Mime.TransferEncoding.QuotedPrintable;
if(!string.IsNullOrWhiteSpace(_replyDomain))
{
smtpMessage.Headers.Add("Message-ID", $"<{Guid.NewGuid()}@{_replyDomain}>");
}
foreach(var address in message.ToEmails) foreach(var address in message.ToEmails)
{ {
smtpMessage.To.Add(new MailAddress(address)); smtpMessage.To.Add(new MailAddress(address));