Improves version detection for Opera and Opera Mobile and improves browser version detection for client hints #7065
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -442,6 +442,7 @@ class Browser extends AbstractClientParser | |
| 'VV' => 'vivo Browser', | ||
| 'VB' => 'Vision Mobile Browser', | ||
| 'VM' => 'VMware AirWatch', | ||
| 'WB' => 'Wave Browser', | ||
| 'WI' => 'Wear Internet Browser', | ||
| 'WP' => 'Web Explorer', | ||
| 'WE' => 'WebPositive', | ||
|
|
@@ -493,7 +494,7 @@ class Browser extends AbstractClientParser | |
| 'HP', 'IO', 'TP', 'CJ', 'HQ', 'HI', 'NA', 'BW', 'YO', | ||
| 'DC', 'G8', 'DT', 'AP', 'AK', 'UI', 'SD', 'VN', '4S', | ||
| '2S', 'RF', 'LR', 'SQ', 'BV', 'L1', 'F0', 'KS', 'V0', | ||
| 'C8', 'AZ', 'MM', 'BT', 'N0', 'P0', 'F3', 'VS', 'WB', | ||
| ], | ||
| 'Firefox' => [ | ||
| 'AX', 'BI', 'BF', 'BH', 'BN', 'C0', 'CU', 'EI', 'F1', | ||
|
|
@@ -656,7 +657,7 @@ public function parse(): ?array | |
| $engine = ''; | ||
| $engineVersion = ''; | ||
|
|
||
| // If client hints report Chromium, but user agent detects a Chromium based browser, we favor this instead | ||
| if ('Chromium' === $name | ||
| && !empty($browserFromUserAgent['name']) | ||
| && 'Chromium' !== $browserFromUserAgent['name'] | ||
|
|
@@ -684,14 +685,21 @@ public function parse(): ?array | |
| if ($name === $browserFromUserAgent['name']) { | ||
| $engine = $browserFromUserAgent['engine'] ?? ''; | ||
| $engineVersion = $browserFromUserAgent['engine_version'] ?? ''; | ||
| } | ||
|
|
||
| // In case the user agent reports a more detailed version, we try to use this instead | ||
| if (!empty($browserFromUserAgent['version']) | ||
| && 0 === \strpos($browserFromUserAgent['version'], $version) | ||
| && \version_compare($version, $browserFromUserAgent['version'], '<') | ||
| ) { | ||
| $version = $browserFromUserAgent['version']; | ||
| } | ||
|
|
||
| // If client hints report Opera or Opera Mobile, we use the version from useragent | ||
| if (!empty($browserFromUserAgent['version']) | ||
| && ('OP' === $short || 'OM' === $short) | ||
|
There was a problem hiding this comment. Is it known that Opera always reports an incorrect version in the client hints? 🤔 There was a problem hiding this comment. From the data I have, everything is incorrect, just for those two browser. There was a problem hiding this comment. Hm. I'm not sure how we should handle that. If the browsers might freeze the useragent at some point I'm not sure if the version in useragent will be even updated with new releases or if the number can only be fetched through client hints 🤔 There was a problem hiding this comment. Should I close this PR then? There was a problem hiding this comment. @sanchezzzhak what do you think about that? There was a problem hiding this comment. The current changes give an accurate result. |
||
| ) { | ||
| $version = $browserFromUserAgent['version']; | ||
| } | ||
| } else { | ||
| $name = $browserFromUserAgent['name']; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shouldn't be moved outside of the if condition. Let's assume the client hints report a
Firefox 16, but the useragent is spoofed by some tool and containsSafari 20.18. We would then end up usingFirefox 20.18, which is wrong.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And, how can we detect the full version then? Some times, client hints don't provide
Sec-CH-UA-Full-VersionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In most cases the browser reported in client hints and in user agent should match. In that case the version from user agent will be used. If not I'm not sure if we should simply use the version from useragent.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it turns out to be interesting here, opera prints all versions in clienthints
04/04/2022
last version Opera Desktop Linux 85
last version Opera Mobile 68.2
if you look at this list, they just printed versions for all OS
the current tests I am satisfied with the result.
But in the future it will be necessary to come up with something else when useragent is gone.
as an option:
if Mobile OS + opera family get clienthint
OperaMobile=68if Desktop OS + opera family get
Opera=82