From b98e881d8440737b387debb7a8dbaf910f4d2349 Mon Sep 17 00:00:00 2001
From: Dave Page <dpage@pgadmin.org>
Date: Wed, 30 Jun 2021 10:46:32 +0100
Subject: [PATCH] Disable email deliverability check that was introduced in
 flask-security-too by default to maintain backwards compatibility.

Fixes #6550
---
 docs/en_US/release_notes_5_5.rst |  1 +
 web/config.py                    | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/docs/en_US/release_notes_5_5.rst b/docs/en_US/release_notes_5_5.rst
index 697357d60..9665d2340 100644
--- a/docs/en_US/release_notes_5_5.rst
+++ b/docs/en_US/release_notes_5_5.rst
@@ -29,5 +29,6 @@ Bug fixes
 | `Issue #6536 <https://redmine.postgresql.org/issues/6536>`_ -  Fixed directory selection issue with the folder dialog.
 | `Issue #6541 <https://redmine.postgresql.org/issues/6541>`_ -  Ensure that setting 'Open in new browser tab' should be visible, it should not be based on the value of 'ENABLE_PSQL'.
 | `Issue #6547 <https://redmine.postgresql.org/issues/6547>`_ -  Fixed copy/paste issues for PSQL tool terminal.
+| `Issue #6550 <https://redmine.postgresql.org/issues/6550>`_ -  Disable email deliverability check that was introduced in flask-security-too by default to maintain backwards compatibility.
 | `Issue #6555 <https://redmine.postgresql.org/issues/6555>`_ -  Fixed Czech translation string for 'Login' keyword.
 | `Issue #6557 <https://redmine.postgresql.org/issues/6557>`_ -  Fixed an issue where incorrect column name listed in the properties of Index.
diff --git a/web/config.py b/web/config.py
index 758af0fdf..707b8e94e 100644
--- a/web/config.py
+++ b/web/config.py
@@ -381,6 +381,15 @@ SECURITY_EMAIL_SUBJECT_PASSWORD_NOTICE = "Your %s password has been reset" \
 SECURITY_EMAIL_SUBJECT_PASSWORD_CHANGE_NOTICE = \
     "Your password for %s has been changed" % APP_NAME
 
+##########################################################################
+# Email address validation
+##########################################################################
+
+# flask-security-too will validate email addresses and check deliverability
+# by default. Disable the deliverability check by default, which was the old
+# behaviour in <= v5.3
+SECURITY_EMAIL_VALIDATOR_ARGS={"check_deliverability": False}
+
 ##########################################################################
 # Upgrade checks
 ##########################################################################
@@ -670,6 +679,7 @@ ENABLE_PSQL = False
 # In Desktop mode it is always enabled and setting is of no use.
 ##########################################################################
 ENABLE_BINARY_PATH_BROWSING = False
+
 ##########################################################################
 # Local config settings
 ##########################################################################