Improves version detection for iOS and macOS

matomo-org · Apr 4, 2024 · 98e6796 · 98e6796
1 parent b095639
commit 98e6796
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
@@ -4582,3 +4582,19 @@
     version: "9"
     platform: ""
     family: Android
+-
+  user_agent: myTuneriOS/55 CFNetwork/1496.0.1 Darwin/23.5.0
+  os:
+    name: iOS
+    short_name: IOS
+    version: "17.5"
+    platform: ""
+    family: iOS
+-
+  user_agent: Safari/19618.2.4.11.2 CFNetwork/1496.0.1 Darwin/23.5.0
+  os:
+    name: Mac
+    short_name: MAC
+    version: "14.5"
+    platform: ""
+    family: Mac
diff --git a/regexes/oss.yml b/regexes/oss.yml
@@ -1037,6 +1037,8 @@
 - regex: '^(?!com\.apple\.Safari\.SearchHelper|Safari).*(?:CFNetwork|Mana)/.+ Darwin/(\d+[\.\d]+)(?!.*(?:x86_64|i386|PowerMac|Power%20Macintosh))'
   name: 'iOS'
   versions:
+    - regex: 'Darwin/23\.5\.0'
+      version: '17.5'
     - regex: 'Darwin/23\.4\.0'
       version: '17.4'
     - regex: 'Darwin/23\.3\.0'
@@ -1260,6 +1262,8 @@
 - regex: '(?:CFNetwork|Mana|StudioDisplay)/.+Darwin(?:/|; )(?:[\d\.]+).+(?:x86_64|i386|Power%20Macintosh)|(?:x86_64-apple-)?darwin(?:[\d\.]+)|PowerMac|com\.apple\.Safari\.SearchHelper|^Safari'
   name: 'Mac'
   versions:
+    - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.5\.0'
+      version: '14.5'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.4\.0'
       version: '14.4'
     - regex: '(?:x86_64-apple-)?Darwin(?:/|; )?23\.3\.0'