]> git.openstreetmap.org Git - nominatim.git/commitdiff
projects / nominatim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3887469)
user-agent based blocking
authorSarah Hoffmann <lonvia@denofr.de>
Sat, 10 Mar 2012 11:57:19 +0000 (12:57 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sat, 10 Mar 2012 11:57:19 +0000 (12:57 +0100)
settings/settings.php patch | blob | history
website/reverse.php patch | blob | history

diff --git a/settings/settings.php b/settings/settings.php
index 591af1c697891f37887e4f5e430bc314bcb39089..a0483f435b3c794dfa7ce40a0db06bd178168bae 100644 (file)
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -17,6 +17,8 @@
        @define('CONST_ClosedForIndexing', false);
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
        @define('CONST_ClosedForIndexing', false);
        @define('CONST_ClosedForIndexingExceptionIPs', '');
        @define('CONST_BlockedIPs', '');
+       @define('CONST_BlockedUserAgents', '');
+       @define('CONST_BlockReverseMaxLoad', 15);
 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');
 
        @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/');
        @define('CONST_Tile_Default', 'Mapnik');
diff --git a/website/reverse.php b/website/reverse.php
index f569ffac1abbf6ba9dc82ad33ddcc7acb1f1500f..b050484d0c052b54ef964cceebd6ea11c181be86 100755 (executable)
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -2,7 +2,21 @@
        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 
        require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
 
-       $oDB =& getDB();
+    if (preg_match(CONST_BlockedUserAgents, $_SERVER["HTTP_USER_AGENT"]) > 0)
+    {
+        $fLoadAvg = getLoadAverage();
+        if ($fLoadAvg >= CONST_BlockReverseMaxLoad) {
+            header('HTTP/1.0 403 Forbidden');
+            header('Content-type: text/html; charset=utf-8');
+               echo "<html><body><h1>App temporarily blocked</h1>";
+            echo "Your application has been temporarily blocked from the OpenStreetMap Nominatim ";
+            echo "geolocation service due to high server load.";
+            echo "\n</body></html>\n";
+            exit;
+        }
+
+    }
+
 
         if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
         {
 
         if (strpos(CONST_BulkUserIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false)
         {
@@ -16,10 +30,11 @@
                 }
         }
 
                 }
         }
 
+        $oDB =& getDB();
         ini_set('memory_limit', '200M');
 
         // Format for output
         ini_set('memory_limit', '200M');
 
         // Format for output
-       $sOutputFormat = 'xml';
+        $sOutputFormat = 'xml';
         if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
         {
                 $sOutputFormat = $_GET['format'];
         if (isset($_GET['format']) && ($_GET['format'] == 'xml' || $_GET['format'] == 'json' || $_GET['format'] == 'jsonv2'))
         {
                 $sOutputFormat = $_GET['format'];
Open Source search based on OpenStreetMap data