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

removed sql, substracted one from the seafile ldap users as the admin account is included

Browse Source
This commit is contained in:
John Gaunt
2021-11-03 13:58:35 -04:00
parent c0f31e2230
commit f08f84b160
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
seafile-ldap.py
View File

@@ -147,30 +147,20 @@ ldapUsers = ldap.entries
for user in ldapUsers: for user in ldapUsers:
logger.debug("User: {0} - Email: {1} - UserDN: {2}".format(user.displayName, user.mail, user.distinguishedName)) logger.debug("User: {0} - Email: {1} - UserDN: {2}".format(user.displayName, user.mail, user.distinguishedName))
#cnx = mysql.connector.connect(**dbconfig)
#cursor = cnx.cursor() # Starting query for seafile ldap users
# Starting query for sql ldap users
seafileLDAPUsers = [] seafileLDAPUsers = []
logger.debug("Starting query for LDAPUsers in Seafile") logger.debug("Starting query for LDAPUsers in Seafile")
seafileUsers = request('admin/search-user/?query=@{0}'.format(adminEmail.split("@")[1]), seafileURL, seafileToken)['response']['user_list'] seafileUsers = request('admin/search-user/?query=@{0}'.format(adminEmail.split("@")[1]), seafileURL, seafileToken)['response']['user_list']
logger.debug("Found {0} Seafile LDAP users".format(len(seafileUsers))) # need to substract one from the len as the admin account is in the list
logger.debug("Found {0} Seafile LDAP users".format(len(seafileUsers)-1))
for seafileUser in seafileUsers: for seafileUser in seafileUsers:
if seafileUser['email'] == adminEmail: if seafileUser['email'] == adminEmail:
continue continue
else: else:
logger.debug("User: {0} - Active: {1}".format(seafileUser['email'], bool(seafileUser['is_active']))) logger.debug("User: {0} - Active: {1}".format(seafileUser['email'], bool(seafileUser['is_active'])))
seafileLDAPUsers.append(seafileUser) seafileLDAPUsers.append(seafileUser)
#logger.debug("Starting SQL query for LDAPUsers")
#query = ("SELECT * FROM LDAPUsers")
#logger.debug("Query: {0}".format(query))
#cursor.execute(query)
#sqlLDAPusers = cursor.fetchall()
#logger.debug("Found {0} SQL LDAP users".format(cursor.rowcount))
#for user in sqlLDAPusers:
# logger.debug("User: {0} - Active: {1}".format(user[1], bool(user[4])))
#logger.debug("Finished SQL query for LDAPUsers")
#cnx.close()
# Loop through the ldap users and make sure they are in the sql ldap users table # Loop through the ldap users and make sure they are in the sql ldap users table