burmatovan/openuds
1
0
Fork 0
forked from shaba/openuds
Code Issues Pull Requests Projects Releases Wiki Activity

small regex ldap fix

Browse Source
This commit is contained in:
Adolfo Gómez García 2020-08-19 15:15:25 +02:00
parent 4216d1553a
commit d46eebc581
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/uds/auths/RegexLdap/authenticator.py
View File

@ -244,7 +244,7 @@ class RegexLdap(auths.Authenticator):
return self._connection return self._connection
def __connectAs(self, username: str, password: str) -> typing.Any: def __connectAs(self, username: str, password: str) -> typing.Any:
return ldaputil.connection(username, password, self._host, ssl=self._ssl, timeout=int(self._timeout), debug=False) return ldaputil.connection(username, password, self._host, port=int(self._port), ssl=self._ssl, timeout=int(self._timeout), debug=False)
def __getUser(self, username: str) -> typing.Optional[ldaputil.LDAPResultType]: def __getUser(self, username: str) -> typing.Optional[ldaputil.LDAPResultType]:
""" """
@ -253,13 +253,14 @@ class RegexLdap(auths.Authenticator):
@return: None if username is not found, an dictionary of LDAP entry attributes if found. @return: None if username is not found, an dictionary of LDAP entry attributes if found.
@note: Active directory users contains the groups it belongs to in "memberOf" attribute @note: Active directory users contains the groups it belongs to in "memberOf" attribute
""" """
attributes = [self._userIdAttr] + self.__getAttrsFromField(self._userNameAttr) + self.__getAttrsFromField(self._groupNameAttr)
user = ldaputil.getFirst( user = ldaputil.getFirst(
con=self.__connection(), con=self.__connection(),
base=self._ldapBase, base=self._ldapBase,
objectClass=self._userClass, objectClass=self._userClass,
field=self._userIdAttr, field=self._userIdAttr,
value=username, value=username,
attributes=[self._userIdAttr] + self.__getAttrsFromField(self._userNameAttr) + self.__getAttrsFromField(self._groupNameAttr), attributes=attributes,
sizeLimit=LDAP_RESULT_LIMIT sizeLimit=LDAP_RESULT_LIMIT
) )
@ -274,11 +275,14 @@ class RegexLdap(auths.Authenticator):
objectClass=self._altClass, objectClass=self._altClass,
field=self._userIdAttr, field=self._userIdAttr,
value=username, value=username,
attributes=[self._userIdAttr] + self.__getAttrsFromField(self._userNameAttr) + self.__getAttrsFromField(self._groupNameAttr), attributes=attributes,
sizeLimit=LDAP_RESULT_LIMIT sizeLimit=LDAP_RESULT_LIMIT
) )
if altUser: if altUser:
user.update(altUser) for i in attributes:
if i in altUser:
user[i] = altUser[i]
return user return user