diff options
author | Jeyachandran Rathnam <jai.rathnem@gmail.com> | 2023-01-09 06:12:03 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-09 11:12:03 +0000 |
commit | 5e0888076fea8c70ab84114e1c261dd46330c1d6 (patch) | |
tree | b50c7f6885910f45d73c7bbd2e6d168ac8f8eefc /synapse | |
parent | Bump peaceiris/actions-gh-pages from 3.9.0 to 3.9.1 (#14791) (diff) | |
download | synapse-5e0888076fea8c70ab84114e1c261dd46330c1d6.tar.xz |
Disable sending confirmation email when 3pid is disabled #14682 (#14725)
* Fixes #12277 :Disable sending confirmation email when 3pid is disabled * Fix test_add_email_if_disabled test case to reflect changes to enable_3pid_changes flag * Add changelog file * Rename newsfragment. Co-authored-by: Patrick Cloke <clokep@users.noreply.github.com>
Diffstat (limited to 'synapse')
-rw-r--r-- | synapse/rest/client/account.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/rest/client/account.py b/synapse/rest/client/account.py index b4b92f0c99..4373c73662 100644 --- a/synapse/rest/client/account.py +++ b/synapse/rest/client/account.py @@ -338,6 +338,11 @@ class EmailThreepidRequestTokenRestServlet(RestServlet): ) async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]: + if not self.hs.config.registration.enable_3pid_changes: + raise SynapseError( + 400, "3PID changes are disabled on this server", Codes.FORBIDDEN + ) + if not self.config.email.can_verify_email: logger.warning( "Adding emails have been disabled due to lack of an email config" |