summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-05-11 13:09:14 +0100
committerRichard van der Hoff <richard@matrix.org>2020-05-11 13:09:14 +0100
commit309e30bae3d2391d57fabfa78fdb6bdd662c3de7 (patch)
tree8fd1ba58c97d9a3a3c1867f3404ab720355f210c /synapse/rest
parentRevert emergency registration patches (diff)
parentRework UI Auth session validation for registration (#7455) (diff)
downloadsynapse-309e30bae3d2391d57fabfa78fdb6bdd662c3de7.tar.xz
Merge remote-tracking branch 'origin/release-v1.13.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/register.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py

index af08cc6cce..e77dd6bf92 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py
@@ -516,6 +516,7 @@ class RegisterRestServlet(RestServlet): body, self.hs.get_ip_from_request(request), "register a new account", + validate_clientdict=False, ) # Check that we're not trying to register a denied 3pid.