Look for headless browser in clientHint, #PG-3304

TrackingSpamPrevention.php

@@ -96,9 +96,13 @@ public function isExcludedVisit(&$excluded, Request $request)
         $browserLang = $request->getBrowserLanguage();
 
         $browserDetection = new BrowserDetection();
+        $clientHints = json_encode($request->getClientHints());
         if (
-            $settings->blockHeadless->getValue()
-            && $browserDetection->isHeadlessBrowser($request->getUserAgent())
+            $settings->blockHeadless->getValue() &&
+            (
+                $browserDetection->isHeadlessBrowser($request->getUserAgent()) ||
+                $browserDetection->isHeadlessBrowser($clientHints)
+            )
         ) {
             // note above user agent could have been overwritten with UA parameter but that's fine since it's easy to change useragent anyway
             Common::printDebug("Excluding visit as headless browser detected");

tests/Integration/TrackingSpamPreventionTest.php

@@ -77,6 +77,20 @@ public function test_isExcludedVisit_whenBlockedUserAgent()
         $this->assertTrue($isExcluded);
     }
 
+    public function test_isExcludedVisit_whenHeadlessClientHint()
+    {
+        StaticContainer::get(SystemSettings::class)->blockHeadless->setValue(1);
+        Cache::clearCacheGeneral();
+
+        // set normal browser not a headless browser
+        $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.0 Safari/537.36';
+        $excluded = $this->makeExcluded('22.22.22.22');
+        $excluded->request->setParam('uadata', '{"fullVersionList":[{"brand":"Not A(Brand","version":"99.0.0.0"},{"brand":"HeadlessChrome","version":"121.0.6167.57"},{"brand":"Chromium","version":"121.0.6167.57"}],"mobile":false,"model":"","platform":"Linux","platformVersion":"5.15.0"}');
+        $isExcluded = $excluded->isExcluded();
+        unset($_SERVER['HTTP_USER_AGENT']);
+        $this->assertTrue($isExcluded);
+    }
+
     public function test_isExcludedVisit_whenBlockedUserAgentDisabled()
     {
         StaticContainer::get(SystemSettings::class)->blockHeadless->setValue(0);