Merge branch 'master' into bots

matomo-org · Mar 5, 2024 · f11ed0d · f11ed0d
2 parents 741d0c7 + 0c1c4cd
commit f11ed0d
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 52 deletions.
diff --git a/Parser/Client/Browser.php b/Parser/Client/Browser.php
@@ -304,8 +304,7 @@ class Browser extends AbstractClientParser
         'JL' => 'Jelly',
         'JI' => 'Jig Browser',
         'JP' => 'Jig Browser Plus',
-        'JO' => 'Jio Browser',
-        'J1' => 'JioPages',
+        'JO' => 'JioSphere',
         'KB' => 'K.Browser',
         'KF' => 'Keepsafe Browser',
         'KS' => 'Kids Safe Browser',
@@ -370,7 +369,7 @@ class Browser extends AbstractClientParser
         'NB' => 'Nokia Browser',
         'NO' => 'Nokia OSS Browser',
         'NV' => 'Nokia Ovi Browser',
-        'N2' => 'Norton Secure Browser',
+        'N2' => 'Norton Private Browser',
         'NX' => 'Nox Browser',
         'N1' => 'NOMone VR Browser',
         'NE' => 'NetSurf',
@@ -470,6 +469,7 @@ class Browser extends AbstractClientParser
         'SB' => 'Samsung Browser',
         '3L' => 'Samsung Browser Lite',
         'SA' => 'Sailfish Browser',
+        'R0' => 'SberBrowser',
         'S8' => 'Seewo Browser',
         'SC' => 'SEMC-Browser',
         'SE' => 'Sogou Explorer',
@@ -643,7 +643,7 @@ class Browser extends AbstractClientParser
             '1W', 'EV', 'I9', 'V4', 'H4', '1T', 'M5', '0S', '0C',
             'ZR', 'D6', 'F6', 'RC', 'WD', 'P3', 'FT', 'A9', 'X2',
             'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'P5', 'H5', 'V3',
-            'K3', 'Q4', 'G2', 'R2',
+            'K3', 'Q4', 'G2', 'R0', 'JO', 'R2',
         ],
         'Firefox'            => [
             'AX', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
@@ -695,8 +695,10 @@ class Browser extends AbstractClientParser
      */
     protected static $clientHintMapping = [
         'Chrome'                     => ['Google Chrome'],
+        'Chrome Webview'             => ['Android WebView'],
         'Vewd Browser'               => ['Vewd Core'],
         'DuckDuckGo Privacy Browser' => ['DuckDuckGo'],
+        'Norton Private Browser'     => ['Norton Secure Browser'],
     ];
 
     /**

diff --git a/Tests/Parser/Client/fixtures/browser.yml b/Tests/Parser/Client/fixtures/browser.yml
@@ -2145,11 +2145,11 @@
   user_agent: Mozilla/5.0 (Linux; Android 7.0; INTEX AQUA SELFIE Build/NRD90M;) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.116 Mobile Safari/537.36 JioBrowser/1.4.2
   client:
     type: browser
-    name: Jio Browser
+    name: JioSphere
     version: "1.4.2"
     engine: Blink
     engine_version: "77.0.3865.116"
-    family:
+    family: Chrome
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.87 Safari/537.36 Hola/1.148.217
   client:
@@ -3711,11 +3711,11 @@
   user_agent: Mozilla/5.0 (Linux; Android 10; AC2001) AppleWebKit/537.36 (KHTML, like Gecko) JioPages/2.0 Chrome/83.0.4103.96 Mobile Safari/537.36
   client:
     type: browser
-    name: Jio Browser
+    name: JioSphere
     version: "2.0"
     engine: Blink
     engine_version: "83.0.4103.96"
-    family:
+    family: Chrome
 -
   user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:36.0) Gecko/20100101 Firefox/36.0 PolyBrowser/36.0
   client:
@@ -4904,7 +4904,7 @@
   user_agent: Mozilla/5.0 (Linux; Android 11; M1908C3JGG Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/97.0.4692.87 Mobile Safari/537.36
   client:
     type: browser
-    name: JioPages
+    name: JioSphere
     version: ""
     engine: Blink
     engine_version: "97.0.4692.87"
@@ -7574,13 +7574,24 @@
   user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/115.0.0.0 Safari/537.36 Norton/115.0.21984.175
   client:
     type: browser
-    name: Norton Secure Browser
+    name: Norton Private Browser
     version: 115.0.21984.175
     engine: Blink
     engine_version: 115.0.0.0
     family: Chrome
   headers:
     Sec-CH-UA: '"Not/A)Brand";v="99.0.0.0", "Norton Secure Browser";v="115.0.21984.175", "Chromium";v="115.0.21984.175"'
+-
+  user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36 Norton/121.0.0.0
+  client:
+    type: browser
+    name: Norton Private Browser
+    version: 121.0.23861.160
+    engine: Blink
+    engine_version: 121.0.0.0
+    family: Chrome
+  headers:
+    Sec-CH-UA: '"Not A(Brand";v="99.0.0.0", "Norton Private Browser";v="121.0.23861.160", "Chromium";v="121.0.23861.160"'
 -
   user_agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Mobile Alva/113.0.0.0 Mobile Safari/537.36
   client:
@@ -8343,6 +8354,46 @@
     family: Chrome
   headers:
     http-x-requested-with: com.go.browser
+-
+  user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 SberBrowser/11.2.68.1
+  client:
+    type: browser
+    name: SberBrowser
+    version: 11.2.68.1
+    engine: Blink
+    engine_version: 119.0.0.0
+    family: Chrome
+-
+  user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5026.0 Safari/537.36 Edg/103.0.1254.0
+  client:
+    type: browser
+    name: Microsoft Edge
+    version: 103.0.1254.0
+    engine: Blink
+    engine_version: 103.0.5026.0
+    family: Internet Explorer
+  headers:
+    Sec-CH-UA: '"Edge";v="103", "Chromium";v="103", "Not=A?Brand";v="24"'
+-
+  user_agent: Mozilla/5.0 (Linux; Android 11; TECNO KG7h Build/RP1A.200720.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/116.0.0.0 Mobile Safari/537.36
+  client:
+    type: browser
+    name: Chrome Webview
+    version: 116.0.5845.164
+    engine: Blink
+    engine_version: 116.0.0.0
+    family: Chrome
+  headers:
+    Sec-CH-UA: '"Chromium";v="116.0.5845.164", "Not)A;Brand";v="24.0.0.0", "Android WebView";v="116.0.5845.164"'
+-
+  user_agent: Mozilla/5.0 (Linux; Android 12; AC2001) AppleWebKit/537.36 (KHTML, like Gecko) JioSphere/5.0 Chrome/111.0.5563.58 Mobile Safari/537.36
+  client:
+    type: browser
+    name: JioSphere
+    version: "5.0"
+    engine: Blink
+    engine_version: 111.0.5563.58
+    family: Chrome
 -
   user_agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.5735.289 Safari/537.36
   client:

diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -4289,3 +4289,27 @@
     version: "7"
     platform: ""
     family: Android
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.1) Gecko/20060324 Ubuntu/dapper Firefox/52.5.0
+  os:
+    name: Ubuntu
+    short_name: UBT
+    version: "6.06"
+    platform: x86
+    family: GNU/Linux
+-
+  user_agent: Mozilla/5.0 (X11; U; Linux i686; nl; rv:1.8.0.4) Gecko/20060608 Ubuntu/dapper-security Firefox/52.4.1
+  os:
+    name: Ubuntu
+    short_name: UBT
+    version: "6.06"
+    platform: x86
+    family: GNU/Linux
+-
+  user_agent: Zeasn/2.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/49.0.2623.87 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-NT563LA-LF1V250 (WESTPOINT,TETS-4919SM,wireless)
+  os:
+    name: Whale OS
+    short_name: WHS
+    version: "1"
+    platform: ""
+    family: Other Smart TV
diff --git a/Tests/fixtures/tv-1.yml b/Tests/fixtures/tv-1.yml
@@ -6677,8 +6677,8 @@
 -
   user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i;CE-HTML/1.0;U;en), Chrome/42.0.2311.152 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_nt563/V8-NT563LA-LF1V140 (KALLEY,43D1800,wireless)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ARM
   client:
     type: browser
@@ -6690,7 +6690,7 @@
     type: tv
     brand: Kalley
     model: 43D1800
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Mozilla/5.0 (Linux; Android 4.4.2; NEO-X8) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36

diff --git a/Tests/fixtures/tv.yml b/Tests/fixtures/tv.yml
@@ -6703,74 +6703,74 @@
 -
   user_agent: Zeasn/2.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/49.0.2623.87 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-NT563LA-LF1V250 (WESTPOINT,TETS-4919SM,wireless)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ""
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "49.0.2623.87"
+    engine_version: 49.0.2623.87
   device:
     type: tv
     brand: Westpoint
     model: TETS-4919SM
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/42.0.2311.152 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_nt563/V8-NT563LA-LF1V286 (KALLEY,55D1240,wireless)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ""
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "42.0.2311.152"
+    engine_version: 42.0.2311.152
   device:
     type: tv
     brand: Kalley
     model: 55D1240
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/49.0.2623.87 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-N563T01-LF1V196 (TCL,43S62FS,wired)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ""
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "49.0.2623.87"
+    engine_version: 49.0.2623.87
   device:
     type: tv
     brand: TCL
     model: 43S62FS
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/42.0.2311.152 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_nt563/V8-NT563NA-LF1V278 (JVC,32D1290,wireless)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ""
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "42.0.2311.152"
+    engine_version: 42.0.2311.152
   device:
     type: tv
     brand: JVC
     model: 32D1290
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Mozilla/5.0 (Linux armv7l) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.130 Safari/537.36 OPR/31.0.1890.0 OMI/4.6.1.40.Dominik2.175 VSTVB MB100 HbbTV/1.2.1 (; JVC; MB110; 2.21.7.0; ;) SmartTvA/3.0.0
@@ -7027,56 +7027,56 @@
 -
   user_agent: Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i;CE-HTML/1.0;U;en), Chrome/61.0.3163.100 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-NT563LA-LF1V200 (AKAI,AK3219NF,wireless)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ARM
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "61.0.3163.100"
+    engine_version: 61.0.3163.100
   device:
     type: tv
     brand: Akai
     model: AK3219NF
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Opera/9.80 Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i;CE-HTML/1.0;U;en), Chrome/42.0.2311.152 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_MT5655/V8-S586T02-LF1V052 (THOMSON,55UC6306,wired)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ARM
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "42.0.2311.152"
+    engine_version: 42.0.2311.152
   device:
     type: tv
     brand: Thomson
     model: 55UC6306
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: 'Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux;CE-HTML/1.0;U;en), Chrome/49.0.2623.87 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_UNKONWN/V8-S586T02-LF1V425 (TCL,U43P60*6,wired)'
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ""
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "49.0.2623.87"
+    engine_version: 49.0.2623.87
   device:
     type: tv
     brand: TCL
     model: U43P60
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Opera/9.80 (Linux mips; ) Presto/2.12.407 Version/12.51 MB95/3.3.8.n (AKAI, Si2157LG32, wireless)
@@ -7567,20 +7567,20 @@
 -
   user_agent: Opera/9.80 Zeasn/2.0 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i;CE-HTML/1.0;U;en), Chrome/42.0.2311.152 Safari/537.36 AppleWebKit 537.36 (KHTML, like Gecko) Tbrowser/2.0, _TV_MT5655/V8-S586T02-LF1V089 (THOMSON,49UC6306,wired)
   os:
-    name: GNU/Linux
-    version: ""
+    name: Whale OS
+    version: "1"
     platform: ARM
   client:
     type: browser
     name: T-Browser
     version: "2.0"
     engine: Blink
-    engine_version: "42.0.2311.152"
+    engine_version: 42.0.2311.152
   device:
     type: tv
     brand: Thomson
     model: 49UC6306
-  os_family: GNU/Linux
+  os_family: Other Smart TV
   browser_family: Chrome
 -
   user_agent: Opera/9.80 NETTV/4.5.0 Mozilla/5.0 (Linux armv7i; CE-HTML/1.0; U; en) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.75 Safari/537.36 NETRANGEMMH Tbrowser/2.0 _TV_NT563/V8-NT563LA-LF1V380 (Panasonic_S,43D1270,wireless)

diff --git a/regexes/bots.yml b/regexes/bots.yml
@@ -4321,5 +4321,5 @@
   name: 'Generic Bot'
 
 # Generic detections
-- regex: '[a-z0-9_-]*(?:(?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|analyzer|appengine|archiver|checker|collector|crawl|crawler|fetcher|indexer|inspector|monitor|project(?!or)|(?<!Google Wap )proxy|research|resolver|robots|scanner|scraper|script|searcher|security|spider|study|transcoder|uptime|user[ _]?agent|validator)(?:[^a-z]|$)'
+- regex: '[a-z0-9_-]*(?:(?<!cu|power[ _]|m[ _])bot(?![ _]TAB|[ _]?5[0-9]|[ _]Senior|[ _]Junior)|analyzer|appengine|archiver|checker|collector|crawl|crawler|fetcher|indexer|inspector|monitor|project(?!or)|(?<!Google Wap )proxy|research|resolver|robots|scanner|scraper|script|searcher|(?<!dapper-)security|spider|study|transcoder|uptime|user[ _]?agent|validator)(?:[^a-z]|$)'
   name: 'Generic Bot'