Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds detection for Pacific Research Alliance, Panavox and TTfone brands, improves detection for AOC, Bush, Cat, Daewoo, Finlux, Hitachi, Linsar, Pioneer, Quantum, Ravoz, RCA Tablets, Safaricom, TAG Tech, Thomson, VEON and X-View brands, adds detection for Armadillo OS and HELIX OS, improves detection for Android TV, adds detection for Basic Web Browser, EudoraWeb, Freespoke, MaxBrowser, MixerBox AI and YouBrowser #7600

Merged
merged 45 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a082413
Adds detection for EudoraWeb
liviuconcioiu Feb 18, 2024
ec5ade4
Adds detection for Basic Web Browser
liviuconcioiu Feb 18, 2024
2deb857
Improves detection for VEON brand
liviuconcioiu Feb 18, 2024
45d18dc
Improves detection for Android TV
liviuconcioiu Feb 18, 2024
eceec13
Improves detection for Android TV
liviuconcioiu Feb 18, 2024
4534315
Adds detection for Panavox brand
liviuconcioiu Feb 18, 2024
681665c
Improves detection for Android TV
liviuconcioiu Feb 18, 2024
706c8b5
Adds detection for MixerBox AI
liviuconcioiu Feb 18, 2024
0404ae9
Adds detection for YouBrowser
liviuconcioiu Feb 18, 2024
93a4da3
Adds detection for Freespoke
liviuconcioiu Feb 18, 2024
e461eb1
Adds detection for MaxBrowser
liviuconcioiu Feb 18, 2024
9a782a9
Improves detection for RCA Tablets
liviuconcioiu Feb 18, 2024
2bf26c8
Improves detection for Thomson
liviuconcioiu Feb 18, 2024
796103b
Improves detection for Bush
liviuconcioiu Feb 18, 2024
7078867
Improves model detection for Finlux, Linsar
liviuconcioiu Feb 18, 2024
e0f6713
Improves detection for Hitachi
liviuconcioiu Feb 18, 2024
f4d58e4
Improves detection for AOC
liviuconcioiu Feb 18, 2024
ca7cb5a
Adds detection for Armadillo OS
liviuconcioiu Feb 18, 2024
545d9eb
Adds detection for Pacific Research Alliance
liviuconcioiu Feb 18, 2024
1595be6
Adds detection for HELIX OS
liviuconcioiu Feb 18, 2024
63cc437
Adds detection for TTfone brand
liviuconcioiu Feb 18, 2024
a84f906
Improves detection for X-View
liviuconcioiu Feb 18, 2024
ee90b15
Improves detection for Quantum
liviuconcioiu Feb 18, 2024
d4f74a4
Improves detection for TAG Tech
liviuconcioiu Feb 18, 2024
251b9ec
Improves detection for Safaricom
liviuconcioiu Feb 18, 2024
39ce7a8
Improves detection for Ravoz
liviuconcioiu Feb 18, 2024
e1606e7
Improves detection for Cat
liviuconcioiu Feb 18, 2024
94f4b7f
Improves detection for Daewoo, Hitachi, Pioneer, Safaricom
liviuconcioiu Feb 18, 2024
ded8dc7
Fix regex
liviuconcioiu Feb 18, 2024
e6317a0
Fix regex
liviuconcioiu Feb 18, 2024
5fdb9a2
Merge branch 'master' into devices1
liviuconcioiu Feb 19, 2024
b74bb7a
Merge branch 'master' into devices1
liviuconcioiu Feb 19, 2024
62bdca1
Merge branch 'master' into devices1
liviuconcioiu Feb 19, 2024
e12d1fd
Change Freespoke from browser to mobile app
liviuconcioiu Feb 24, 2024
426bcb5
Merge branch 'master' into devices1
liviuconcioiu Feb 29, 2024
e028c58
Merge branch 'master' into devices1
liviuconcioiu Mar 1, 2024
7199784
Merge branch 'master' into devices1
liviuconcioiu Mar 5, 2024
1ed56a9
Fix tests
liviuconcioiu Mar 5, 2024
0216d96
Merge branch 'master' into devices1
liviuconcioiu Mar 7, 2024
15d5996
Merge branch 'master' into devices1
liviuconcioiu Mar 11, 2024
5de26be
Merge branch 'master' into devices1
liviuconcioiu Mar 11, 2024
f8c3706
Fix short code for East Browser
liviuconcioiu Mar 11, 2024
5428202
Revert "Fix short code for East Browser"
liviuconcioiu Mar 11, 2024
13edcea
Fix short code for EudoraWeb
liviuconcioiu Mar 11, 2024
d26e68e
Merge branch 'master' into devices1
liviuconcioiu Mar 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Parser/Client/Browser.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ class Browser extends AbstractClientParser
'VG' => 'AVG Secure Browser',
'AC' => 'Avira Secure Browser',
'A1' => 'AwoX',
'5B' => 'Basic Web Browser',
'BA' => 'Beaker Browser',
'BM' => 'Beamrise',
'F7' => 'BF Browser',
Expand Down Expand Up @@ -231,6 +232,7 @@ class Browser extends AbstractClientParser
'EO' => 'Eolie',
'EX' => 'Explore Browser',
'EZ' => 'eZ Browser',
'E2' => 'EudoraWeb',
'EU' => 'EUI Browser',
'EP' => 'GNOME Web',
'G1' => 'G Browser',
Expand Down Expand Up @@ -363,6 +365,7 @@ class Browser extends AbstractClientParser
'L2' => 'Lynket Browser',
'MD' => 'Mandarin',
'M5' => 'MarsLab Web Browser',
'M7' => 'MaxBrowser',
'M1' => 'mCent',
'MB' => 'MicroB',
'MC' => 'NCSA Mosaic',
Expand All @@ -372,6 +375,7 @@ class Browser extends AbstractClientParser
'MF' => 'Mobile Safari',
'MI' => 'Midori',
'M3' => 'Midori Lite',
'M6' => 'MixerBox AI',
'MO' => 'Mobicip',
'MU' => 'MIUI Browser',
'MS' => 'Mobile Silk',
Expand Down Expand Up @@ -627,6 +631,7 @@ class Browser extends AbstractClientParser
'Y2' => 'Yo Browser',
'YB' => 'Yolo Browser',
'YO' => 'YouCare',
'Y3' => 'YouBrowser',
'YZ' => 'Yuzu Browser',
'XR' => 'xBrowser',
'XB' => 'X Browser Lite',
Expand Down Expand Up @@ -686,7 +691,7 @@ class Browser extends AbstractClientParser
'ZR', 'D6', 'F6', 'RC', 'WD', 'P3', 'FT', 'A9', 'X2',
'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'P5', 'H5', 'V3',
'K3', 'Q4', 'G2', 'R2', 'WX', 'XP', '3I', 'BG', 'R0',
'JO', 'OL', 'GN', 'W4', 'QI', 'E1', 'RI', '8B',
'JO', 'OL', 'GN', 'W4', 'QI', 'E1', 'RI', '8B', '5B',
],
'Firefox' => [
'AX', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1',
Expand Down Expand Up @@ -729,7 +734,8 @@ class Browser extends AbstractClientParser
'1W', 'EV', 'Z0', 'I9', 'V4', 'H4', 'M5', '0S', '0C',
'ZR', 'D6', 'F6', 'P3', 'FT', 'A9', 'X2', 'NI', 'FG',
'TH', 'N3', 'GD', 'O9', 'Q3', 'F7', 'K2', 'N4', 'P5',
'H5', 'V3', 'G2', 'BG', 'OL', 'II', 'TL', 'GN',
'H5', 'V3', 'G2', 'BG', 'OL', 'II', 'TL', 'M6', 'Y3',
'M7', 'GN',
];

/**
Expand Down
3 changes: 3 additions & 0 deletions Parser/Device/AbstractDeviceParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -1223,10 +1223,12 @@ abstract class AbstractDeviceParser extends AbstractParser
'OZ' => 'OzoneHD',
'OLL' => 'Ollee',
'7P' => 'P-UP',
'PRA' => 'Pacific Research Alliance',
'YP' => 'Paladin',
'PM' => 'Palm',
'PN' => 'Panacom',
'PA' => 'Panasonic',
'PNV' => 'Panavox',
'PT' => 'Pantech',
'PAN' => 'Pano',
'PND' => 'Panodic',
Expand Down Expand Up @@ -1617,6 +1619,7 @@ abstract class AbstractDeviceParser extends AbstractParser
'J1' => 'Trio',
'THT' => 'Tsinghua Tongfang',
'5C' => 'TTEC',
'TTF' => 'TTfone',
'TTK' => 'TTK-TV',
'TU' => 'Tunisie Telecom',
'1T' => 'Turbo',
Expand Down
5 changes: 4 additions & 1 deletion Parser/OperatingSystem.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class OperatingSystem extends AbstractParser
'ADR' => 'Android TV',
'AMZ' => 'Amazon Linux',
'AMG' => 'AmigaOS',
'ARM' => 'Armadillo OS',
'ATV' => 'tvOS',
'ARL' => 'Arch Linux',
'BTR' => 'BackTrack',
Expand Down Expand Up @@ -85,6 +86,7 @@ class OperatingSystem extends AbstractParser
'IPA' => 'iPadOS',
'HAR' => 'HarmonyOS',
'HAS' => 'HasCodingOS',
'HEL' => 'HELIX OS',
'IRI' => 'IRIX',
'INF' => 'Inferno',
'JME' => 'Java ME',
Expand Down Expand Up @@ -196,7 +198,8 @@ class OperatingSystem extends AbstractParser
protected static $osFamilies = [
'Android' => [
'AND', 'CYN', 'FIR', 'REM', 'RZD', 'MLD', 'MCD', 'YNS', 'GRI', 'HAR',
'ADR', 'CLR', 'BOS', 'REV', 'LEN', 'SIR', 'RRS', 'WER', 'PIC',
'ADR', 'CLR', 'BOS', 'REV', 'LEN', 'SIR', 'RRS', 'WER', 'PIC', 'ARM',
'HEL',
],
'AmigaOS' => ['AMG', 'MOR'],
'BlackBerry' => ['BLB', 'QNX'],
Expand Down
47 changes: 47 additions & 0 deletions Tests/Parser/Client/fixtures/browser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8289,6 +8289,53 @@
family: Chrome
headers:
http-x-requested-with: com.go.browser
-
user_agent: Mozilla/1.22 (compatible; MSIE 5.01; PalmOS 3.0) EudoraWeb 2.1
client:
type: browser
name: EudoraWeb
version: "2.1"
engine:
engine_version:
family:
-
user_agent: Dalvik/2.1.0 (Linux; U; Android 11; VEON 4K Smart TV Build/RTT2.220103.001)
client:
type: browser
name: Basic Web Browser
version:
engine: WebKit
engine_version:
family: Android Browser
headers:
http-x-requested-with: com.apgsolutionsllc.APGSOLUTIONSLLC0007
-
user_agent: Mozilla/5.0 (Android 11; Mobile; rv:107.0) Gecko/107.0 Firefox/107.0 MixerBox-Browser
client:
type: browser
name: MixerBox AI
version: ""
engine: Gecko
engine_version: "107.0"
family:
-
user_agent: Mozilla/5.0 (Android 12; Mobile; rv:109.0) Gecko/119.0 Firefox/119.0 YouBrowser/1.4.12
client:
type: browser
name: YouBrowser
version: 1.4.12
engine: Gecko
engine_version: "119.0"
family:
-
user_agent: Mozilla/5.0 (Android 9; Mobile; rv:109.0) Gecko/111.0 MaxBrowser/111.0
client:
type: browser
liviuconcioiu marked this conversation as resolved.
Show resolved Hide resolved
name: MaxBrowser
version: "111.0"
engine: Gecko
engine_version: "111.0"
family:
-
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:
Expand Down
12 changes: 12 additions & 0 deletions Tests/Parser/Client/fixtures/mobile_app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1733,6 +1733,18 @@
type: mobile app
name: WhatsApp Business
version: 2.22.2
-
user_agent: Mozilla/5.0 (Android 13; Mobile; rv:109.0) Gecko/112.0 Firefox/112.0 Freespoke/2.0.0
client:
type: mobile app
name: Freespoke
version: 2.0.0
-
user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 17_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/113.1 Mobile/15E148 Safari/605.1.15 Freespoke/2.0.0
client:
type: mobile app
name: Freespoke
version: 2.0.0
-
user_agent: Google/303.0.605094169 CFNetwork/1410.1 Darwin/22.6.0
client:
Expand Down
40 changes: 40 additions & 0 deletions Tests/Parser/fixtures/oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4273,6 +4273,46 @@
version: ""
platform: ""
family: Mac
-
user_agent: Dalvik/2.1.0 (Linux; U; Android 11; Smart TV Build/RP1A.200622.001)
os:
name: Android TV
short_name: ADR
version: "11"
platform: ""
family: Android
-
user_agent: Dalvik/2.1.0 (Linux; U; Android 9; SmartTV Build/RTK2842P)
os:
name: Android TV
short_name: ADR
version: "9"
platform: ""
family: Android
-
user_agent: Mozilla/5.0 (Linux; Android 9; SMART_TV Build/PPR1.180610.011; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/66.0.3359.158 Safari/537.36
os:
name: Android TV
short_name: ADR
version: "9"
platform: ""
family: Android
-
user_agent: Mozilla/5.0 (Linux; Android 10; Armadillo Phone) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.81 Mobile Safari/537.36
os:
name: Armadillo OS
short_name: ARM
version: ""
platform: ARM
family: Android
-
user_agent: Mozilla/5.0 (Linux; Android 10; Helix Phone) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.127 Mobile Safari/537.36
os:
name: HELIX OS
short_name: HEL
version: ""
platform: ""
family: Android
-
user_agent: FeedDaemon FRITZ!OS/07.12 Linux/2.6.39.3
os:
Expand Down
10 changes: 5 additions & 5 deletions Tests/fixtures/podcasting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7241,19 +7241,19 @@
os_family: Android
browser_family: Unknown
-
user_agent: 'Mozilla/5.0 (Mobile; Safaricom_Kimem_Kerefa_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 PodKast'
user_agent: Mozilla/5.0 (Mobile; Safaricom_Kimem_Kerefa_4G; rv:48.0; CAEN) Gecko/48.0 Firefox/48.0 KAIOS/2.5.3.2 PodKast
os:
name: KaiOS
version: "2.5.3.2"
version: 2.5.3.2
platform: ""
client:
type: mobile app
name: PodKast
version: ""
device:
type: ""
brand: ""
model: ''
type: smartphone
brand: Safaricom
model: Kimem Kerefa 4G
os_family: Firefox OS
browser_family: Unknown
-
Expand Down
Loading
Loading