removed sql, substracted one from the seafile ldap users as the admin account is included
This commit is contained in:
@@ -147,30 +147,20 @@ ldapUsers = ldap.entries
|
||||
for user in ldapUsers:
|
||||
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 sql ldap users
|
||||
|
||||
# Starting query for seafile ldap users
|
||||
seafileLDAPUsers = []
|
||||
logger.debug("Starting query for LDAPUsers in Seafile")
|
||||
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:
|
||||
if seafileUser['email'] == adminEmail:
|
||||
continue
|
||||
else:
|
||||
logger.debug("User: {0} - Active: {1}".format(seafileUser['email'], bool(seafileUser['is_active'])))
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user