docker/mailu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename user_raw to user_import for more clarity. Add proper docstring

Browse Source
This commit is contained in:
Dmytro Makovey
2017-08-24 09:07:28 -07:00
parent 974f95f25e
commit 4dc2f896a2
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
admin/manage.py
View File

@@ -36,7 +36,7 @@ def admin(localpart, domain_name, password):
@manager.command @manager.command
def user(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'): def user(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'):
""" Create an user """ Create a user
""" """
domain = models.Domain.query.get(domain_name) domain = models.Domain.query.get(domain_name)
if not domain: if not domain:
@@ -52,8 +52,12 @@ def user(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'):
db.session.commit() db.session.commit()
@manager.command @manager.command
def user_raw(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'): def user_import(localpart, domain_name, password_hash, hash_scheme='SHA512-CRYPT'):
""" Create an user """ Import a user along with password hash. Available hashes:
'SHA512-CRYPT'
'SHA256-CRYPT'
'MD5-CRYPT'
'CRYPT'
""" """
domain = models.Domain.query.get(domain_name) domain = models.Domain.query.get(domain_name)
if not domain: if not domain:
@@ -64,7 +68,7 @@ def user_raw(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'):
domain=domain, domain=domain,
global_admin=False global_admin=False
) )
user.set_password(password, hash_scheme=hash_scheme) user.set_password(password_hash, hash_scheme=hash_scheme, raw=True)
db.session.add(user) db.session.add(user)
db.session.commit() db.session.commit()