summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-03-17 15:10:21 +0100
committerGitHub <noreply@github.com>2020-03-17 15:10:21 +0100
commit6f5a389f0f580fe5d306cc0d5275c44cc7127ddf (patch)
tree81d3f3f9d63f901a24fa6558506f608ee93e3849 /lib
parentd5a850735936c06c4818bbe762398137d7fae6cf (diff)
parentcb4589153869a91d7efc17ff387268698c64cef1 (diff)
downloadnextcloud-server-6f5a389f0f580fe5d306cc0d5275c44cc7127ddf.tar.gz
nextcloud-server-6f5a389f0f580fe5d306cc0d5275c44cc7127ddf.zip
Merge pull request #19966 from nextcloud/backport/19954/stable18
[stable18] fix safari useragent for versions with 3 digits
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
index 773cde18a9a..7298fbe2eda 100644
--- a/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
+++ b/lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php
@@ -82,7 +82,7 @@ class ContentSecurityPolicyNonceManager {
// 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]+ Safari\/[0-9.A-Z]+$/',
+ '/^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]+$/',
];
if($this->request->isUserAgent($browserWhitelist)) {