Merge pull request #2982 from simianhacker/fix/2977

Closes #2977 - Removed POST body restriction from _search and _validate
elastic · Feb 11, 2015 · 432eac0 · 432eac0
2 parents 7f60729 + 1917f15
commit 432eac0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/server/lib/validateRequest.js b/src/server/lib/validateRequest.js
@@ -32,8 +32,8 @@ function validate(req) {
 
   // methods that accept standard json bodies
   var maybeMGet = ('_mget' === maybeMethod && add && jsonBody);
-  var maybeSearch = ('_search' === maybeMethod && add && jsonBody);
-  var maybeValidate = ('_validate' === maybeMethod && add && jsonBody);
+  var maybeSearch = ('_search' === maybeMethod && add);
+  var maybeValidate = ('_validate' === maybeMethod && add);
 
   // methods that accept bulk bodies
   var maybeBulk = ('_bulk' === maybeMethod && add && bulkBody);
@@ -82,10 +82,10 @@ function validate(req) {
     if (maybeKibanaIndex) return;
 
     // allow json bodies sent to _mget _search and _validate
-    if (jsonBody && (maybeMGet || maybeSearch || maybeValidate)) return;
+    if (maybeMGet || maybeSearch || maybeValidate) return;
 
     // allow bulk bodies sent to _msearch
-    if (bulkBody && (maybeMsearch)) return;
+    if (maybeMsearch) return;
 
     throw new validate.Fail();
   }

diff --git a/test/server/unit/lib/validateRequest.js b/test/server/unit/lib/validateRequest.js
@@ -102,6 +102,8 @@ describe('lib/isValid', function () {
       run('HEAD', '/other-index', true);
       run('GET', '/_cluster/health', true);
       run('POST', '/.kibana/__notRealIndex__/_validate/query?q=foo:bar', true);
+      run('POST', '/_validate', true);
+      run('POST', '/_search', true);
     });
   });