X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7c56f24c1f83e9d19c9df723bb86335598add902..42f6820a7fe67c5daa4dd3645163ac3611ee8e17:/lib/init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index ef8237fb..4d1c2c70 100644
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -1,51 +1,17 @@
 <?php
-    require_once('init.php');
+	require_once('init.php');
 
-    header('Content-type: text/html; charset=utf-8');
-
-    // check blocks in place for external servers
-    if (strpos($_SERVER["REMOTE_ADDR"],'193.63.75.') !== 0 &&
-        strpos(CONST_WhitelistedIPs, ','.$_SERVER["REMOTE_ADDR"].',') === false)
-    {
-
-	$aBucketKeys = array();
-
-	if (isset($_SERVER["HTTP_REFERER"])) $aBucketKeys[] = str_replace('www.','',strtolower(parse_url($_SERVER["HTTP_REFERER"], PHP_URL_HOST)));
-	if (isset($_SERVER["REMOTE_ADDR"])) $aBucketKeys[] = $_SERVER["REMOTE_ADDR"];
-	if (isset($_GET["email"])) $aBucketKeys[] = $_GET["email"];
-
-	$fBucketVal = doBucket($aBucketKeys, 
-			(defined('CONST_ConnectionBucket_PageType')?constant('CONST_ConnectionBucket_Cost_'.CONST_ConnectionBucket_PageType):1) + user_busy_cost(),
-			CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
-
-	if ($fBucketVal > CONST_ConnectionBucket_WaitLimit && $fBucketVal < CONST_ConnectionBucket_BlockLimit)
+	if (CONST_NoAccessControl)
 	{
-		$m = getBucketMemcache();
-		$iCurrentSleeping = $m->increment('sleepCounter');
-		if (false === $iCurrentSleeping)
-		{
-			$m->add('sleepCounter', 0);
-			$iCurrentSleeping = $m->increment('sleepCounter');
-		}
-		if ($iCurrentSleeping >= CONST_ConnectionBucket_MaxSleeping || isBucketSleeping($aBucketKeys))
-		{
-			// Too many threads sleeping already.  This becomes a hard block.
-			$fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_BlockLimit, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
-		}
-		else
+		header("Access-Control-Allow-Origin: *");
+		header("Access-Control-Allow-Methods: OPTIONS,GET");
+		header("Access-Control-Max-Age: 8640000");
+		if (!empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']))
 		{
-			setBucketSleeping($aBucketKeys, true);
-			sleep(($fBucketVal - CONST_ConnectionBucket_WaitLimit)/CONST_ConnectionBucket_LeakRate);
-			$fBucketVal = doBucket($aBucketKeys, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_LeakRate, CONST_ConnectionBucket_BlockLimit);
-			setBucketSleeping($aBucketKeys, false);
+			header("Access-Control-Allow-Headers: ".$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
 		}
-		$m->decrement('sleepCounter');
 	}
+	if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
 
-	if (strpos(CONST_BlockedIPs, ','.$_SERVER["REMOTE_ADDR"].',') !== false || $fBucketVal >= CONST_ConnectionBucket_BlockLimit)
-	{
-		echo "Your IP has been blocked. \n";
-		echo "Please create a nominatim trac ticket (http://trac.openstreetmap.org/newticket?component=nominatim) to request this to be removed. \n";
-		echo "Information on the Nominatim usage policy can be found here: http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy \n";
-		exit;
-	}
+
+    header('Content-type: text/html; charset=utf-8');