diff options
author | David Baker <dbkr@matrix.org> | 2014-11-20 18:25:31 +0000 |
---|---|---|
committer | David Baker <dbkr@matrix.org> | 2014-11-20 18:25:31 +0000 |
commit | 58f82e2e5484e9a83d0c184747442ac887e3b5d7 (patch) | |
tree | fb93f00e8ba6334d2a524d530e0bbf581fd76d25 /synapse/handlers/login.py | |
parent | Merge branch 'develop' into pushers (diff) | |
parent | Fix pep8 and pyflakes warnings (diff) | |
download | synapse-58f82e2e5484e9a83d0c184747442ac887e3b5d7.tar.xz |
Merge branch 'develop' into pushers
Diffstat (limited to '')
-rw-r--r-- | synapse/handlers/login.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/synapse/handlers/login.py b/synapse/handlers/login.py index 1204dc3b8f..c98ae2cfb5 100644 --- a/synapse/handlers/login.py +++ b/synapse/handlers/login.py @@ -23,7 +23,6 @@ import synapse.util.emailutils as emailutils import bcrypt import logging -import urllib logger = logging.getLogger(__name__) @@ -99,8 +98,14 @@ class LoginHandler(BaseHandler): def _query_email(self, email): httpCli = SimpleHttpClient(self.hs) data = yield httpCli.get_json( - 'matrix.org:8090', # TODO FIXME This should be configurable. - "/_matrix/identity/api/v1/lookup?medium=email&address=" + - "%s" % urllib.quote(email) + # TODO FIXME This should be configurable. + # XXX: ID servers need to use HTTPS + "http://%s%s" % ( + "matrix.org:8090", "/_matrix/identity/api/v1/lookup" + ), + { + 'medium': 'email', + 'address': email + } ) defer.returnValue(data) |