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

SMTP config allow no username/password

Browse Source
This commit is contained in:
Kyle Spearrin 2017-10-05 08:34:46 -04:00
parent 23eb24c2bc
commit ce9067a434
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/GlobalSettings.cs
View File

@ -92,6 +92,7 @@ namespace Bit.Core
public bool Ssl { get; set; } = false; public bool Ssl { get; set; } = false;
public string Username { get; set; } public string Username { get; set; }
public string Password { get; set; } public string Password { get; set; }
public bool UseDefaultCredentials { get; set; } = false;
} }
} }

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

@ -23,11 +23,16 @@ namespace Bit.Core.Services
public Task SendEmailAsync(Models.Mail.MailMessage message) public Task SendEmailAsync(Models.Mail.MailMessage message)
{ {
var client = new SmtpClient(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port); var client = new SmtpClient(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port);
client.UseDefaultCredentials = false;
client.EnableSsl = _globalSettings.Mail.Smtp.Ssl; client.EnableSsl = _globalSettings.Mail.Smtp.Ssl;
client.UseDefaultCredentials = _globalSettings.Mail.Smtp.UseDefaultCredentials;
client.DeliveryMethod = SmtpDeliveryMethod.Network; client.DeliveryMethod = SmtpDeliveryMethod.Network;
client.Credentials = new NetworkCredential(_globalSettings.Mail.Smtp.Username,
_globalSettings.Mail.Smtp.Password); if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) &&
!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password))
{
client.Credentials = new NetworkCredential(_globalSettings.Mail.Smtp.Username,
_globalSettings.Mail.Smtp.Password);
}
var smtpMessage = new MailMessage(); var smtpMessage = new MailMessage();
smtpMessage.From = new MailAddress(_globalSettings.Mail.ReplyToEmail, _globalSettings.SiteName); smtpMessage.From = new MailAddress(_globalSettings.Mail.ReplyToEmail, _globalSettings.SiteName);

4
src/Core/Utilities/ServiceCollectionExtensions.cs
View File

@ -71,9 +71,7 @@ namespace Bit.Core.Utilities
{ {
services.AddSingleton<IMailDeliveryService, SendGridMailDeliveryService>(); services.AddSingleton<IMailDeliveryService, SendGridMailDeliveryService>();
} }
else if(CoreHelpers.SettingHasValue(globalSettings.Mail?.Smtp?.Host) && else if(CoreHelpers.SettingHasValue(globalSettings.Mail?.Smtp?.Host))
CoreHelpers.SettingHasValue(globalSettings.Mail?.Smtp?.Username) &&
CoreHelpers.SettingHasValue(globalSettings.Mail?.Smtp?.Password))
{ {
services.AddSingleton<IMailDeliveryService, SmtpMailDeliveryService>(); services.AddSingleton<IMailDeliveryService, SmtpMailDeliveryService>();
} }

1
util/Setup/Program.cs
View File

@ -403,6 +403,7 @@ globalSettings__mail__smtp__username=REPLACE
globalSettings__mail__smtp__password=REPLACE globalSettings__mail__smtp__password=REPLACE
globalSettings__mail__smtp__ssl=true globalSettings__mail__smtp__ssl=true
globalSettings__mail__smtp__port=587 globalSettings__mail__smtp__port=587
globalSettings__mail__smtp__useDefaultCredentials=false
globalSettings__disableUserRegistration=false"); globalSettings__disableUserRegistration=false");
if(!_push) if(!_push)