self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-02-05 13:05:02 +02:00
Code Issues Releases Activity

Respect user enabled flag on user.login

Browse Source
This commit is contained in:
Stefan Auditor 2018-04-15 13:00:38 +02:00
parent 78f4fa7db9
commit 5bfdd75738
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/admin/mailu/models.py
View File

@ -263,6 +263,9 @@ class User(Base, Email):
default=scheme_dict[app.config['PASSWORD_SCHEME']], default=scheme_dict[app.config['PASSWORD_SCHEME']],
) )
def is_enabled(self):
return self.enabled
def check_password(self, password): def check_password(self, password):
reference = re.match('({[^}]+})?(.*)', self.password).group(2) reference = re.match('({[^}]+})?(.*)', self.password).group(2)
return User.pw_context.verify(password, reference) return User.pw_context.verify(password, reference)
@ -299,7 +302,7 @@ class User(Base, Email):
@classmethod @classmethod
def login(cls, email, password): def login(cls, email, password):
user = cls.query.get(email) 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) login_manager.user_loader(User.query.get)