From a07f37e0939a3b1971667554b5ae3b72c74e6fe3 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 22 Jan 2019 21:28:56 -0500 Subject: [PATCH] ssl override, deprecate defaultCreds and authType --- src/Core/GlobalSettings.cs | 3 +++ .../Implementations/MailKitSmtpMailDeliveryService.cs | 6 ++++-- util/Setup/EnvironmentFileBuilder.cs | 5 ++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Core/GlobalSettings.cs b/src/Core/GlobalSettings.cs index 879ec28038..95e324b21c 100644 --- a/src/Core/GlobalSettings.cs +++ b/src/Core/GlobalSettings.cs @@ -113,9 +113,12 @@ namespace Bit.Core public string Host { get; set; } public int Port { get; set; } = 25; public bool Ssl { get; set; } = false; + public bool SslOverride { get; set; } = false; public string Username { get; set; } public string Password { get; set; } + [Obsolete] public bool UseDefaultCredentials { get; set; } = false; + [Obsolete] public string AuthType { get; set; } public bool TrustServer { get; set; } = false; } diff --git a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs index e7b410f52a..6cb3d54a26 100644 --- a/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs +++ b/src/Core/Services/Implementations/MailKitSmtpMailDeliveryService.cs @@ -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); diff --git a/util/Setup/EnvironmentFileBuilder.cs b/util/Setup/EnvironmentFileBuilder.cs index e9d8127ee3..370faf734d 100644 --- a/util/Setup/EnvironmentFileBuilder.cs +++ b/util/Setup/EnvironmentFileBuilder.cs @@ -104,11 +104,10 @@ namespace Bit.Setup ["globalSettings__yubico__key"] = "REPLACE", ["globalSettings__mail__replyToEmail"] = $"no-reply@{_context.Config.Domain}", ["globalSettings__mail__smtp__host"] = "REPLACE", + ["globalSettings__mail__smtp__port"] = "587", + ["globalSettings__mail__smtp__ssl"] = "false", ["globalSettings__mail__smtp__username"] = "REPLACE", ["globalSettings__mail__smtp__password"] = "REPLACE", - ["globalSettings__mail__smtp__ssl"] = "true", - ["globalSettings__mail__smtp__port"] = "587", - ["globalSettings__mail__smtp__useDefaultCredentials"] = "false", ["globalSettings__disableUserRegistration"] = "false", ["adminSettings__admins"] = string.Empty, };