openstack
/
django_openstack_auth
Code Issues Proposed changes

Merge "Configurable token hashing"

This commit is contained in:
Jenkins 2015-07-24 18:27:00 +00:00 committed by Gerrit Code Review
parent 70b6305e63 ece924a79d
commit 1980c66952
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack_auth/user.py
View File

@ -23,6 +23,7 @@ from openstack_auth import utils
LOG = logging.getLogger(__name__)
_TOKEN_HASH_ENABLED = getattr(settings, 'OPENSTACK_TOKEN_HASH_ENABLED', True)
def set_session_from_user(request, user):
@ -81,8 +82,9 @@ class Token(object):
# Token-related attributes
self.id = auth_ref.auth_token
self.unscoped_token = unscoped_token
if (keystone_cms.is_asn1_token(self.id)
or keystone_cms.is_pkiz(self.id)):
if (_TOKEN_HASH_ENABLED and
(keystone_cms.is_asn1_token(self.id)
or keystone_cms.is_pkiz(self.id))):
algorithm = getattr(settings, 'OPENSTACK_TOKEN_HASH_ALGORITHM',
'md5')
hasher = hashlib.new(algorithm)