fix: add check_user_password()
method for auth handler
This commit is contained in:
parent
9fc7dbe1f7
commit
c424a6cd8a
|
@ -84,19 +84,30 @@ class AuthHandler(GenericHandler):
|
||||||
:returns: :class:`~wuttjamaican.db.model.auth.User` instance,
|
:returns: :class:`~wuttjamaican.db.model.auth.User` instance,
|
||||||
or ``None``.
|
or ``None``.
|
||||||
"""
|
"""
|
||||||
model = self.app.model
|
user = self.get_user(username, session=session)
|
||||||
|
|
||||||
if isinstance(username, model.User):
|
|
||||||
user = username
|
|
||||||
else:
|
|
||||||
user = session.query(model.User)\
|
|
||||||
.filter_by(username=username)\
|
|
||||||
.first()
|
|
||||||
|
|
||||||
if user and user.active and user.password:
|
if user and user.active and user.password:
|
||||||
if password_context.verify(password, user.password):
|
if self.check_user_password(user, password):
|
||||||
return user
|
return user
|
||||||
|
|
||||||
|
def check_user_password(self, user, password, **kwargs):
|
||||||
|
"""
|
||||||
|
Check a user's password.
|
||||||
|
|
||||||
|
This will hash the given password and compare it to the hashed
|
||||||
|
password we have on file for the given user account.
|
||||||
|
|
||||||
|
This is normally part of the login process, so the
|
||||||
|
``password`` param refers to the password entered by a user;
|
||||||
|
this method will determine if it was correct.
|
||||||
|
|
||||||
|
:param user: :class:`~wuttjamaican.db.model.auth.User` instance.
|
||||||
|
|
||||||
|
:param password: User-entered password in plain text.
|
||||||
|
|
||||||
|
:returns: ``True`` if password matches; else ``False``.
|
||||||
|
"""
|
||||||
|
return password_context.verify(password, user.password)
|
||||||
|
|
||||||
def get_role(self, session, key, **kwargs):
|
def get_role(self, session, key, **kwargs):
|
||||||
"""
|
"""
|
||||||
Locate and return a :class:`~wuttjamaican.db.model.auth.Role`
|
Locate and return a :class:`~wuttjamaican.db.model.auth.Role`
|
||||||
|
|
|
@ -60,6 +60,17 @@ else:
|
||||||
user = self.handler.authenticate_user(self.session, 'barney', 'goodpass')
|
user = self.handler.authenticate_user(self.session, 'barney', 'goodpass')
|
||||||
self.assertIsNone(user)
|
self.assertIsNone(user)
|
||||||
|
|
||||||
|
def test_check_user_password(self):
|
||||||
|
model = self.app.model
|
||||||
|
barney = model.User(username='barney')
|
||||||
|
self.handler.set_user_password(barney, 'goodpass')
|
||||||
|
self.session.add(barney)
|
||||||
|
self.session.commit()
|
||||||
|
|
||||||
|
# basics
|
||||||
|
self.assertTrue(self.handler.check_user_password(barney, 'goodpass'))
|
||||||
|
self.assertFalse(self.handler.check_user_password(barney, 'BADPASS'))
|
||||||
|
|
||||||
def test_get_role(self):
|
def test_get_role(self):
|
||||||
model = self.app.model
|
model = self.app.model
|
||||||
myrole = model.Role(name="My Role")
|
myrole = model.Role(name="My Role")
|
||||||
|
|
Loading…
Reference in a new issue