From: Tom Hughes <tom@compton.nu>
Date: Sat, 22 Dec 2007 11:55:15 +0000 (+0000)
Subject: Ban (for now at least) searching of nodes, and searching for a key
X-Git-Tag: live~7993
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/90fa3e650be431c76cdc2468c8df2879e62b7490?ds=sidebyside

Ban (for now at least) searching of nodes, and searching for a key
without giving a value as both of these will lock the server up for
a long time.
---

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index e73e75fe7..d46939b93 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -30,6 +30,18 @@ class SearchController < ApplicationController
       end
     end
 
+    if do_nodes
+      response.headers['Error'] = "Searching of nodes is currently unavailable"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end
+
+    unless value
+      response.headers['Error'] = "Searching for a key without value is currently unavailable"
+      render :nothing => true, :status => :service_unavailable
+      return false
+    end
+
     way_ids = Array.new
     ways = Array.new
     nodes = Array.new