security-and-privacy/ldapcherry
security-and-privacy/ldapcherry
1
0
Fork 0
mirror of https://github.com/kakwa/ldapcherry synced 2025-02-16 23:53:20 +01:00
Code Releases Activity

fix recovery of groups in AD backend

Browse Source
This commit is contained in:
kakwa 2015-07-26 14:26:59 +02:00
parent 0914e141ec
commit ac0a3473f7
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ldapcherry/backend/backendAD.py
View File

@ -91,7 +91,7 @@ class Backend(ldapcherry.backend.backendLdap.Backend):
self.groupdn = self.userdn self.groupdn = self.userdn
self.builtin = 'CN=Builtin,' + basedn self.builtin = 'CN=Builtin,' + basedn
self.user_filter_tmpl = '(sAMAccountName=%(username)s)' self.user_filter_tmpl = '(sAMAccountName=%(username)s)'
self.group_filter_tmpl = '(uid=%(userdn)s)' self.group_filter_tmpl = '(member=%(userdn)s)'
self.search_filter_tmpl = '(&(|(sAMAccountName=%(searchstring)s)' \ self.search_filter_tmpl = '(&(|(sAMAccountName=%(searchstring)s)' \
'(cn=%(searchstring)s*)' \ '(cn=%(searchstring)s*)' \
'(name=%(searchstring)s*)' \ '(name=%(searchstring)s*)' \
@ -119,6 +119,13 @@ class Backend(ldapcherry.backend.backendLdap.Backend):
for a in attrslist: for a in attrslist:
self.attrlist.append(self._str(a)) self.attrlist.append(self._str(a))
def _str(self, s):
return s.encode('utf-8')
def _uni(self, s):
return s
# return s.decode('utf-16')
def _search_group(self, searchfilter, groupdn): def _search_group(self, searchfilter, groupdn):
ldap_client = self._bind() ldap_client = self._bind()
try: try:
@ -144,14 +151,18 @@ class Backend(ldapcherry.backend.backendLdap.Backend):
'username': username 'username': username
} }
groups = self._search_group(searchfilter, NO_ATTR, self.groupdn) groups = self._search_group(searchfilter, self.groupdn)
groups = groups + self._search_group(searchfilter, self.builtin)
ret = [] ret = []
for entry in groups: self._logger(
ret.append(self._uni(entry[0]['CN'])) severity=logging.DEBUG,
msg="%(backend)s: groups of '%(user)s' are %(groups)s" % {
'user': username,
'groups': str(groups),
'backend': self.backend_name
}
)
groups = self._search_group(searchfilter, NO_ATTR, self.builtin)
ret = []
for entry in groups: for entry in groups:
ret.append(self._uni(entry[0]['CN'])) ret.append(self._uni(entry[1]['cn'][0]))
return ret return ret