Merge "Reject invalid filters"

designate/api/v2/controllers/rest.py

@@ -55,12 +55,17 @@ class RestController(pecan.rest.RestController):
         return central_rpcapi.CentralAPI.get_instance()
 
     def _apply_filter_params(self, params, accepted_filters, criterion):
-
-        for k in accepted_filters:
-            if k in params:
+        invalid=[]
+        for k in params:
+            if k in accepted_filters:
                 criterion[k] = params[k].replace("*", "%")
-
-        return criterion
+            else:
+                invalid.append(k)
+        if invalid:
+            raise exceptions.BadRequest(
+                'Invalid filters %s' % ', '.join(invalid))
+        else:
+            return criterion
 
     def _handle_post(self, method, remainder):
         '''

designate/tests/test_api/test_v2/test_blacklists.py

@@ -161,3 +161,8 @@ class ApiV2BlacklistsTest(ApiV2TestCase):
 
             # Check that the correct number of recordsets match
             self.assertEqual(correct_result, len(response.json['blacklists']))
+
+    def test_invalid_blacklist_filter(self):
+        url = '/blacklists?description=test'
+        self.policy({'find_blacklists': '@'})
+        self._assert_exception('bad_request', 400, self.client.get, url)

designate/tests/test_api/test_v2/test_recordsets.py

@@ -954,3 +954,8 @@ class ApiV2RecordSetsTest(ApiV2TestCase):
 
         self.client.delete('/zones/%s' % self.domain['id'], status=202)
         self._assert_exception('bad_request', 400, self.client.delete, url)
+
+    def test_invalid_recordset_filter(self):
+        invalid_url = '/zones/%s/recordsets?action=NONE' % self.domain['id']
+        self._assert_exception(
+            'bad_request', 400, self.client.get, invalid_url)

designate/tests/test_api/test_v2/test_tlds.py

@@ -192,3 +192,8 @@ class ApiV2TldsTest(ApiV2TestCase):
 
             # Check that the correct number of tlds match
             self.assertEqual(correct_result, len(response.json['tlds']))
+
+    def test_invalid_recordset_filter(self):
+        invalid_url = '/tlds?description=test'
+        self._assert_exception(
+            'bad_request', 400, self.client.get, invalid_url)

designate/tests/test_api/test_v2/test_zones.py

@@ -702,3 +702,8 @@ class ApiV2ZonesTest(ApiV2TestCase):
 
             # Check that the correct number of zones match
             self.assertEqual(correct_result, len(response.json['zones']))
+
+    def test_invalid_zones_filter(self):
+        invalid_url = '/zones?type=PRIMARY'
+        self._assert_exception(
+            'bad_request', 400, self.client.get, invalid_url)