jgaunt/seafile-sso
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

forgot to put back in ldap search for ldap group loop

Browse Source
This commit is contained in:
John Gaunt
2021-11-06 15:26:22 -04:00
parent 666d31391f
commit 47e8202d30
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
seafile-ldap.py
View File

@@ -255,9 +255,15 @@ for ldapGroup in ldapGroups:
searchSeafileGroup = request('admin/search-group/?query={0}'.format(ldapGroup.name), seafileURL, seafileToken)['response']['group_list'] searchSeafileGroup = request('admin/search-group/?query={0}'.format(ldapGroup.name), seafileURL, seafileToken)['response']['group_list']
for seafileGroup in searchSeafileGroup: for seafileGroup in searchSeafileGroup:
if seafileGroup['name'] == ldapGroup.name: if seafileGroup['name'] == ldapGroup.name:
addMembertoSeafileGroup = request('admin/groups/{0}/members/'.format(seafileGroup['id']), seafileURL, seafileToken, "POST", "email={0}".format(ldap.entries[0]['mail']), False)['response'] for ldapGroupMember in ldapGroup.member:
if addMembertoSeafileGroup['failed']['email'] == ldap.entries[0]['mail'] and addMembertoSeafileGroup['failed']['error_msg'].endswith(" is already a group member."): logger.debug("Searching for LDAP user {0}".format(ldapGroupMember))
logger.debug("User {0} is already member of Seafile Group {1}".format(ldap.entries[0]['mail'], seafileGroup['name'])) ldap.search(ldapBase, '(&(distinguishedName={0})(mail=*)(!(userAccountControl:1.2.840.113556.1.4.803:=2))({1}))'.format(ldapGroupMember, ldapFilter), attributes=['mail'])
count = len(ldap.entries)
logger.debug("Found {0} LDAP user.".format(count))
if count == 1:
addMembertoSeafileGroup = request('admin/groups/{0}/members/'.format(seafileGroup['id']), seafileURL, seafileToken, "POST", "email={0}".format(ldap.entries[0]['mail']), False)['response']
if addMembertoSeafileGroup['failed']['email'] == ldap.entries[0]['mail'] and addMembertoSeafileGroup['failed']['error_msg'].endswith(" is already a group member."):
logger.debug("User {0} is already member of Seafile Group {1}".format(ldap.entries[0]['mail'], seafileGroup['name']))
#seafileGroupMembers = request('admin/groups/{0}/members/'.format(seafileGroup['id']), seafileURL, seafileToken)['response']['members'] #seafileGroupMembers = request('admin/groups/{0}/members/'.format(seafileGroup['id']), seafileURL, seafileToken)['response']['members']