From 3946dc400a42196fd8d664d0ce876d798dc9965b Mon Sep 17 00:00:00 2001
From: Sinisa Veseli <sveseli@aps.anl.gov>
Date: Thu, 17 Sep 2015 17:05:34 +0000
Subject: [PATCH] fix issue with unicode strings, which ldap apparently cannot
handle
---
src/python/dm/common/utility/ldapLinuxPlatformUtility.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/python/dm/common/utility/ldapLinuxPlatformUtility.py b/src/python/dm/common/utility/ldapLinuxPlatformUtility.py
index 74f1d17e..0589bab8 100755
--- a/src/python/dm/common/utility/ldapLinuxPlatformUtility.py
+++ b/src/python/dm/common/utility/ldapLinuxPlatformUtility.py
@@ -86,6 +86,7 @@ class LdapLinuxPlatformUtility:
""" Create group if it does not exist. """
logger = self.getLogger()
ldapClient = self.getLdapClient()
+ name = str(name)
try:
groupDn = self.groupDnFormat % name
logger.debug('Looking for group DN: %s' % groupDn)
@@ -138,6 +139,8 @@ class LdapLinuxPlatformUtility:
""" Add user to group. """
logger = self.getLogger()
ldapClient = self.getLdapClient()
+ username = str(username)
+ groupName = str(groupName)
try:
groupDn = self.groupDnFormat % groupName
resultList = ldapClient.search_s(groupDn, ldap.SCOPE_BASE)
@@ -181,7 +184,7 @@ class LdapLinuxPlatformUtility:
if __name__ == '__main__':
utility = LdapLinuxPlatformUtility('ldaps://dmid-vm.xray.aps.anl.gov:636', 'uid=dmadmin,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', '/tmp/ldapPassword', groupDnFormat='cn=%s,ou=DM,ou=Group,o=aps.anl.gov,dc=aps,dc=anl,dc=gov', minGidNumber=66000)
- utility.createGroup('exp2')
+ utility.createGroup(u'exp9')
#utility.createGroup('dmgp000001_TOF')
- utility.addUserToGroup('rs1', 'exp2')
+ utility.addUserToGroup(u'rs1', u'exp9')
--
GitLab