Skip to content

fix(media): align Apache static-asset CSP across recipes #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jonas Elfering (keulinho) merged 5 commits into from
Oct 16, 2026
Merged

fix(media): align Apache static-asset CSP across recipes #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a0f9dd4
fix(media): align Apache static-asset CSP across recipes
keulinho Oct 15, 2026
bbde3fb
fix(media): apply CSP to Fastly static asset responses
keulinho Oct 15, 2026
d2b78f4
chore(tests): remove Fastly asset test harness
keulinho Oct 15, 2026
f36a37e
fix(media): restrict Fastly CSP to uploaded media paths
keulinho Oct 15, 2026
1b7726f
fix(media): preserve origin CSP without Fastly overrides
keulinho Oct 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion shopware/core/6.4/public/.htaccess.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ DirectoryIndex index.php
RewriteCond %{ENV:REDIRECT_STATUS} ^$
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]

# Restrict stored HTML without affecting responses rendered by the application.
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule ^(?:media|thumbnail)/.*\.(?i:html)$ - [E=SHOPWARE_STATIC_HTML:1]

# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
Expand All @@ -36,8 +40,10 @@ DirectoryIndex index.php
</IfModule>

<IfModule mod_headers.c>
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'" env=SHOPWARE_STATIC_HTML

<FilesMatch "\.(?i:svg)$">
Header set Content-Security-Policy "script-src 'none'"
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'"
</FilesMatch>
</IfModule>

Expand Down
8 changes: 7 additions & 1 deletion shopware/core/6.6/public/.htaccess.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ DirectoryIndex index.php
RewriteCond %{ENV:REDIRECT_STATUS} ^$
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]

# Restrict stored HTML without affecting responses rendered by the application.
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule ^(?:media|thumbnail)/.*\.(?i:html)$ - [E=SHOPWARE_STATIC_HTML:1]

# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
Expand All @@ -36,8 +40,10 @@ DirectoryIndex index.php
</IfModule>

<IfModule mod_headers.c>
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'" env=SHOPWARE_STATIC_HTML

<FilesMatch "\.(?i:svg)$">
Header set Content-Security-Policy "script-src 'none'"
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'"
</FilesMatch>
</IfModule>

Expand Down
8 changes: 7 additions & 1 deletion shopware/core/6.7/public/.htaccess.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ DirectoryIndex index.php
RewriteCond %{ENV:REDIRECT_STATUS} ^$
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]

# Restrict stored HTML without affecting responses rendered by the application.
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule ^(?:media|thumbnail)/.*\.(?i:html)$ - [E=SHOPWARE_STATIC_HTML:1]

# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
Expand All @@ -37,8 +41,10 @@ DirectoryIndex index.php
</IfModule>

<IfModule mod_headers.c>
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'" env=SHOPWARE_STATIC_HTML

<FilesMatch "\.(?i:svg)$">
Header set Content-Security-Policy "script-src 'none'"
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'"
</FilesMatch>
</IfModule>

Expand Down
8 changes: 7 additions & 1 deletion shopware/platform/6.4/public/.htaccess.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ DirectoryIndex index.php
RewriteCond %{ENV:REDIRECT_STATUS} ^$
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]

# Restrict stored HTML without affecting responses rendered by the application.
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule ^(?:media|thumbnail)/.*\.(?i:html)$ - [E=SHOPWARE_STATIC_HTML:1]

# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
Expand All @@ -36,8 +40,10 @@ DirectoryIndex index.php
</IfModule>

<IfModule mod_headers.c>
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'" env=SHOPWARE_STATIC_HTML

<FilesMatch "\.(?i:svg)$">
Header set Content-Security-Policy "script-src 'none'"
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'"
</FilesMatch>
</IfModule>

Expand Down
8 changes: 7 additions & 1 deletion shopware/platform/6.6/public/.htaccess.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ DirectoryIndex index.php
RewriteCond %{ENV:REDIRECT_STATUS} ^$
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]

# Restrict stored HTML without affecting responses rendered by the application.
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule ^(?:media|thumbnail)/.*\.(?i:html)$ - [E=SHOPWARE_STATIC_HTML:1]

# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
Expand All @@ -36,8 +40,10 @@ DirectoryIndex index.php
</IfModule>

<IfModule mod_headers.c>
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'" env=SHOPWARE_STATIC_HTML

<FilesMatch "\.(?i:svg)$">
Header set Content-Security-Policy "script-src 'none'"
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'"
</FilesMatch>
</IfModule>

Expand Down
8 changes: 7 additions & 1 deletion shopware/platform/6.7/public/.htaccess.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ DirectoryIndex index.php
RewriteCond %{ENV:REDIRECT_STATUS} ^$
RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]

# Restrict stored HTML without affecting responses rendered by the application.
RewriteCond %{REQUEST_FILENAME} -f
RewriteRule ^(?:media|thumbnail)/.*\.(?i:html)$ - [E=SHOPWARE_STATIC_HTML:1]

# If the requested filename exists, simply serve it.
# We only want to let Apache serve files and not directories.
RewriteCond %{REQUEST_FILENAME} -f
Expand All @@ -37,8 +41,10 @@ DirectoryIndex index.php
</IfModule>

<IfModule mod_headers.c>
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'" env=SHOPWARE_STATIC_HTML

<FilesMatch "\.(?i:svg)$">
Header set Content-Security-Policy "script-src 'none'"
Header set Content-Security-Policy "script-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'"
</FilesMatch>
</IfModule>

Expand Down
Loading