Merge pull request #33070 from nextcloud/backport/33065/stable23

[stable23] Fix detection of firefox in ContentSecurityPolicyNonceManager
nextcloud · Jun 30, 2022 · 26a4435 · 26a4435
2 parents 36aff74 + 8ec3c26
commit 26a4435
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
@@ -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)) {