Browse Source

Skip the services with no endpoints when parsing service catalog

When parsing the service catalog to find the source, audit middleware
should skip over the services which have no endpoints instead of
assuming they will have at least one endpoint.

Change-Id: I287873e99338d95baaf20d52ecb3a43763a401fc
Closes-Bug: #1800017
(cherry picked from commit 6779838a24)
tags/4.22.0^0
Guang Yee Lance Bragstad 1 year ago
parent
commit
bc03de9ca4
3 changed files with 29 additions and 0 deletions
  1. +5
    -0
      keystonemiddleware/audit/_api.py
  2. +17
    -0
      keystonemiddleware/tests/unit/audit/test_audit_api.py
  3. +7
    -0
      releasenotes/notes/bug-1800017-0e5a9b8f62b5ca60.yaml

+ 5
- 0
keystonemiddleware/audit/_api.py View File

@@ -261,6 +261,11 @@ class OpenStackAuditApi(object):

default_endpoint = None
for endp in catalog:
if not endp['endpoints']:
self._log.warning(
'Skipping service %s as it have no endpoints.',
endp['name'])
continue
endpoint_urls = endp['endpoints'][0]
admin_urlparse = urlparse.urlparse(
endpoint_urls.get('adminURL', ''))


+ 17
- 0
keystonemiddleware/tests/unit/audit/test_audit_api.py View File

@@ -303,6 +303,23 @@ class AuditApiLogicTest(base.BaseAuditMiddlewareTest):
payload = self.get_payload('GET', url, environ=env_headers)
self.assertEqual((payload['target']['addresses'][0]['url']), "unknown")

def test_service_with_no_endpoints(self):
env_headers = {'HTTP_X_SERVICE_CATALOG':
'''[{"endpoints_links": [],
"endpoints": [],
"type": "foo",
"name": "bar"}]''',
'HTTP_X_USER_ID': 'user_id',
'HTTP_X_USER_NAME': 'user_name',
'HTTP_X_AUTH_TOKEN': 'token',
'HTTP_X_PROJECT_ID': 'tenant_id',
'HTTP_X_IDENTITY_STATUS': 'Confirmed',
'REQUEST_METHOD': 'GET'}

url = 'http://public_host:8774/v2/' + str(uuid.uuid4()) + '/servers'
payload = self.get_payload('GET', url, environ=env_headers)
self.assertEqual(payload['target']['name'], "unknown")

def test_no_auth_token(self):
# Test cases where API requests such as Swift list public containers
# which does not require an auth token. In these cases, CADF event


+ 7
- 0
releasenotes/notes/bug-1800017-0e5a9b8f62b5ca60.yaml View File

@@ -0,0 +1,7 @@
---
fixes:
- |
[`bug 1800017 <https://bugs.launchpad.net/keystonemiddleware/+bug/1800017>`_]
Fix audit middleware service catalog parsing for the scenario where a
service does not contain any endpoints. In that case, we should just skip
over that service.

Loading…
Cancel
Save