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

Fixed LDAP regex user search

Browse Source
This commit is contained in:
Adolfo Gómez García 2018-09-04 12:45:46 +02:00
parent 58886b00fa
commit 82c362b2b6
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/uds/auths/RegexLdap/Authenticator.py
View File

@ -43,7 +43,7 @@ import ldap
import re import re
import logging import logging
__updated__ = '2018-02-01' __updated__ = '2018-09-04'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -348,7 +348,7 @@ class RegexLdap(auths.Authenticator):
for r in ldaputil.getAsDict( for r in ldaputil.getAsDict(
con=self.__connection(), con=self.__connection(),
base=self._ldapBase, base=self._ldapBase,
ldapFilter='(&(&(objectClass={})({}={}*))(objectCategory=person))'.format(self._userClass, self._userIdAttr, ldaputil.escape(pattern)), ldapFilter='(&(&(objectClass={})({}={}*)))'.format(self._userClass, self._userIdAttr, ldaputil.escape(pattern)),
attrList=None, # All attrs attrList=None, # All attrs
sizeLimit=LDAP_RESULT_LIMIT sizeLimit=LDAP_RESULT_LIMIT
): ):

2
server/src/uds/core/util/ldaputil.py
View File

@ -98,7 +98,7 @@ def connection(username, password, host, port=-1, ssl=False, timeout=3, debug=Fa
logger.exception('Exception connection:') logger.exception('Exception connection:')
raise LDAPError('{}'.format(e)) raise LDAPError('{}'.format(e))
logger.debug('Conneciton was success') logger.debug('Connection was successful')
return l return l

1
server/src/uds/templatetags/uds.py
View File

@ -110,6 +110,7 @@ def udsJs(context):
'customAuth': reverse('uds.web.views.customAuth', kwargs={'idAuth': ''}), 'customAuth': reverse('uds.web.views.customAuth', kwargs={'idAuth': ''}),
'services': reverse('modern.services'), 'services': reverse('modern.services'),
'enabler': reverse('ClientAccessEnabler', kwargs={ 'idService': 'param1', 'idTransport': 'param2' }), 'enabler': reverse('ClientAccessEnabler', kwargs={ 'idService': 'param1', 'idTransport': 'param2' }),
'galeryImage': reverse('galleryImage', kwargs={ 'idImage': 'param1' }),
} }
} }