[BUGFIX] Ignore csp.yaml file when saving site configuration

The csp.yaml shouldn't be taken into account when merging current and new site configuration via the GUI. Resolves: #101626 Releases: main, 12.4 Change-Id: Ib08b7707cfb43733985b0c7aa5bf12bcc5fa603c Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80468 Tested-by: core-ci <typo3@b13.com> Tested-by: Nikita Hovratov <nikita.h@live.de> Reviewed-by: Stefan B�rk <stefan@buerk.tech> Reviewed-by: J�rg B�sche <typo3@joergboesche.de> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Nikita Hovratov <nikita.h@live.de> Tested-by: Stefan B�rk <stefan@buerk.tech>

[BUGFIX] Ignore csp.yaml file when saving site configuration
The csp.yaml shouldn't be taken into account when merging current and new site configuration via the GUI. Resolves: #101626 Releases: main, 12.4 Change-Id: Ib08b7707cfb43733985b0c7aa5bf12bcc5fa603c Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/80468 Tested-by: core-ci <typo3@b13.com> Tested-by: Nikita Hovratov <nikita.h@live.de> Reviewed-by: Stefan B�rk <stefan@buerk.tech> Reviewed-by: J�rg B�sche <typo3@joergboesche.de> Tested-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch> Reviewed-by: Nikita Hovratov <nikita.h@live.de> Tested-by: Stefan B�rk <stefan@buerk.tech>
5b52a4ed · Nikita Hovratov · bbf46cd3 · 5b52a4ed
Commit 5b52a4ed authored 1 year ago by Nikita Hovratov
--- a/typo3/sysext/core/Classes/Configuration/SiteConfiguration.php
+++ b/typo3/sysext/core/Classes/Configuration/SiteConfiguration.php
@@ -154,7 +154,7 @@ class SiteConfiguration implements SingletonInterface

    /**
     * Resolve all site objects which have been found in the filesystem containing settings only from the `config.yaml`
-     * file ignoring values from the `settings.yaml` file.
+     * file ignoring values from the `settings.yaml` and `csp.yaml` file.
     *
     * @return Site[]
     * @internal Not part of public API. Used as intermediate solution until settings are handled by a dedicated GUI.
@@ -167,7 +167,6 @@ class SiteConfiguration implements SingletonInterface
            // cast $identifier to string, as the identifier can potentially only consist of (int) digit numbers
            $identifier = (string)$identifier;
            $siteSettings = new SiteSettings($configuration['settings'] ?? []);
-            $configuration['contentSecurityPolicies'] = $this->getContentSecurityPolicies($identifier);

            $rootPageId = (int)($configuration['rootPageId'] ?? 0);
            if ($rootPageId > 0) {