Skip to content

Commit

Permalink
Patch IM for security hole
Browse files Browse the repository at this point in the history
  • Loading branch information
mpalmer committed May 4, 2016
1 parent ea76047 commit fdf8f59
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 7 deletions.
16 changes: 9 additions & 7 deletions Dockerfile
Expand Up @@ -37,15 +37,15 @@ RUN build_deps="git build-base autoconf automake libtool" \
&& apk del $build_deps \
&& rm -rf /var/cache/apk/* /tmp/libpng

RUN build_deps="build-base libtool freetype-dev xz-dev bzip2-dev tiff-dev libjpeg-turbo-dev ghostscript ghostscript-dev" \
&& mkdir /tmp/imagemagick \
&& cd /tmp/imagemagick \
&& wget -O ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick.tar.gz" \
&& IMDIR=$(tar -tzf ImageMagick.tar.gz |head -n 1 | cut -d / -f 1) \
&& tar -xzf ImageMagick.tar.gz \
&& cd $IMDIR \
ENV IMAGEMAGICK_VERSION 6.9.3-10
RUN build_deps="build-base libtool freetype-dev xz xz-dev bzip2-dev tiff-dev libjpeg-turbo-dev ghostscript ghostscript-dev" \
&& apk update \
&& apk add $build_deps \
&& mkdir /tmp/imagemagick \
&& cd /tmp/imagemagick \
&& wget -O ImageMagick.tar.xz "http://www.imagemagick.org/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz" \
&& xz -cd ImageMagick.tar.xz | tar -xf - \
&& cd ImageMagick-${IMAGEMAGICK_VERSION} \
&& LDFLAGS=-L$PREFIX/lib CFLAGS=-I$PREFIX/include ./configure \
--prefix=$PREFIX \
--enable-static \
Expand Down Expand Up @@ -73,6 +73,8 @@ RUN build_deps="build-base libtool freetype-dev xz-dev bzip2-dev tiff-dev libjpe
&& apk add freetype xz-libs libbz2 libgcc libgomp libltdl tiff libjpeg-turbo ghostscript-fonts \
&& rm -rf /var/cache/apk/* /tmp/imagemagick

ADD policy.xml /usr/local/etc/ImageMagick-6/

RUN apk update \
&& apk add git sudo build-base \
&& adduser -s /bin/bash -u 9001 -D web \
Expand Down
63 changes: 63 additions & 0 deletions policy.xml
@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policymap [
<!ELEMENT policymap (policy)+>
<!ELEMENT policy (#PCDATA)>
<!ATTLIST policy domain (delegate|coder|filter|path|resource) #IMPLIED>
<!ATTLIST policy name CDATA #IMPLIED>
<!ATTLIST policy rights CDATA #IMPLIED>
<!ATTLIST policy pattern CDATA #IMPLIED>
<!ATTLIST policy value CDATA #IMPLIED>
]>
<!--
Configure ImageMagick policies.
Domains include system, delegate, coder, filter, path, or resource.
Rights include none, read, write, and execute. Use | to combine them,
for example: "read | write" to permit read from, or write to, a path.
Use a glob expression as a pattern.
Suppose we do not want users to process MPEG video images:
<policy domain="delegate" rights="none" pattern="mpeg:decode" />
Here we do not want users reading images from HTTP:
<policy domain="coder" rights="none" pattern="HTTP" />
Lets prevent users from executing any image filters:
<policy domain="filter" rights="none" pattern="*" />
The /repository file system is restricted to read only. We use a glob
expression to match all paths that start with /repository:
<policy domain="path" rights="read" pattern="/repository/*" />
Any large image is cached to disk rather than memory:
<policy domain="resource" name="area" value="1GB"/>
Define arguments for the memory, map, area, and disk resources with
SI prefixes (.e.g 100MB). In addition, resource policies are maximums for
each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
exceeds policy maximum so memory limit is 1GB).
-->
<policymap>
<!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
<!-- <policy domain="resource" name="memory" value="1GiB"/> -->
<!-- <policy domain="resource" name="map" value="2GiB"/> -->
<!-- <policy domain="resource" name="area" value="1GB"/> -->
<!-- <policy domain="resource" name="disk" value="16EB"/> -->
<!-- <policy domain="resource" name="file" value="768"/> -->
<!-- <policy domain="resource" name="thread" value="4"/> -->
<!-- <policy domain="resource" name="throttle" value="0"/> -->
<!-- <policy domain="resource" name="time" value="3600"/> -->
<!-- <policy domain="system" name="precision" value="6"/> -->
<policy domain="cache" name="shared-secret" value="passphrase"/>
<policy domain="coder" rights="none" pattern="EPHEMERAL" />
<policy domain="coder" rights="none" pattern="HTTPS" />
<policy domain="coder" rights="none" pattern="MVG" />
<policy domain="coder" rights="none" pattern="MSL" />
</policymap>

0 comments on commit fdf8f59

Please sign in to comment.