diff --git a/server/src/uds/auths/RegexLdap/Authenticator.py b/server/src/uds/auths/RegexLdap/Authenticator.py index a19a3de2..b5e5d185 100644 --- a/server/src/uds/auths/RegexLdap/Authenticator.py +++ b/server/src/uds/auths/RegexLdap/Authenticator.py @@ -43,7 +43,7 @@ import ldap import re import logging -__updated__ = '2018-02-01' +__updated__ = '2018-09-04' logger = logging.getLogger(__name__) @@ -348,7 +348,7 @@ class RegexLdap(auths.Authenticator): for r in ldaputil.getAsDict( con=self.__connection(), 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 sizeLimit=LDAP_RESULT_LIMIT ): diff --git a/server/src/uds/core/util/ldaputil.py b/server/src/uds/core/util/ldaputil.py index cb77ecd1..e8990f0b 100644 --- a/server/src/uds/core/util/ldaputil.py +++ b/server/src/uds/core/util/ldaputil.py @@ -98,7 +98,7 @@ def connection(username, password, host, port=-1, ssl=False, timeout=3, debug=Fa logger.exception('Exception connection:') raise LDAPError('{}'.format(e)) - logger.debug('Conneciton was success') + logger.debug('Connection was successful') return l diff --git a/server/src/uds/templatetags/uds.py b/server/src/uds/templatetags/uds.py index f9c9c0cc..deb43fcd 100644 --- a/server/src/uds/templatetags/uds.py +++ b/server/src/uds/templatetags/uds.py @@ -110,6 +110,7 @@ def udsJs(context): 'customAuth': reverse('uds.web.views.customAuth', kwargs={'idAuth': ''}), 'services': reverse('modern.services'), 'enabler': reverse('ClientAccessEnabler', kwargs={ 'idService': 'param1', 'idTransport': 'param2' }), + 'galeryImage': reverse('galleryImage', kwargs={ 'idImage': 'param1' }), } }