This commit is contained in:
David Baker 2015-04-17 16:46:45 +01:00
parent f96ab9d18d
commit 4eea5cf6c2
4 changed files with 6 additions and 9 deletions

View file

@ -42,8 +42,8 @@ class IdentityHandler(BaseHandler):
# each request
http_client = SimpleHttpClient(self.hs)
# XXX: make this configurable!
trustedIdServers = ['matrix.org', 'localhost:8090']
#trustedIdServers = ['matrix.org']
# trustedIdServers = ['matrix.org', 'localhost:8090']
trustedIdServers = ['matrix.org']
if not creds['idServer'] in trustedIdServers:
logger.warn('%s is not a trusted ID server: rejecting 3pid ' +
'credentials', creds['idServer'])
@ -86,4 +86,4 @@ class IdentityHandler(BaseHandler):
logger.debug("bound threepid %r to %s", creds, mxid)
except CodeMessageException as e:
data = json.loads(e.msg)
defer.returnValue(data)
defer.returnValue(data)