summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-01-28 10:09:54 +0000
committerDavid Baker <dave@matrix.org>2015-01-28 10:09:54 +0000
commite32ded7b3e290067f95497ceee0ac04842ba9cdf (patch)
treec92386f54b9d8902e22b82fc897cf6c9a57b5a4e /synapse
parentMerge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse (diff)
downloadsynapse-e32ded7b3e290067f95497ceee0ac04842ba9cdf.tar.xz
Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/register.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py
index 732652c228..66a89c10b2 100644
--- a/synapse/handlers/register.py
+++ b/synapse/handlers/register.py
@@ -163,7 +163,7 @@ class RegistrationHandler(BaseHandler):
         # each request
         httpCli = SimpleHttpClient(self.hs)
         # XXX: make this configurable!
-        trustedIdServers = ['matrix.org:8090']
+        trustedIdServers = ['matrix.org:8090', 'matrix.org']
         if not creds['idServer'] in trustedIdServers:
             logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
                         'credentials', creds['idServer'])