openstack/nova
Code Issues Proposed changes

Remove support for deprecated header X_ROLE

Browse Source 
X_ROLE support was deprecated in 2012
(bc0ba55ae6) we are overdue in removing
support for it.

Change-Id: I81d1bb4eb4ac7278c02e3e937f74aeadbd20c0f5
This commit is contained in:
Joe Gordon
2014-11-12 14:51:00 -08:00
parent ee718d2265
commit 5338cf5426
2 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/api/auth.py
View File

@@ -160,12 +160,5 @@ class NovaKeystoneContext(wsgi.Middleware):
def _get_roles(self, req): def _get_roles(self, req):
"""Get the list of roles.""" """Get the list of roles."""
if 'X_ROLES' in req.headers:
roles = req.headers.get('X_ROLES', '') roles = req.headers.get('X_ROLES', '')
else:
# Fallback to deprecated role header:
roles = req.headers.get('X_ROLE', '')
if roles:
LOG.warning(_LW("Sourcing roles from deprecated X-Role HTTP "
"header"))
return [r.strip() for r in roles.split(',')] return [r.strip() for r in roles.split(',')]

14
nova/tests/unit/api/test_auth.py
View File

@@ -106,9 +106,7 @@ class TestKeystoneMiddlewareRoles(test.NoDBTestCase):
self.roles = "pawn, knight, rook" self.roles = "pawn, knight, rook"
def test_roles(self): def test_roles(self):
# Test that the newer style role header takes precedence.
self.request.headers['X_ROLES'] = 'pawn,knight,rook' self.request.headers['X_ROLES'] = 'pawn,knight,rook'
self.request.headers['X_ROLE'] = 'bad'
response = self.request.get_response(self.middleware) response = self.request.get_response(self.middleware)
self.assertEqual(response.status, '200 Role Match') self.assertEqual(response.status, '200 Role Match')
@@ -118,18 +116,6 @@ class TestKeystoneMiddlewareRoles(test.NoDBTestCase):
response = self.request.get_response(self.middleware) response = self.request.get_response(self.middleware)
self.assertEqual(response.status, '200 No Roles') self.assertEqual(response.status, '200 No Roles')
def test_deprecated_role(self):
# Test fallback to older role header.
self.request.headers['X_ROLE'] = 'pawn,knight,rook'
response = self.request.get_response(self.middleware)
self.assertEqual(response.status, '200 Role Match')
def test_role_empty(self):
self.request.headers['X_ROLE'] = ''
response = self.request.get_response(self.middleware)
self.assertEqual(response.status, '200 No Roles')
def test_no_role_headers(self): def test_no_role_headers(self):
# Test with no role headers set. # Test with no role headers set.