diff options
| author | Michael Johnson <johnsomor@gmail.com> | 2018-10-12 09:05:10 -0700 |
|---|---|---|
| committer | Michael Johnson <johnsomor@gmail.com> | 2018-10-29 11:08:34 -0700 |
| commit | 782729b6e98c1d2857c7e4f24bb69219e43c108f (patch) | |
| tree | 0f3dc29ec7b971c5e0e20c47b298e6f5c225580c /keystonemiddleware | |
| parent | 536a8701ed21fa5ac77ea649ee911646d94a9046 (diff) | |
| download | keystonemiddleware-782729b6e98c1d2857c7e4f24bb69219e43c108f.tar.gz | |
Fix audit target service selection
The keystonemiddleware audit code would select the wrong OpenStack service
endpoint for a request if the cloud is not using unique TCP ports for each
service endpoint. As most services are no longer using a port per service,
but instead using unique paths, this caused the audit to select the wrong
target service. This leads to incorrect audit logging due to the wrong
audit map being used.
This patch checks the request to see if a TCP port was present in the request,
and if not, fall back to using the target_endpoint_type configured in the
audit map file.
Change-Id: Ie2e0bf74ecca485d599a4041bb770bd6e296bc99
Closes-bug: 1797584
Diffstat (limited to 'keystonemiddleware')
| -rw-r--r-- | keystonemiddleware/audit/_api.py | 4 | ||||
| -rw-r--r-- | keystonemiddleware/tests/unit/audit/test_audit_api.py | 38 |
2 files changed, 40 insertions, 2 deletions
diff --git a/keystonemiddleware/audit/_api.py b/keystonemiddleware/audit/_api.py index e692151..b84e140 100644 --- a/keystonemiddleware/audit/_api.py +++ b/keystonemiddleware/audit/_api.py @@ -272,8 +272,8 @@ class OpenStackAuditApi(object): public_urlparse = urlparse.urlparse( endpoint_urls.get('publicURL', '')) req_url = urlparse.urlparse(req.host_url) - if (req_url.netloc == admin_urlparse.netloc - or req_url.netloc == public_urlparse.netloc): + if req_url.port and (req_url.netloc == admin_urlparse.netloc + or req_url.netloc == public_urlparse.netloc): service_info = self._get_service_info(endp) break elif (self._MAP.default_target_endpoint_type and diff --git a/keystonemiddleware/tests/unit/audit/test_audit_api.py b/keystonemiddleware/tests/unit/audit/test_audit_api.py index 1512e9d..f63f3d5 100644 --- a/keystonemiddleware/tests/unit/audit/test_audit_api.py +++ b/keystonemiddleware/tests/unit/audit/test_audit_api.py @@ -320,6 +320,44 @@ class AuditApiLogicTest(base.BaseAuditMiddlewareTest): payload = self.get_payload('GET', url, environ=env_headers) self.assertEqual(payload['target']['name'], "unknown") + def test_endpoint_no_service_port(self): + with open(self.audit_map, "w") as f: + f.write("[DEFAULT]\n") + f.write("target_endpoint_type = load-balancer\n") + f.write("[path_keywords]\n") + f.write("loadbalancers = loadbalancer\n\n") + f.write("[service_endpoints]\n") + f.write("load-balancer = service/load-balancer") + + env_headers = {'HTTP_X_SERVICE_CATALOG': + '''[{"endpoints_links": [], + "endpoints": [{"adminURL": + "http://admin_host/compute", + "region": "RegionOne", + "publicURL": + "http://public_host/compute"}], + "type": "compute", + "name": "nova"}, + {"endpoints_links": [], + "endpoints": [{"adminURL": + "http://admin_host/load-balancer", + "region": "RegionOne", + "publicURL": + "http://public_host/load-balancer"}], + "type": "load-balancer", + "name": "octavia"}]''', + '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://admin_host/load-balancer/v2/loadbalancers/' + + str(uuid.uuid4())) + payload = self.get_payload('GET', url, environ=env_headers) + self.assertEqual(payload['target']['id'], 'octavia') + 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 |