openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Warn about bypassing auth on CLI (bug 1076225)"

Browse Source
This commit is contained in:
Jenkins
2012-11-16 03:36:09 +00:00
committed by Gerrit Code Review
parent b111637419 f9a7d9f3a8
commit b145d2294a
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
keystoneclient/shell.py
View File

@@ -275,6 +275,17 @@ class OpenStackIdentityShell(object):
'\n or credentials, ' '\n or credentials, '
'--os-username or env[OS_USERNAME].') '--os-username or env[OS_USERNAME].')
# user supplied a token and endpoint and at least one other cred
if (args.os_token and args.os_endpoint) and (args.os_username or
args.os_tenant_id or
args.os_tenant_name or
args.os_password or
args.os_auth_url):
msg = ('WARNING: Bypassing authentication using a token & '
'endpoint (authentication credentials are being '
'ignored).')
print msg
# if it looks like the user wants to provide a service token # if it looks like the user wants to provide a service token
# but is missing something # but is missing something
if args.os_token or args.os_endpoint and not ( if args.os_token or args.os_endpoint and not (
@@ -291,9 +302,10 @@ class OpenStackIdentityShell(object):
# if it looks like the user wants to provide a credentials # if it looks like the user wants to provide a credentials
# but is missing something # but is missing something
if ((args.os_username or args.os_password or args.os_auth_url) if (not (args.os_token and args.os_endpoint)
and ((args.os_username or args.os_password or args.os_auth_url)
and not (args.os_username and args.os_password and and not (args.os_username and args.os_password and
args.os_auth_url)): args.os_auth_url))):
if not args.os_username: if not args.os_username:
raise exc.CommandError( raise exc.CommandError(
'Expecting a username provided via either ' 'Expecting a username provided via either '