Skip to content

[stable23] Fix detection of firefox in ContentSecurityPolicyNonceManager #33070

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.

Sign up for GitHub

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

Merged
CarlSchwan merged 1 commit into from
Jun 30, 2022
Merged

[stable23] Fix detection of firefox in ContentSecurityPolicyNonceManager #33070

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix detection of firefox in ContentSecurityPolicyNonceManager 
Reuse Request::USER_AGENT_FIREFOX, and also update the safari detection
since safari < 12 is not supported anymore and we can remove a bit of
code duplication

Signed-off-by: Carl Schwan <[email protected]>
  • Loading branch information
@CarlSchwan @backportbot-nextcloud
CarlSchwan authored and backportbot-nextcloud[bot] committed Jun 30, 2022
commit 8ec3c2650f405c2bc8246d06c6f5b5cc529db34b
6 changes: 2 additions & 4 deletions lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@ public function getNonce(): string {
public function browserSupportsCspV3(): bool {
$browserWhitelist = [
Request::USER_AGENT_CHROME,
// Firefox 45+
'/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
// Safari 12+
'/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/(?:1[2-9]|[2-9][0-9])\.[0-9]+(?:\.[0-9]+)? Safari\/[0-9.A-Z]+$/',
Request::USER_AGENT_FIREFOX,
Request::USER_AGENT_SAFARI,
];

if ($this->request->isUserAgent($browserWhitelist)) {
Expand Down