Improved performance

hongaar · Nov 16, 2015 · 33e0aa9 · 33e0aa9
1 parent e1e979c
commit 33e0aa9
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 28 deletions.
diff --git a/compact/semaltblocker.php b/compact/semaltblocker.php
diff --git a/scripts/timer.php b/scripts/timer.php
@@ -10,7 +10,7 @@ function mockReferer($referer)
     $_SERVER["HTTP_REFERER"] = $referer;
 }
 
-$c = 10;
+$c = 100;
 
 echo "Testing empty referer   : ";
 mockReferer('');

diff --git a/src/SemaltBlocker/Blocker.php b/src/SemaltBlocker/Blocker.php
@@ -168,15 +168,17 @@ public static function isRefererOnBlocklist()
         }
 
         $path = Domainparser::getPath($referer);
-        if (substr_count($blocklist, self::SEPERATOR . $rootDomain . $path . self::SEPERATOR)) {
-            self::$reason = "Blocking because referer root domain/path (" . $rootDomain . $path . ") is found on blocklist";
+        if (trim($path, '/')) {
+            if (substr_count($blocklist, self::SEPERATOR . $rootDomain . $path . self::SEPERATOR)) {
+                self::$reason = "Blocking because referer root domain/path (" . $rootDomain . $path . ") is found on blocklist";
 
-            return true;
-        }
-        if (substr_count($blocklist, self::SEPERATOR . $hostname . $path . self::SEPERATOR)) {
-            self::$reason = "Blocking because referer hostname/path (" . $hostname . $path . ") is found on blocklist";
+                return true;
+            }
+            if (substr_count($blocklist, self::SEPERATOR . $hostname . $path . self::SEPERATOR)) {
+                self::$reason = "Blocking because referer hostname/path (" . $hostname . $path . ") is found on blocklist";
 
-            return true;
+                return true;
+            }
         }
 
         self::$reason = "Not blocking because referer (" . $referer . ") is not matched against blocklist";

diff --git a/src/SemaltBlocker/Domainparser.php b/src/SemaltBlocker/Domainparser.php
diff --git a/tests/SemaltTest.php b/tests/SemaltTest.php
@@ -53,7 +53,7 @@ public function testBlocked()
                 $this->assertTrue(Blocker::blocked(), 'Should block bad referer http://' . $badReferral);
 
                 // Referer is a subdomain of blocked domain (only on root domains with no path)
-                if (($root = Domainparser::getRootDomain($badReferral)) === $badReferral && !Domainparser::getPath($badReferral)) {
+                if (($root = Domainparser::getRootDomain($badReferral)) === $badReferral && !trim(Domainparser::getPath($badReferral), '/')) {
                     $this->mockReferer('http://test.' . $badReferral);
                     $this->assertTrue(Blocker::blocked(), 'Should block bad referer http://test.' . $badReferral);
                 }