mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-23 10:05:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

code style

Browse source
This commit is contained in:
Christoph Witzany 2016-04-06 17:32:06 +02:00
parent 8f0e47fae8
commit afff321e9a
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
synapse/handlers/auth.py
View file

@ -60,7 +60,7 @@ class AuthHandler(BaseHandler):
self.ldap_email_property = hs.config.ldap_email_property self.ldap_email_property = hs.config.ldap_email_property
self.ldap_full_name_property = hs.config.ldap_full_name_property self.ldap_full_name_property = hs.config.ldap_full_name_property
self.hs = hs # FIXME better possibility to access registrationHandler later? self.hs = hs # FIXME better possibility to access registrationHandler later?
@defer.inlineCallbacks @defer.inlineCallbacks
def check_auth(self, flows, clientdict, clientip): def check_auth(self, flows, clientdict, clientip):
@ -425,8 +425,12 @@ class AuthHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def _check_password(self, user_id, password): def _check_password(self, user_id, password):
defer.returnValue(not ((yield self._check_ldap_password(user_id, password)) or (yield self._check_local_password(user_id, password)))) defer.returnValue(
not (
(yield self._check_ldap_password(user_id, password))
or
(yield self._check_local_password(user_id, password))
))
@defer.inlineCallbacks @defer.inlineCallbacks
def _check_local_password(self, user_id, password): def _check_local_password(self, user_id, password):
@ -436,7 +440,6 @@ class AuthHandler(BaseHandler):
except: except:
defer.returnValue(False) defer.returnValue(False)
@defer.inlineCallbacks @defer.inlineCallbacks
def _check_ldap_password(self, user_id, password): def _check_ldap_password(self, user_id, password):
if not self.ldap_enabled: if not self.ldap_enabled:
@ -454,14 +457,18 @@ class AuthHandler(BaseHandler):
local_name = UserID.from_string(user_id).localpart local_name = UserID.from_string(user_id).localpart
dn = "%s=%s, %s" % (self.ldap_search_property, local_name, self.ldap_search_base) dn = "%s=%s, %s" % (
self.ldap_search_property,
local_name,
self.ldap_search_base)
logger.debug("DN for LDAP authentication: %s" % dn) logger.debug("DN for LDAP authentication: %s" % dn)
l.simple_bind_s(dn.encode('utf-8'), password.encode('utf-8')) l.simple_bind_s(dn.encode('utf-8'), password.encode('utf-8'))
if not (yield self.does_user_exist(user_id)): if not (yield self.does_user_exist(user_id)):
user_id, access_token = ( user_id, access_token = (
yield self.hs.get_handlers().registration_handler.register(localpart=local_name) handler = self.hs.get_handlers().registration_handler
yield handler.register(localpart=local_name)
) )
defer.returnValue(True) defer.returnValue(True)