composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-25 11:38:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°6934 - Symfony 6.4 - upgrade Symfony bundles to 6.4 (#580)

Browse Source 
* Update Symfony lib to version ~6.4.0
* Update code missing return type
* Add an iTop general configuration entry to store application secret (Symfony mandatory parameter)
* Use dependency injection in ExceptionListener & UserProvider classes
This commit is contained in:
bdalsass
2023-12-05 13:56:56 +01:00
committed by GitHub
parent 863ab4560c
commit 27ce51ab07
1392 changed files with 44869 additions and 27799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/symfony/web-profiler-bundle/Csp/ContentSecurityPolicyHandler.php
View File

@@ -23,8 +23,8 @@ use Symfony\Component\HttpFoundation\Response;
*/
class ContentSecurityPolicyHandler
{
private $nonceGenerator;
private $cspDisabled = false;
private NonceGenerator $nonceGenerator;
private bool $cspDisabled = false;
public function __construct(NonceGenerator $nonceGenerator)
{
@@ -71,7 +71,7 @@ class ContentSecurityPolicyHandler
*
* All related headers will be removed.
*/
public function disableCsp()
public function disableCsp(): void
{
$this->cspDisabled = true;
}
@@ -96,13 +96,13 @@ class ContentSecurityPolicyHandler
return $nonces;
}
private function cleanHeaders(Response $response)
private function cleanHeaders(Response $response): void
{
$response->headers->remove('X-SymfonyProfiler-Script-Nonce');
$response->headers->remove('X-SymfonyProfiler-Style-Nonce');
}
private function removeCspHeaders(Response $response)
private function removeCspHeaders(Response $response): void
{
$response->headers->remove('X-Content-Security-Policy');
$response->headers->remove('Content-Security-Policy');
@@ -180,9 +180,7 @@ class ContentSecurityPolicyHandler
*/
private function generateCspHeader(array $directives): string
{
return array_reduce(array_keys($directives), function ($res, $name) use ($directives) {
return ('' !== $res ? $res.'; ' : '').sprintf('%s %s', $name, implode(' ', $directives[$name]));
}, '');
return array_reduce(array_keys($directives), fn ($res, $name) => ('' !== $res ? $res.'; ' : '').sprintf('%s %s', $name, implode(' ', $directives[$name])), '');
}
/**
@@ -224,7 +222,7 @@ class ContentSecurityPolicyHandler
if (!str_ends_with($directive, '\'')) {
continue;
}
if ('\'nonce-' === substr($directive, 0, 7)) {
if (str_starts_with($directive, '\'nonce-')) {
return true;
}
if (\in_array(substr($directive, 0, 8), ['\'sha256-', '\'sha384-', '\'sha512-'], true)) {
@@ -235,7 +233,7 @@ class ContentSecurityPolicyHandler
return false;
}
private function getDirectiveFallback(array $directiveSet, string $type)
private function getDirectiveFallback(array $directiveSet, string $type): ?array
{
if (\in_array($type, ['script-src-elem', 'style-src-elem'], true) || !isset($directiveSet['default-src'])) {
// Let the browser fallback on it's own