feat(client) detect browser: Firefox Rocket

issue matomo-org#7039
sanchezzzhak · Mar 17, 2022 · ec586b1 · ec586b1
1 parent 5776725
commit ec586b1
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -672,10 +672,11 @@ public function parse(): ?array
             $name    = $appHash['name'];
             $version = '';
             $short   = self::getBrowserShortName($name);
+            $family  = self::getBrowserFamily((string) $short);
 
             if (\preg_match('~Chrome/.+ Safari/537.36~i', $this->userAgent)) {
                 $engine        = 'Blink';
-                $family        = 'Chrome';
+                $family        = $family ?? 'Chrome';
                 $engineVersion = '';
             }
 

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -1877,8 +1877,8 @@
     type: browser
     name: Firefox Rocket
     version: "1.6.2"
-    engine: WebKit
-    engine_version: "537.36"
+    engine: Blink
+    engine_version: ""
     family: Firefox
 -
   user_agent: Mozilla/5.0 Linux; Android 8.0.0 AppleWebKit/537.36 KHTML, like Gecko Version/4.0 Web Explorer/2.6.6 Chrome/75.0.3770.143 Mobile Safari/537.36
@@ -4966,3 +4966,25 @@
     family: Chrome
   headers:
     X-Requested-With: nextapp.atlas
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-T725 Build/RP1A.200720.012; rv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Rocket/2.6.0(20651) Chrome/87.0.4280.141 Safari/537.36
+  client:
+    type: browser
+    name: Firefox Rocket
+    version: 2.6.0
+    engine: Blink
+    engine_version: ""
+    family: Firefox
+  headers:
+    X-Requested-With: org.mozilla.rocket
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; SM-A025F Build/RP1A.200720.012; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/94.0.4606.61 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Firefox Rocket
+    version: ""
+    engine: Blink
+    engine_version: ""
+    family: Firefox
+  headers:
+    X-Requested-With: org.mozilla.rocket
diff --git a/regexes/client/browsers.yml b/regexes/client/browsers.yml
@@ -1809,7 +1809,7 @@
   name: 'Firefox Rocket'
   version: '$1'
   engine:
-    default: 'WebKit'
+    default: 'Blink'
 
 # Web Explorer
 - regex: 'Web Explorer/(\d+[\.\d]+).*Chrome'

diff --git a/regexes/client/hints/browsers.yml b/regexes/client/hints/browsers.yml
@@ -38,3 +38,4 @@
 'com.dolphin.browser.zero': 'Dolphin Zero'
 'mobi.mgeek.TunnyBrowser': 'Dolphin'  # Dolphin + AdBlock
 'nextapp.atlas': 'Atlas'
+'org.mozilla.rocket': 'Firefox Rocket' # Firefox Lite