refs #4996 allow only hosts of siteIds that are present in the URL and do not allow known hosts automatically both to prevent issues on shared Piwik instances

1 files changed, 13 insertions, 7 deletions

diff --git a/core/Tracker.php b/core/Tracker.php
index a690a31225..4497ec0b99 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -929,6 +929,10 @@ class Tracker
             return;
         }
 
+        if (empty($this->requests)) {
+            return;
+        }
+
         $redirectUrl = $this->getRedirectUrl();
         $host        = Url::getHostFromUrl($redirectUrl);
 
@@ -936,8 +940,15 @@ class Tracker
             return;
         }
 
-        $model   = new Model();
-        $siteIds = $model->getSitesId();
+        $siteIds = array();
+
+        foreach ($this->requests as $request) {
+            $siteIds[] = (int) $request['idsite'];
+        }
+
+        $siteIds = array_unique($siteIds);
+
+        $model = new Model();
 
         foreach ($siteIds as $siteId) {
             $siteUrls = $model->getSiteUrlsFromId($siteId);
@@ -946,11 +957,6 @@ class Tracker
                 Url::redirectToUrl($redirectUrl);
             }
         }
-
-        $trustedHosts = Url::getTrustedHosts();
-        if (Url::isHostInUrls($host, $trustedHosts)) {
-            Url::redirectToUrl($redirectUrl);
-        }
     }