summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-03-15 13:15:40 +0100
committerGitHub <noreply@github.com>2020-03-15 13:15:40 +0100
commit0ffa598136b056c2a468595cc149fe56af2ea7d6 (patch)
tree0fa5397cc62f71aedd941edf1bb28e95f50d4f82
parentf295695b7e77e1c76ee9c61c00a96ff61d79cb6a (diff)
parentf11dee9bc42fb087365757096ac7ae78217de88b (diff)
downloadnextcloud-server-0ffa598136b056c2a468595cc149fe56af2ea7d6.tar.gz
nextcloud-server-0ffa598136b056c2a468595cc149fe56af2ea7d6.zip
Merge pull request #19954 from roscomputing/fix/19941/fix_safari_useragent
fix safari useragent for versions with 3 digits
-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)) {