From 182e844ae670fb7583a9efa7c5ee4943f60600db Mon Sep 17 00:00:00 2001 From: Pierre Jaury Date: Wed, 28 Dec 2016 22:46:04 +0100 Subject: [PATCH] Set password properly when using the CLI, fixes, #136 --- admin/manage.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/admin/manage.py b/admin/manage.py index 9563f66b..a277d719 100644 --- a/admin/manage.py +++ b/admin/manage.py @@ -1,6 +1,5 @@ from mailu import manager, db from mailu.admin import models -from passlib import hash @manager.command @@ -28,12 +27,13 @@ def admin(localpart, domain_name, password): user = models.User( localpart=localpart, domain=domain, - global_admin=True, - password=hash.sha512_crypt.encrypt(password) + global_admin=True ) + user.set_password(password) db.session.add(user) db.session.commit() + @manager.command def user(localpart, domain_name, password): """ Create an user @@ -45,12 +45,13 @@ def user(localpart, domain_name, password): user = models.User( localpart=localpart, domain=domain, - global_admin=False, - password=hash.sha512_crypt.encrypt(password) + global_admin=False ) + user.set_password(password) db.session.add(user) db.session.commit() + @manager.command def alias(localpart, domain_name, destination): """ Create an alias @@ -59,7 +60,7 @@ def alias(localpart, domain_name, destination): if not domain: domain = models.Domain(name=domain_name) db.session.add(domain) - alias = models.Alias( + alias = models.Alias( localpart=localpart, domain=domain, destination=destination.split(','), @@ -68,5 +69,6 @@ def alias(localpart, domain_name, destination): db.session.add(alias) db.session.commit() + if __name__ == "__main__": manager.run()