diff --git a/Parser/OperatingSystem.php b/Parser/OperatingSystem.php index 0d162d5393..0c4082579b 100644 --- a/Parser/OperatingSystem.php +++ b/Parser/OperatingSystem.php @@ -56,6 +56,7 @@ class OperatingSystem extends AbstractParser 'BMP' => 'Brew', 'CAI' => 'Caixa Mágica', 'CES' => 'CentOS', + 'CST' => 'CentOS Stream', 'CLR' => 'ClearOS Mobile', 'COS' => 'Chrome OS', 'CRS' => 'Chromium OS', @@ -191,7 +192,7 @@ class OperatingSystem extends AbstractParser 'RHT', 'VLN', 'MDR', 'GNT', 'SAB', 'SLW', 'SSE', 'CES', 'BTR', 'SAF', 'ORD', 'TOS', 'RSO', 'DEE', 'FRE', 'MAG', 'FEN', 'CAI', 'PCL', 'HAS', 'LOS', 'DVK', 'ROK', 'OWR', 'OTV', 'KTV', 'PUR', 'PLA', 'FUC', 'PAR', - 'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', + 'FOR', 'MON', 'KAN', 'ZEN', 'LND', 'LNS', 'CHN', 'AMZ', 'TEN', 'CST', ], 'Mac' => ['MAC'], 'Mobile Gaming Console' => ['PSP', 'NDS', 'XBX'], diff --git a/Tests/Parser/fixtures/oss.yml b/Tests/Parser/fixtures/oss.yml index 6a36975b33..70ccb9a384 100644 --- a/Tests/Parser/fixtures/oss.yml +++ b/Tests/Parser/fixtures/oss.yml @@ -3365,7 +3365,7 @@ name: TencentOS short_name: TEN version: 4.14.105 - platform: "" + platform: family: GNU/Linux - user_agent: Mozilla/5.0 (Linux; Android 10; bliss_maple) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.58 Mobile Safari/537.36 @@ -3373,5 +3373,37 @@ name: Bliss OS short_name: BOS version: "12" - platform: "" + platform: family: Android +- + user_agent: Roku/DVP (297.70E04154A) + os: + name: Roku OS + short_name: ROK + version: + platform: + family: GNU/Linux +- + user_agent: libdnf (CentOS Stream 8; generic; Linux.x86_64) + os: + name: CentOS Stream + short_name: CST + version: "8" + platform: x64 + family: GNU/Linux +- + user_agent: libdnf (CentOS Stream 9; generic; Linux.x86_64) + os: + name: CentOS Stream + short_name: CST + version: "9" + platform: x64 + family: GNU/Linux +- + user_agent: libdnf (CentOS Linux 8; generic; Linux.x86_64) + os: + name: CentOS + short_name: CES + version: "8" + platform: x64 + family: GNU/Linux diff --git a/regexes/oss.yml b/regexes/oss.yml index 6915e864fe..340f3de374 100644 --- a/regexes/oss.yml +++ b/regexes/oss.yml @@ -382,7 +382,7 @@ name: 'Roku OS' version: '$1' -- regex: 'Roku(?:OS)?/(?:DVP|Pluto)?-?(\d+[\.\d]+)' +- regex: 'Roku(?:OS)?/(?:DVP|Pluto)?-?(\d+[\.\d]+)?' name: 'Roku OS' version: '$1' @@ -435,10 +435,18 @@ name: 'VectorLinux' version: '$1' +- regex: 'CentOS Stream (\d)' + name: 'CentOS Stream' + version: '$1' + - regex: '.+.el(\d+(?:[_\.]\d+)*).(?:centos|x86_64)' name: 'CentOS' version: '$1' +- regex: 'CentOS Linux (\d)' + name: 'CentOS' + version: '$1' + - 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'