Merge pull request #197 from coreos-inc/keystone

Add Keystone Auth
This commit is contained in:
Jake Moshenko 2015-07-22 13:38:47 -04:00
commit 5d86fa80e7
19 changed files with 684 additions and 456 deletions

View file

@ -124,8 +124,8 @@ def _process_basic_auth(auth):
logger.debug('Invalid robot or password for robot: %s', credentials[0])
else:
(authenticated, error_message) = authentication.verify_user(credentials[0], credentials[1],
basic_auth=True)
(authenticated, _) = authentication.verify_and_link_user(credentials[0], credentials[1],
basic_auth=True)
if authenticated:
logger.debug('Successfully validated user: %s', authenticated.username)