nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-05 18:12:48 -05:00
Code Activity

ssl override, deprecate defaultCreds and authType

Browse Source
This commit is contained in:
Kyle Spearrin
2019-01-22 21:28:56 -05:00
parent 17cc1d6543
commit a07f37e093
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs
View File

@ -67,10 +67,12 @@ namespace Bit.Core.Services
client.ServerCertificateValidationCallback = (s, c, h, e) => true;
}
var useSsl = _globalSettings.Mail.Smtp.Port == 587 ? false : _globalSettings.Mail.Smtp.Ssl;
var useSsl = _globalSettings.Mail.Smtp.Port == 587 && !_globalSettings.Mail.Smtp.SslOverride ?
false : _globalSettings.Mail.Smtp.Ssl;
await client.ConnectAsync(_globalSettings.Mail.Smtp.Host, _globalSettings.Mail.Smtp.Port, useSsl);
if(!_globalSettings.Mail.Smtp.UseDefaultCredentials)
if(!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Username) &&
!string.IsNullOrWhiteSpace(_globalSettings.Mail.Smtp.Password))
{
await client.AuthenticateAsync(_globalSettings.Mail.Smtp.Username,
_globalSettings.Mail.Smtp.Password);