From 4dc2f896a2f0052a0c4adf5af79ab2a38f608b6e Mon Sep 17 00:00:00 2001 From: Dmytro Makovey Date: Thu, 24 Aug 2017 09:07:28 -0700 Subject: [PATCH] rename user_raw to user_import for more clarity. Add proper docstring --- admin/manage.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/admin/manage.py b/admin/manage.py index b57b2e2d..8ec6ade8 100644 --- a/admin/manage.py +++ b/admin/manage.py @@ -36,7 +36,7 @@ def admin(localpart, domain_name, password): @manager.command def user(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'): - """ Create an user + """ Create a user """ domain = models.Domain.query.get(domain_name) if not domain: @@ -52,8 +52,12 @@ def user(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'): db.session.commit() @manager.command -def user_raw(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'): - """ Create an user +def user_import(localpart, domain_name, password_hash, hash_scheme='SHA512-CRYPT'): + """ Import a user along with password hash. Available hashes: + 'SHA512-CRYPT' + 'SHA256-CRYPT' + 'MD5-CRYPT' + 'CRYPT' """ domain = models.Domain.query.get(domain_name) if not domain: @@ -64,7 +68,7 @@ def user_raw(localpart, domain_name, password, hash_scheme='SHA512-CRYPT'): domain=domain, 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.commit()