From a841c28e0c43aa8a39e6863cee78564ba5df3d98 Mon Sep 17 00:00:00 2001
From: "nebojsa.ilic" <7668379+bluvulture@users.noreply.github.com>
Date: Wed, 15 Jul 2026 17:40:39 +0200
Subject: [PATCH] Improving imagemagick security

---
 Dockerfile                        |  5 +++
 files/conf/imagemagick/policy.xml | 55 +++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 files/conf/imagemagick/policy.xml

diff --git a/Dockerfile b/Dockerfile
index 49eb64f..1e7fd31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -106,6 +106,11 @@ RUN set -eux; \
     apt-get clean; \
     rm -rf /var/lib/apt/lists/*
 
+# Harden ImageMagick against untrusted SVG assets: deny the file-read, text,
+# scripting and network coders that SVG xlink:href can invoke.
+
+COPY files/conf/imagemagick/policy.xml /etc/ImageMagick-7/policy.xml
+
 RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \
     install-php-extensions \
         apcu \
diff --git a/files/conf/imagemagick/policy.xml b/files/conf/imagemagick/policy.xml
new file mode 100644
index 0000000..2f8593f
--- /dev/null
+++ b/files/conf/imagemagick/policy.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policymap [
+  <!ELEMENT policymap (policy)*>
+  <!ATTLIST policymap xmlns CDATA #FIXED ''>
+  <!ELEMENT policy EMPTY>
+  <!ATTLIST policy xmlns CDATA #FIXED '' domain NMTOKEN #REQUIRED
+    name NMTOKEN #IMPLIED pattern CDATA #IMPLIED rights NMTOKEN #IMPLIED
+    stealth NMTOKEN #IMPLIED value CDATA #IMPLIED>
+]>
+<!--
+  Hardened ImageMagick policy for Pimcore.
+
+  Pimcore rasterises uploaded, untrusted SVG assets through ImageMagick (via the
+  Imagick PHP extension). ImageMagick's SVG renderer follows <image xlink:href="...">
+  references to other "coders" / pseudo-protocols. 
+  
+  This policy denies the coders those hrefs invoke. SVG itself stays enabled, so
+  legitimate SVG thumbnails still render, but any href that points at a file-reading,
+  text-rendering, scripting, or network coder is refused with "not authorized".
+
+  NOTE (scope): This is an ImageMagick-level control. It cannot inspect SVG XML and
+  therefore does NOT literally strip <script> tags or href attributes. Removing
+  <script>/href from SVG (the stored-XSS concern, and defence-in-depth for the above)
+  is an application-layer job for an SVG sanitiser in pimcore/pimcore, not this image.
+
+  Coders deliberately LEFT ENABLED so Pimcore previews keep working:
+    * SVG / MSVG / MVG - SVG thumbnail rasterisation (internal renderer needs MVG)
+    * PDF / PS / EPS / XPS - document thumbnails via the Ghostscript delegate
+    * image/video coders - normal asset processing
+-->
+<policymap>
+  <!-- Scripting coder that can read files and execute read/write steps (RCE vector). -->
+  <policy domain="coder" rights="none" pattern="MSL" />
+
+  <!-- Text/label coders that read a local file or embed arbitrary content. -->
+  <policy domain="coder" rights="none" pattern="TEXT" />
+  <policy domain="coder" rights="none" pattern="LABEL" />
+  <policy domain="coder" rights="none" pattern="CAPTION" />
+  <policy domain="coder" rights="none" pattern="INFO" />
+
+  <!-- Network coders reachable via href (remote include / SSRF). -->
+  <policy domain="coder" rights="none" pattern="URL" />
+  <policy domain="coder" rights="none" pattern="HTTP" />
+  <policy domain="coder" rights="none" pattern="HTTPS" />
+  <policy domain="coder" rights="none" pattern="FTP" />
+
+  <!-- Miscellaneous coders with no legitimate use in a server-side pipeline. -->
+  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
+  <policy domain="coder" rights="none" pattern="SHOW" />
+  <policy domain="coder" rights="none" pattern="WIN" />
+  <policy domain="coder" rights="none" pattern="PLT" />
+
+  <!-- Refuse indirect reads via the @filename syntax (e.g. @/etc/passwd). -->
+  <policy domain="path" rights="none" pattern="@*" />
+</policymap>