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 <carl@carlschwan.eu>
This commit is contained in:
Carl Schwan 2022-06-29 17:05:48 +02:00
parent 1952d6e9b4
commit ca3cd5a625

View file

@ -80,10 +80,8 @@ class ContentSecurityPolicyNonceManager {
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)) {