Update csp handling

Author: ayacoo

Build/Scripts/runTests.sh

@@ -151,7 +151,7 @@ restoreComposerFiles() {
 
 loadHelp() {
     # Load help text into $HELP
-    read -r -d '' HELP <<EOF
+    read -r -d '' HELP <<'EOF'
 TYPO3 core test runner. Execute unit, functional and other test suites in
 a container based test environment. Handles execution of single test files,
 sending xdebug information to a local IDE and more.
@@ -563,7 +563,11 @@ case ${TEST_SUITE} in
                 SUITE_EXIT_CODE=$?
                 ;;
             postgres)
-                ${CONTAINER_BIN} run --rm ${CI_PARAMS} --name postgres-func-${SUFFIX} --network ${NETWORK} -d -e POSTGRES_PASSWORD=funcp -e POSTGRES_USER=funcu --tmpfs /var/lib/postgresql/data:rw,noexec,nosuid ${IMAGE_POSTGRES} >/dev/null
+                POSTGRES_TMPFS="/var/lib/postgresql/data"
+                if [[ ${DBMS_VERSION} -eq 18 ]]; then
+                    POSTGRES_TMPFS="/var/lib/postgresql"
+                fi
+                ${CONTAINER_BIN} run --rm ${CI_PARAMS} --name postgres-func-${SUFFIX} --network ${NETWORK} -d -e POSTGRES_PASSWORD=funcp -e POSTGRES_USER=funcu --tmpfs ${POSTGRES_TMPFS}:rw,noexec,nosuid ${IMAGE_POSTGRES} >/dev/null
                 waitFor postgres-func-${SUFFIX} 5432
                 CONTAINERPARAMS="-e typo3DatabaseDriver=pdo_pgsql -e typo3DatabaseName=bamboo -e typo3DatabaseUsername=funcu -e typo3DatabaseHost=postgres-func-${SUFFIX} -e typo3DatabasePassword=funcp"
                 ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name functional-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${CONTAINERPARAMS} ${IMAGE_PHP} "${COMMAND[@]}"

Configuration/ContentSecurityPolicies.php

@@ -11,23 +11,30 @@
 use TYPO3\CMS\Core\Security\ContentSecurityPolicy\UriValue;
 use TYPO3\CMS\Core\Type\Map;
 
-return Map::fromEntries([
-    Scope::backend(),
-
-    new MutationCollection(
-        // The csp extension is required for images in the PreviewRenderer when active
-        new Mutation(
-            MutationMode::Extend,
-            Directive::ImgSrc,
-            SourceScheme::data,
-            new UriValue('*.sndcdn.com'),
-        ),
-        // The csp extension is required for the IFrame in the info window
-        new Mutation(
-            MutationMode::Extend,
-            Directive::FrameSrc,
-            SourceScheme::data,
-            new UriValue('*.soundcloud.com'),
-        ),
+$mutationCollection = new MutationCollection(
+    // The csp extension is required for images in the PreviewRenderer when active
+    new Mutation(
+        MutationMode::Extend,
+        Directive::ImgSrc,
+        SourceScheme::data,
+        new UriValue('*.sndcdn.com'),
+    ),
+    // The csp extension is required for the IFrame in the info window
+    new Mutation(
+        MutationMode::Extend,
+        Directive::FrameSrc,
+        SourceScheme::data,
+        new UriValue('*.soundcloud.com'),
     ),
-]);
+);
+
+return Map::fromEntries(
+    [
+        Scope::frontend(),
+        $mutationCollection
+    ],
+    [
+        Scope::backend(),
+        $mutationCollection
+    ]
+);

README.md

@@ -86,11 +86,7 @@ TBD EventListener
 
 ### 3.3 Content security policy
 
-If CSP is activated in the backend, policies will be automatically added.
-To do this, the file Configuration/ContentSecurityPolicies.php is used.
-
-If CSP is to be extended for the frontend, the configuration can be added
-in a site package extension or in the global csp.yml
+By default, CSP settings are added for the frontend and backend. These settings can be modified via YAML or events.
 
 Take a look at the current documentation:
 https://docs.typo3.org/m/typo3/reference-coreapi/main/en-us/ApiOverview/ContentSecurityPolicy/Index.html