openstack/barbican
Code Issues Proposed changes

Merge "Fixed Inconsistent Request Id in Log Messages"

Browse Source
This commit is contained in:
Jenkins 2015-06-10 20:51:52 +00:00 committed by Gerrit Code Review
commit b9b3056356
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
barbican/api/middleware/context.py
View File

@ -27,14 +27,17 @@ CONF = config.CONF
class BaseContextMiddleware(mw.Middleware): class BaseContextMiddleware(mw.Middleware):
def process_response(self, resp): def process_request(self, req):
request_id = resp.request.headers.get('x-openstack-request-id') request_id = req.headers.get('x-openstack-request-id')
if not request_id: if not request_id:
request_id = b'req-{0}'.format(str(uuid.uuid4())) request_id = b'req-{0}'.format(str(uuid.uuid4()))
setattr(req, 'request_id', request_id)
resp.headers['x-openstack-request-id'] = request_id def process_response(self, resp):
LOG.info('%s | %s: %s - %s %s', request_id, u._LI('Processed request'), resp.headers['x-openstack-request-id'] = resp.request.request_id
LOG.info('%s: %s - %s %s', u._LI('Processed request'),
resp.status, resp.request.method, resp.request.url) resp.status, resp.request.method, resp.request.url)
return resp return resp
@ -55,6 +58,8 @@ class ContextMiddleware(BaseContextMiddleware):
header is not 'Confirmed' and header is not 'Confirmed' and
anonymous access is disallowed anonymous access is disallowed
""" """
super(ContextMiddleware, self).process_request(req)
if req.headers.get('X-Identity-Status') == 'Confirmed': if req.headers.get('X-Identity-Status') == 'Confirmed':
req.context = self._get_authenticated_context(req) req.context = self._get_authenticated_context(req)
LOG.debug("==== Inserted barbican auth " LOG.debug("==== Inserted barbican auth "
@ -94,6 +99,7 @@ class ContextMiddleware(BaseContextMiddleware):
'project': req.headers.get('X-Project-Id'), 'project': req.headers.get('X-Project-Id'),
'roles': roles, 'roles': roles,
'is_admin': CONF.admin_role.strip().lower() in roles, 'is_admin': CONF.admin_role.strip().lower() in roles,
'request_id': req.request_id
} }
if req.headers.get('X-Domain-Id'): if req.headers.get('X-Domain-Id'):
@ -119,6 +125,8 @@ class UnauthenticatedContextMiddleware(BaseContextMiddleware):
def process_request(self, req): def process_request(self, req):
"""Create a context without an authorized user.""" """Create a context without an authorized user."""
super(UnauthenticatedContextMiddleware, self).process_request(req)
project_id = self._get_project_id_from_header(req) project_id = self._get_project_id_from_header(req)
config_admin_role = CONF.admin_role.strip().lower() config_admin_role = CONF.admin_role.strip().lower()
@ -133,7 +141,8 @@ class UnauthenticatedContextMiddleware(BaseContextMiddleware):
'user': None, 'user': None,
'project': project_id, 'project': project_id,
'roles': roles, 'roles': roles,
'is_admin': config_admin_role in roles 'is_admin': config_admin_role in roles,
'request_id': req.request_id
} }
context = barbican.context.RequestContext(**kwargs) context = barbican.context.RequestContext(**kwargs)

6
barbican/tests/api/middleware/test_context.py
View File

@ -36,7 +36,8 @@ class TestUnauthenticatedContextMiddleware(oslotest.BaseTestCase):
project='trace', project='trace',
is_admin=True, is_admin=True,
user=None, user=None,
roles=['admin'] roles=['admin'],
request_id=request.request_id
) )
def test_role_used_from_header(self): def test_role_used_from_header(self):
@ -50,5 +51,6 @@ class TestUnauthenticatedContextMiddleware(oslotest.BaseTestCase):
project='trace', project='trace',
is_admin=False, is_admin=False,
user=None, user=None,
roles=['something'] roles=['something'],
request_id=request.request_id
) )