YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

user import: clarify user deletion handling

Browse source
This commit is contained in:
Alexandre Aubin 2021-08-26 20:45:06 +02:00
parent efec34a3a6
commit ad975a2dbb
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/yunohost/user.py
View file

@ -670,6 +670,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
def to_list(str_list): def to_list(str_list):
return str_list.split(',') if str_list else [] return str_list.split(',') if str_list else []
users_in_csv = []
existing_users = user_list()['users'] existing_users = user_list()['users']
past_lines = [] past_lines = []
reader = csv.DictReader(csvfile, delimiter=';', quotechar='"') reader = csv.DictReader(csvfile, delimiter=';', quotechar='"')
@ -701,20 +702,26 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
user['mail-alias'] = to_list(user['mail-alias']) user['mail-alias'] = to_list(user['mail-alias'])
user['mail-forward'] = to_list(user['mail-forward']) user['mail-forward'] = to_list(user['mail-forward'])
user['domain'] = user['mail'].split('@')[1] user['domain'] = user['mail'].split('@')[1]
# User creation
if user['username'] not in existing_users: if user['username'] not in existing_users:
# Generate password if not exists # Generate password if not exists
# This could be used when reset password will be merged # This could be used when reset password will be merged
if not user['password']: if not user['password']:
user['password'] = random_ascii(70) user['password'] = random_ascii(70)
actions['created'].append(user) actions['created'].append(user)
else: # User update
if update: elif update:
actions['updated'].append(user) actions['updated'].append(user)
del existing_users[user['username']]
users_in_csv.add(user['username'])
if delete: if delete:
for user in existing_users: actions['deleted'] = [user for user in existing_users if user not in users_in_csv]
actions['deleted'].append(user)
if delete and not users_in_csv:
logger.error("You used the delete option with an empty csv file ... You probably did not really mean to do that, did you !?")
is_well_formatted = False
if not is_well_formatted: if not is_well_formatted:
raise YunohostError('user_import_bad_file') raise YunohostError('user_import_bad_file')