summaryrefslogtreecommitdiff
path: root/keystoneclient/access.py
diff options
context:
space:
mode:
authorChristopher J Schaefer <cjschaef@us.ibm.com>2016-03-11 15:55:06 -0600
committerChristopher J Schaefer <cjschaef@us.ibm.com>2016-04-19 10:35:00 -0500
commitdbf4f3164655ec69a830ed87db0769f01ac1f720 (patch)
treecb93fd0797e8ea00d6faa94f01adddc6bd7083c1 /keystoneclient/access.py
parent91d1053f6811d454c538c85ea601dc700a56b4b3 (diff)
downloadpython-keystoneclient-dbf4f3164655ec69a830ed87db0769f01ac1f720.tar.gz
Removing bandit.yaml in favor of defaults
Removing old configuration options for build-in defaults of latest bandit functionality. Also, marking flagged items with _# nosec_ with a descriptive comment on why the code is acceptable as is. Co-Authored-By: Christopher J Schaefer <cjschaef@us.ibm.com> Co-Authored-By: Tom Cocozzello <tjcocozz@us.ibm.com> Change-Id: I138ebd46a8be195177361a9c3306bb70423b639d
Diffstat (limited to 'keystoneclient/access.py')
-rw-r--r--keystoneclient/access.py20
1 files changed, 13 insertions, 7 deletions
diff --git a/keystoneclient/access.py b/keystoneclient/access.py
index 6442e87..7f4f988 100644
--- a/keystoneclient/access.py
+++ b/keystoneclient/access.py
@@ -148,7 +148,7 @@ class AccessInfo(dict):
def auth_token(self):
try:
del self['auth_token']
- except KeyError:
+ except KeyError: # nosec(cjschaef): 'auth_token' is not in the dict
pass
@property
@@ -526,7 +526,8 @@ class AccessInfoV2(AccessInfo):
def project_name(self):
try:
tenant_dict = self['token']['tenant']
- except KeyError:
+ except KeyError: # nosec(cjschaef): no 'token' key or 'tenant' key in
+ # token, return the name of the tenant or None
pass
else:
return tenant_dict.get('name')
@@ -534,13 +535,15 @@ class AccessInfoV2(AccessInfo):
# pre grizzly
try:
return self['user']['tenantName']
- except KeyError:
+ except KeyError: # nosec(cjschaef): no 'user' key or 'tenantName' in
+ # 'user', attempt 'tenantId' or return None
pass
# pre diablo, keystone only provided a tenantId
try:
return self['token']['tenantId']
- except KeyError:
+ except KeyError: # nosec(cjschaef): no 'token' key or 'tenantName' or
+ # 'tenantId' could be found, return None
pass
@property
@@ -589,7 +592,8 @@ class AccessInfoV2(AccessInfo):
def project_id(self):
try:
tenant_dict = self['token']['tenant']
- except KeyError:
+ except KeyError: # nosec(cjschaef): no 'token' key or 'tenant' dict,
+ # attempt to return 'tenantId' or return None
pass
else:
return tenant_dict.get('id')
@@ -597,13 +601,15 @@ class AccessInfoV2(AccessInfo):
# pre grizzly
try:
return self['user']['tenantId']
- except KeyError:
+ except KeyError: # nosec(cjschaef): no 'user' key or 'tenantId' in
+ # 'user', attempt to retrive from 'token' or return None
pass
# pre diablo
try:
return self['token']['tenantId']
- except KeyError:
+ except KeyError: # nosec(cjschaef): no 'token' key or 'tenantId'
+ # could be found, return None
pass
@property