openstack
/
keystone
Code Issues Proposed changes

Merge "refactor: move variable to where it's needed"

This commit is contained in:
Jenkins 2015-12-03 00:20:34 +00:00 committed by Gerrit Code Review
parent d120187f53 6977f908fe
commit 9e4ccbdc93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keystone/common/wsgi.py
View File

@ -71,9 +71,6 @@ def validate_token_bind(context, token_ref):
# permissive and strict modes don't require there to be a bind
permissive = bind_mode in ('permissive', 'strict')
# get the named mode if bind_mode is not one of the known
name = None if permissive or bind_mode == 'required' else bind_mode
if not bind:
if permissive:
# no bind provided and none required
@ -82,6 +79,9 @@ def validate_token_bind(context, token_ref):
LOG.info(_LI("No bind information present in token"))
raise exception.Unauthorized()
# get the named mode if bind_mode is not one of the known
name = None if permissive or bind_mode == 'required' else bind_mode
if name and name not in bind:
LOG.info(_LI("Named bind mode %s not in bind information"), name)
raise exception.Unauthorized()