Adds detection for FRITZ!OS (matomo-org#7602)

liviuconcioiu · Feb 19, 2024 · 61bbb71 · 61bbb71
1 parent c08af8e
commit 61bbb71
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php
@@ -74,6 +74,7 @@ class OperatingSystem extends AbstractParser
         'FOR' => 'Foresight Linux',
         'FRE' => 'Freebox',
         'BSD' => 'FreeBSD',
+        'FRI' => 'FRITZ!OS',
         'FYD' => 'FydeOS',
         'FUC' => 'Fuchsia',
         'GNT' => 'Gentoo',
@@ -213,7 +214,7 @@ class OperatingSystem extends AbstractParser
             'LOS', 'DVK', 'ROK', 'OWR', 'OTV', 'KTV', 'PUR', 'PLA', 'FUC', 'PAR',
             'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', 'CST',
             'NOV', 'ROU', 'ZOR', 'RED', 'KAL', 'ORA', 'VID', 'TIV', 'BSN', 'RAS',
-            'UOS', 'PIO',
+            'UOS', 'PIO', 'FRI',
         ],
         'Mac'                   => ['MAC'],
         'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'],

diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -4273,6 +4273,14 @@
     version: ""
     platform: ""
     family: Mac
+-
+  user_agent: FeedDaemon FRITZ!OS/07.12 Linux/2.6.39.3
+  os:
+    name: FRITZ!OS
+    short_name: FRI
+    version: "7.12"
+    platform: ""
+    family: GNU/Linux
 -
   user_agent: Mozilla/5.0 (Linux; Android 9; AEOAT) AppleWebKit/537.36 (KHTML, like Gecko) Silk/112.6.3 like Chrome/112.0.5615.213 Safari/537.36
   os:

diff --git a/regexes/oss.yml b/regexes/oss.yml
@@ -5,6 +5,13 @@
 # @license http://www.gnu.org/licenses/lgpl.html LGPL v3 or later
 ###############
 
+##########
+# FRITZ!OS (https://en.avm.de/products/fritzos/)
+##########
+- regex: 'FRITZ!OS(?:/0(\d+[\.\d]+))?'
+  name: 'FRITZ!OS'
+  version: '$1'
+
 ##########
 # UOS (https://www.chinauos.com/)
 ##########