shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2025-01-11 05:17:55 +03:00
Code Issues Releases Wiki Activity

fixed simpleldap mfa support

Browse Source
This commit is contained in:
Adolfo Gómez García 2023-03-22 02:47:17 +01:00
parent 5c9dd741d3
commit f7886abfbc
No known key found for this signature in database
GPG Key ID: DD1ABF20724CDA23
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/uds/auths/SimpleLDAP/authenticator.py
View File

@ -328,6 +328,12 @@ class SimpleLDAPAuthenticator(auths.Authenticator):
) = vals[14:17] ) = vals[14:17]
self._verifySsl = gui.strToBool(verifySsl) self._verifySsl = gui.strToBool(verifySsl)
def mfaStorageKey(self, username: str) -> str:
return 'mfa_' + str(self.dbAuthenticator().uuid) + username
def mfaIdentifier(self, username: str) -> str:
return self.storage.getPickle(self.mfaStorageKey(username)) or ''
def __connection( def __connection(
self self
): ):
@ -371,13 +377,17 @@ class SimpleLDAPAuthenticator(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 = [i for i in self._userNameAttr.split(',') + [self._userIdAttr]]
if self._mfaAttr:
attributes = attributes + [self._mfaAttr]
return ldaputil.getFirst( return 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=[i for i in self._userNameAttr.split(',') + [self._userIdAttr]], attributes=attributes,
sizeLimit=LDAP_RESULT_LIMIT, sizeLimit=LDAP_RESULT_LIMIT,
) )
@ -473,6 +483,13 @@ class SimpleLDAPAuthenticator(auths.Authenticator):
) )
return False return False
# store the user mfa attribute if it is set
if self._mfaAttr:
self.storage.putPickle(
self.mfaStorageKey(username),
user[self._mfaAttr][0],
)
groupsManager.validate(self.__getGroups(user)) groupsManager.validate(self.__getGroups(user))
return True return True