security-and-privacy/ldapcherry
security-and-privacy/ldapcherry
1
0
Fork 0
mirror of https://github.com/kakwa/ldapcherry synced 2025-07-04 20:37:48 +02:00
Code Releases Activity

fix unicode

Browse source
This commit is contained in:
kakwa 2015-06-27 22:35:34 +02:00
parent b5a8e302d1
commit 147cad3511
14 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ldapcherry/backend/backendLdap.py
View file

@ -163,10 +163,10 @@ class Backend(ldapcherry.backend.Backend):
return dn_entry
def _str(self, s):
try:
return str(s)
except UnicodeEncodeError:
return unicode(s).encode('unicode_escape')
return s.encode('utf-8')
def _uni(self, s):
return s.decode('utf-8')
def auth(self, username, password):
@ -303,9 +303,9 @@ class Backend(ldapcherry.backend.Backend):
for attr in attrs_tmp:
value_tmp = attrs_tmp[attr]
if len(value_tmp) == 1:
attrs[attr] = value_tmp[0]
attrs[attr] = self._uni(value_tmp[0])
else:
attrs[attr] = value_tmp
attrs[attr] = map(self._uni, value_tmp)
if self.key in attrs:
ret[attrs[self.key]] = attrs
@ -317,9 +317,9 @@ class Backend(ldapcherry.backend.Backend):
for attr in attrs_tmp:
value_tmp = attrs_tmp[attr]
if len(value_tmp) == 1:
ret[attr] = value_tmp[0]
ret[attr] = self._uni(value_tmp[0])
else:
ret[attr] = value_tmp
ret[attr] = map(self._uni, value_tmp)
return ret
def get_groups(self, username):
@ -333,5 +333,5 @@ class Backend(ldapcherry.backend.Backend):
groups = self._search(searchfilter, NO_ATTR, self.groupdn)
ret = []
for entry in groups:
ret.append(entry[0])
ret.append(self._uni(entry[0]))
return ret