Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
bug 1068674
Redo part of bp/sql-identiy-pam that was accidently undone by bug 968519.

We encapsulated the call to utils.check_password with a local method,
_check_password, to make it easier to subclass Identity. This allows us
to use a different password checker without having to replace the entire
authenticate method in our code.  The fix for 968519 accidently removed
the call to the local method. *This* fix puts that call back in.

Updating comment because Jenkins failed due to build timeout in
unrelated test.

(cherry picked from commit 0dc2e9c)

Change-Id: I69a3ba2d5a62e4c600edab7ef2cc07413c7360cc
  • Loading branch information
krtyyy authored and heckj committed Oct 25, 2012
1 parent 3cd343b commit bec9b68
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion keystone/identity/backends/sql.py
Expand Up @@ -166,7 +166,7 @@ def authenticate(self, user_id=None, tenant_id=None, password=None):
except exception.UserNotFound:
raise AssertionError('Invalid user / password')

if not utils.check_password(password, user_ref.get('password')):
if not self._check_password(password, user_ref):
raise AssertionError('Invalid user / password')

if tenant_id is not None:
Expand Down

0 comments on commit bec9b68

Please sign in to comment.