From 0e58eb615bdde30cdf73cdfbcd6a1e3b47bf611a Mon Sep 17 00:00:00 2001
From: Liviu-Mihail Concioiu <liviu.concioiu@gmail.com>
Date: Sun, 3 Mar 2024 21:30:39 +0100
Subject: [PATCH] Improves version detection for Ubuntu

---
 Tests/Parser/fixtures/oss.yml | 16 ++++++++++++++++
 regexes/bots.yml              |  2 +-
 regexes/oss.yml               |  4 ++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml
index 8ea6e0376d..d9965dfb16 100644
--- a/Tests/Parser/fixtures/oss.yml
+++ b/Tests/Parser/fixtures/oss.yml
@@ -4289,3 +4289,19 @@
     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
diff --git a/regexes/bots.yml b/regexes/bots.yml
index a32750f050..930d6faea1 100644
--- a/regexes/bots.yml
+++ b/regexes/bots.yml
@@ -4242,5 +4242,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|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|scraper|script|searcher|(?<!dapper-)security|spider|study|transcoder|uptime|user[ _]?agent|validator)(?:[^a-z]|$)'
   name: 'Generic Bot'
diff --git a/regexes/oss.yml b/regexes/oss.yml
index 109baa8c54..f8d84ea456 100644
--- a/regexes/oss.yml
+++ b/regexes/oss.yml
@@ -681,6 +681,10 @@
   name: 'ZorinOS'
   version: '$1'
 
+- regex: 'Ubuntu/dapper'
+  name: 'Ubuntu'
+  version: '6.06'
+
 - regex: 'Linux; .*((?:Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Sabayon|Slackware|SUSE|CentOS|BackTrack))[ /](\d+[\.\d]+)'
   name: '$1'
   version: '$2'