From 3b66fcada77610fb07790e2ed298c4af1336910e Mon Sep 17 00:00:00 2001 From: Stefan Auditor Date: Sun, 15 Apr 2018 13:00:38 +0200 Subject: [PATCH] Respect user enabled flag on user.login --- core/admin/mailu/models.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py index ae5cae6e..8d42ac2a 100644 --- a/core/admin/mailu/models.py +++ b/core/admin/mailu/models.py @@ -221,6 +221,9 @@ class User(Base, Email): default=scheme_dict[app.config['PASSWORD_SCHEME']], ) + def is_enabled(self): + return self.enabled + def check_password(self, password): reference = re.match('({[^}]+})?(.*)', self.password).group(2) return User.pw_context.verify(password, reference) @@ -257,7 +260,7 @@ class User(Base, Email): @classmethod def login(cls, email, password): user = cls.query.get(email) - return user if (user and user.check_password(password)) else None + return user if (user and user.check_password(password) and user.is_enabled()) else None login_manager.user_loader(User.query.get)