openstack
/
heat
Code Issues Proposed changes

Fix for resource search with invalid filter keys 

When invalid fileters are provided as part of resource
filtering, it will raise 400 http status code (bad request)

Closes-bug: #1554333
Change-Id: I27709b1b73e4ed43367a25894d4ca7c9575b0679
This commit is contained in:
Kanagaraj Manickam 2016-03-02 11:49:10 +05:30
parent 3e0e5bdc3c
commit 971723f83d
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/api/openstack/v1/resources.py
View File

@ -105,6 +105,13 @@ class ResourceController(object):
'physical_resource_id': 'mixed'
}
invalid_keys = (set(req.params.keys()) -
set(list(whitelist) + [rpc_api.PARAM_NESTED_DEPTH,
rpc_api.PARAM_WITH_DETAIL]))
if invalid_keys:
raise exc.HTTPBadRequest(_('Invalid filter parameters %s') %
six.text_type(list(invalid_keys)))
nested_depth = self._extract_to_param(req,
rpc_api.PARAM_NESTED_DEPTH,
param_utils.extract_int,

20
heat/tests/api/openstack_v1/test_resources.py
View File

@ -132,6 +132,26 @@ class ResourceControllerTest(tools.ControllerTest, common.HeatTestCase):
self.assertEqual('EntityNotFound', resp.json['error']['type'])
self.m.VerifyAll()
def test_index_invalid_filters(self, mock_enforce):
self._mock_enforce_setup(mock_enforce, 'index', True)
stack_identity = identifier.HeatIdentifier(self.tenant,
'rubbish', '1')
req = self._get(stack_identity._tenant_path() + '/resources',
{'invalid_key': 'junk'})
mock_call = self.patchobject(rpc_client.EngineClient, 'call')
ex = self.assertRaises(webob.exc.HTTPBadRequest,
self.controller.index, req,
tenant_id=self.tenant,
stack_name=stack_identity.stack_name,
stack_id=stack_identity.stack_id)
self.assertIn("Invalid filter parameters %s" %
[six.text_type('invalid_key')],
six.text_type(ex))
self.assertFalse(mock_call.called)
def test_index_nested_depth(self, mock_enforce):
self._mock_enforce_setup(mock_enforce, 'index', True)
stack_identity = identifier.HeatIdentifier(self.tenant,