openstack
/
keystone
Code Issues Proposed changes

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 0dc2e9ca37)

Change-Id: I69a3ba2d5a62e4c600edab7ef2cc07413c7360cc
This commit is contained in:
Ken Thomas 2012-10-19 14:42:55 +00:00 committed by Joe Heck
parent 3cd343b2f2
commit bec9b68d42
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/identity/backends/sql.py
View File

@ -166,7 +166,7 @@ class Identity(sql.Base, identity.Driver):
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: