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: Allow empty value for mailbox quota

Browse source
This commit is contained in:
Alexandre Aubin 2021-08-27 17:09:46 +02:00
parent 0e2105311f
commit 5af70af47d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/user.py
View file

@ -51,7 +51,7 @@ FIELDS_FOR_IMPORT = {
'mail': r'^([\w.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,}))$', 'mail': r'^([\w.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,}))$',
'mail-alias': r'^|([\w.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,}),?)+$', 'mail-alias': r'^|([\w.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,}),?)+$',
'mail-forward': r'^|([\w\+.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,}),?)+$', 'mail-forward': r'^|([\w\+.-]+@([^\W_A-Z]+([-]*[^\W_A-Z]+)*\.)+((xn--)?[^\W_]{2,}),?)+$',
'mailbox-quota': r'^(\d+[bkMGT])|0$', 'mailbox-quota': r'^(\d+[bkMGT])|0|$',
'groups': r'^|([a-z0-9_]+(,?[a-z0-9_]+)*)$' 'groups': r'^|([a-z0-9_]+(,?[a-z0-9_]+)*)$'
} }
@ -688,7 +688,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
for user in reader: for user in reader:
# Validate column values against regexes # Validate column values against regexes
format_errors = [key + ':' + str(user[key]) format_errors = [f"{key}: '{user[key]}' doesn't match the expected format"
for key, validator in FIELDS_FOR_IMPORT.items() for key, validator in FIELDS_FOR_IMPORT.items()
if user[key] is None or not re.match(validator, user[key])] if user[key] is None or not re.match(validator, user[key])]
@ -726,6 +726,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
continue continue
# Choose what to do with this line and prepare data # Choose what to do with this line and prepare data
user['mailbox-quota'] = user['mailbox-quota'] or "0"
# User creation # User creation
if user['username'] not in existing_users: if user['username'] not in existing_users: