[CHEF-2140] Rescue QueryParseError in search controller

Invalid queries are now caught and a 400 status is returned instead of
500.

1 files changed, 8 insertions, 0 deletions

diff --git a/chef-server-api/app/controllers/search.rb b/chef-server-api/app/controllers/search.rb
index 1131c27034..77f83d0da0 100644
--- a/chef-server-api/app/controllers/search.rb
+++ b/chef-server-api/app/controllers/search.rb
@@ -41,6 +41,14 @@ class Search < Application
     end
     params[:type] = params.delete(:id)
     display(Chef::SolrQuery.from_params(params).search)
+  rescue Chef::Exceptions::QueryParseError => e
+    # we set status rather than raising BadRequest to avoid a
+    # stacktrace in the server log
+    self.status = 400
+    e_msg = e.message.gsub(/\n/, " ")
+    msg = "invalid search query: '#{params[:q]}' #{e_msg}"
+    Chef::Log.warn("400 #{msg}")
+    display({ "error" => [msg] })
   end
 
   def reindex