shaba/openuds
1
0
Fork 1
mirror of https://github.com/dkmstr/openuds.git synced 2024-12-22 13:34:04 +03:00
Code Issues Releases Wiki Activity

* Fix on recovering v1 WindDomainOsManager

Browse Source 
* Added support for "strange" groupnames (with parentheses, quotes, ...)
This commit is contained in:
Adolfo Gómez García 2017-07-17 12:14:35 +02:00
parent f3f936e401
commit 2e4bd4b1db
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/uds/osmanagers/WindowsOsManager/WinDomainOsManager.py
View File

@ -119,8 +119,9 @@ class WinDomainOsManager(WindowsOsManager):
def __getGroup(self, l): def __getGroup(self, l):
base = ','.join(['DC=' + i for i in self._domain.split('.')]) base = ','.join(['DC=' + i for i in self._domain.split('.')])
group = self._group.replace('\\', '\\\\').replace('(', '\\(').replace(')', '\\)')
res = l.search_ext_s(base=base, scope=ldap.SCOPE_SUBTREE, filterstr="(&(objectClass=group)(|(cn={0})(sAMAccountName={0})))".format(self._group), attrlist=[b'dn']) res = l.search_ext_s(base=base, scope=ldap.SCOPE_SUBTREE, filterstr="(&(objectClass=group)(|(cn={0})(sAMAccountName={0})))".format(group), attrlist=[b'dn'])
if res[0] is None: if res[0] is None:
return None return None
@ -275,6 +276,8 @@ class WinDomainOsManager(WindowsOsManager):
if data[0] == 'v2': if data[0] == 'v2':
self._group = data[6] self._group = data[6]
else:
self._group = ''
super(WinDomainOsManager, self).unmarshal(data[5].decode('hex')) super(WinDomainOsManager, self).unmarshal(data[5].decode('hex'))