github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 14:12:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Show the SMTP authentication error for group UI (#27914)

Browse Source 
Originally in 964da218173db007fefe6357e96292f5545c513e
we hid the SMTPAuthenticationError message except in
very specific cases. However this message often contains
helpful information from the mail provider, for example
here is a response from Office365:

> 535 5.7.139 Authentication unsuccessful, user is locked by your
organization's security defaults policy. Contact your administrator.

So, we will show the error message in the modal UI instead
of supressing it with a generic message to be more helpful.
This commit is contained in:
Martin Brennan
2024-07-16 09:14:17 +10:00
committed by GitHub
parent 576f880190
commit 00608a19c6
5 changed files with 32 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/services/email_settings_exception_handler.rb
View File

@ -75,7 +75,18 @@ class EmailSettingsExceptionHandler
end
def net_smtp_authentication_error
I18n.t("email_settings.smtp_authentication_error")
# Generally SMTP authentication errors are due to invalid credentials,
# and most common mail servers provide more detailed error messages,
# so it should be safe to return the error message as is.
#
# Example: Office 365 returns:
#
# 535 5.7.139 Authentication unsuccessful, user is locked by your organization's security defaults policy. Contact your administrator.
#
# Example: Gmail returns:
#
# Application-specific password required. Learn more at https://support.google.com/accounts/answer/185833
I18n.t("email_settings.smtp_authentication_error", message: @exception.message)
end
def net_smtp_server_busy
@ -99,33 +110,7 @@ class EmailSettingsExceptionHandler
end
end
class GmailProvider < GenericProvider
def net_smtp_authentication_error
# Gmail requires use of application-specific passwords when 2FA is enabled and return
# a special error message calling this out.
if @exception.message.match(/Application-specific password required/)
I18n.t("email_settings.authentication_error_gmail_app_password")
else
super
end
end
def net_imap_no_response_error
# Gmail requires use of application-specific passwords when 2FA is enabled and return
# a special error message calling this out.
if @exception.message.match(/Application-specific password required/)
I18n.t("email_settings.authentication_error_gmail_app_password")
else
super
end
end
end
def self.friendly_exception_message(exception, host)
if host.include?("gmail.com")
EmailSettingsExceptionHandler::GmailProvider.new(exception).message
else
EmailSettingsExceptionHandler::GenericProvider.new(exception).message
end
EmailSettingsExceptionHandler::GenericProvider.new(exception).message
end
end