Fix crash on search parse exceptions (fixes #44)

Kinto · Jun 13, 2017 · 4dfccc2 · 4dfccc2
1 parent 9ea6c1a
commit 4dfccc2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,7 +5,9 @@ Changelog
 0.2.0 (unreleased)
 ------------------
 
-- Nothing changed yet.
+**Bug fixes**
+
+- Fix crash on search parse exceptions (fixes #44)
 
 
 0.1.0 (2017-05-26)

diff --git a/kinto_elasticsearch/views.py b/kinto_elasticsearch/views.py
@@ -41,8 +41,12 @@ def search_view(request, **kwargs):
 
     except elasticsearch.RequestError as e:
         # Malformed query.
-        message = e.info["error"]["reason"]
-        details = e.info["error"]["root_cause"][0]
+        if isinstance(e.info["error"], dict):
+            message = e.info["error"]["reason"]
+            details = e.info["error"]["root_cause"][0]
+        else:
+            message = e.info["error"]
+            details = None
         response = http_error(httpexceptions.HTTPBadRequest(),
                               errno=ERRORS.INVALID_PARAMETERS,
                               message=message,

diff --git a/tests/test_elasticsearch.py b/tests/test_elasticsearch.py
@@ -346,3 +346,11 @@ def test_can_aggregate_values(self):
             {"key": "abc", "doc_count": 1},
             {"key": "efg", "doc_count": 1},
         ]
+
+    def test_search_parse_exception_returns_400(self):
+        e = elasticsearch.RequestError('', '',
+                                       {"error": "Could not find aggregator type"})
+        with mock.patch("kinto_elasticsearch.indexer.Indexer.search",
+                        side_effect=e):
+            self.app.post_json("/buckets/bid/collections/cid/search",
+                               headers=self.headers, status=400)