Release/v4

.devcontainer/Dockerfile

@@ -1,74 +1,44 @@
-ARG HTTPD_VERSION=2.4.49
+ARG HTTPD_VERSION=2.4.62
 
-FROM httpd:${HTTPD_VERSION} as build-mod-dims
-
-ARG DIMS_VERSION=3.3.26
-ARG IMAGEMAGICK_VERSION=6.9.12-34
-ARG WEBP_VERSION=1.2.1
-ARG TIFF_VERSION=4.3.0
-ARG PREFIX=/usr/local/imagemagick
+FROM httpd:${HTTPD_VERSION}-alpine
 
 ENV DIMS_DOWNLOAD_TIMEOUT=60000
 ENV DIMS_IMAGEMAGICK_TIMEOUT=20000
-ENV DIMS_CLIENT=development
-ENV DIMS_NO_IMAGE_URL="http://placehold.it/350x150"
-ENV DIMS_DEFAULT_IMAGE_URL="http://placehold.it/350x150"
 ENV DIMS_CACHE_CONTROL_MAX_AGE=604800
 ENV DIMS_EDGE_CONTROL_DOWNSTREAM_TTL=604800
 ENV DIMS_TRUST_SOURCE=true
-ENV DIMS_SOURCE_CACHE=604800
+ENV DIMS_MIN_SOURCE_CACHE=0
 ENV DIMS_MAX_SOURCE_CACHE=604800
-ENV DIMS_SECRET=""
 ENV DIMS_CACHE_EXPIRE=604800
-ENV DIMS_NO_IMAGE_CACHE_EXPIRE=60
-ENV DIMS_WHITELIST="*.com *.org *.net *.io"
+ENV DIMS_ERROR_IMAGE_CACHE_EXPIRE=60
+ENV DIMS_ERROR_IMAGE_BACKGROUND="#5ADAFD"
+ENV PREFIX=/usr/local/apache2
+ENV PATH=${PREFIX}/bin:${PATH}
 
-RUN apt-get -y update && \
-    apt-get install -y --no-install-recommends \
-        automake libtool autoconf build-essential \
-        git ca-certificates \
-        libapr1-dev libaprutil1-dev \
-        curl \
-        libcurl4-openssl-dev libfreetype6-dev libopenexr-dev libxml2-dev \
-        libgif-dev libjpeg62-turbo-dev libpng-dev \
-        liblcms2-dev pkg-config libssl-dev libpangocairo-1.0-0 wget
+# Imagemagick configuration
 
-# WEBP Library
-RUN wget https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz && \
-    tar xzvf libwebp-${WEBP_VERSION}.tar.gz && \
-    cd libwebp-${WEBP_VERSION} && \
-    ./configure --prefix=/usr/local/imagemagick && \
-    make -j4 && make install
+# 2GB disk limit
+ENV MAGICK_DISK_LIMIT=2147483648
 
-# TIFF Library
-RUN wget http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz && \
-    tar xzvf tiff-${TIFF_VERSION}.tar.gz && \
-    cd tiff-${TIFF_VERSION} && \
-    ./configure --prefix=$PREFIX --with-webp-include-dir=$PREFIX/include --with-webp-lib-dir=$PREFIX/lib && \
-    make -j4 && make install
+# 512MB memory limit
+ENV MAGICK_MEMORY_LIMIT=536870912
 
-# Imagemagick
-RUN wget https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz && \
-    export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig && \
-    tar xvf ImageMagick-${IMAGEMAGICK_VERSION}.tar.xz && \
-    cd ImageMagick-${IMAGEMAGICK_VERSION} && \
-    ./configure --without-x --with-quantum-depth=8 --prefix=$PREFIX && \
-    make -j4 && make install
+# 512MB map limit
+ENV MAGICK_MAP_LIMIT=536870912
 
-RUN apt-get --no-install-recommends install -y apt-transport-https apt-utils \
-            automake build-essential ccache cmake ca-certificates curl git \
-            gcc g++ libc-ares-dev libc-ares2 libcurl4-openssl-dev libre2-dev \
-            libssl-dev m4 make pkg-config tar wget zlib1g-dev
+# 128MB area limit
+ENV MAGICK_AREA_LIMIT=134217728
 
-WORKDIR /build
+RUN apk update && \
+    apk add vim gdb zig apr-dev apr-util-dev imagemagick-dev curl-dev \
+    imagemagick-jpeg imagemagick-webp imagemagick-tiff && \
+    zig build --verbose || true; \
+    ln -sf /workspaces/mod_dims/zig-out/lib/libmod_dims.so.4.0.0 ${PREFIX}/modules/libmod_dims.so
 
-RUN apt-get install -y vim && \
-    chown -R www-data:www-data /usr/local/apache2 && \
-    sed "s|Listen 80|Listen 8000|" /usr/local/apache2/conf/httpd.conf -i && \
-    sed "s|^#LoadModule authz_core_module|LoadModule authz_core_module|" /usr/local/apache2/conf/httpd.conf -i && \
-    sed "s|^LogLevel warn|LogLevel debug|" /usr/local/apache2/conf/httpd.conf -i && \
-    echo "Include conf/extra/dims.conf" >> /usr/local/apache2/conf/httpd.conf
+COPY dims.conf /usr/local/apache2/conf/httpd.conf
 
-COPY docker/dims.conf /usr/local/apache2/conf/extra/dims.conf
-
-ENV LC_ALL="C"
+ENV DIMS_CLIENT=development
+ENV DIMS_SECRET=devmode
+ENV DIMS_WHITELIST="*.com *.net *.org *.io"
+ENV DIMS_NO_IMAGE_URL="http://192.168.65.1:8081/mod-dims_00001_.jpg"
+ENV DIMS_DEFAULT_IMAGE_URL="http://192.168.65.1:8081/mod-dims_00001_.jpg"

.devcontainer/devcontainer.json

@@ -8,14 +8,31 @@
 	"containerUser": "root",
 	"remoteUser": "root",
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
-
-
 	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"ms-vscode.cpptools"
-	],
+	"customizations": {
+		"vscode": {
+			"settings": {
+				"C_Cpp.default.compilerPath": "/usr/bin/zig",
+				"C_Cpp.default.includePath": [
+					"${default}",
+					"/usr/local/apache2/include",
+					"/usr/lib/zig/libc/include",
+					"/usr/lib/zig/libcxx/include",
+					"/usr/lib/zig/libc/include/generic-musl",
+					"/usr/include",
+					"/usr/include/apr-1/",
+					"/usr/include/ImageMagick-7/",
+					"/usr/lib/zig/libc/include/aarch64-linux-musl"
+				]
+			},
+			"extensions": [
+				"ms-vscode.cpptools",
+				"ms-vscode.cpptools-extension-pack",
+				"vscodevim.vim",
+				"GitHub.copilot"
+			]
+		},
+	},
 
 	// https://stackoverflow.com/questions/35860527/warning-error-disabling-address-space-randomization-operation-not-permitted
 	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],

.dockerignore

@@ -0,0 +1,3 @@
+.zig-cache
+zig-out
+zig-cache

.env

@@ -0,0 +1,15 @@
+export DIMS_DOWNLOAD_TIMEOUT=60000
+export DIMS_IMAGEMAGICK_TIMEOUT=20000
+export DIMS_CLIENT=development
+export DIMS_NO_IMAGE_URL="http://placehold.it/350x150"
+export DIMS_DEFAULT_IMAGE_URL="http://placehold.it/350x150"
+export DIMS_CACHE_CONTROL_MAX_AGE=604800
+export DIMS_EDGE_CONTROL_DOWNSTREAM_TTL=604800
+export DIMS_TRUST_SOURCE=true
+export DIMS_SOURCE_CACHE=604800
+export DIMS_MIN_SOURCE_CACHE=0
+export DIMS_MAX_SOURCE_CACHE=604800
+export DIMS_SECRET="devmode"
+export DIMS_CACHE_EXPIRE=604800
+export DIMS_NO_IMAGE_CACHE_EXPIRE=60
+export DIMS_WHITELIST="*.com *.net *.org *.io 127.0.0.1 localhost"

.gitignore

@@ -1,3 +1,5 @@
+.idea 
+.DS_Store
 m4/
 Makefile
 Makefile.in
@@ -20,3 +22,20 @@ install-sh
 missing
 INSTALL
 stamp-h1
+
+*.lo
+*.la
+*.lai
+*.o
+*.Plo
+*.Tpo
+*.a
+*~
+
+*.dylib
+*.so
+
+.zig-out
+.zig-cache
+zig-out
+zig-cache

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "mod-dims - debug",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "/usr/local/apache2/bin/httpd",
+            "args": ["-X"],
+            "stopAtEntry": false,
+            "cwd": ".",
+            "environment": [],
+            "externalConsole": false,
+            "MIMode": "gdb",
+            "setupCommands": [
+                {
+                    "description": "Enable pretty-printing for gdb",
+                    "text": "-enable-pretty-printing",
+                    "ignoreFailures": true
+                },
+                {
+                    "description": "Set Disassembly Flavor to Intel",
+                    "text": "-gdb-set disassembly-flavor intel",
+                    "ignoreFailures": true
+                }
+            ],
+            "preLaunchTask": "zig build"
+        },
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "files.associations": {
+        "*.templ": "templ",
+        "strings.h": "c"
+    }
+}

.vscode/tasks.json

@@ -0,0 +1,15 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "zig build",
+            "type": "shell",
+            "command": "zig build --verbose",
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}

Dockerfile

@@ -0,0 +1,52 @@
+ARG HTTPD_VERSION=2.4.62
+
+FROM httpd:${HTTPD_VERSION}-alpine AS builder
+
+ENV PREFIX=/usr/local/apache2
+ENV PATH=${PREFIX}/bin:${PATH}
+
+COPY . /build/mod-dims
+WORKDIR /build/mod-dims
+
+RUN apk update && \
+    apk add vim gdb zig apr-dev apr-util-dev imagemagick-dev curl-dev \
+    imagemagick-jpeg imagemagick-webp imagemagick-tiff && \
+    zig build || true; \
+    ln -sf /build/mod-dims/zig-out/lib/libmod_dims.so.4.0.0 ${PREFIX}/modules/libmod_dims.so || true
+
+FROM httpd:${HTTPD_VERSION}-alpine AS final
+
+ENV DIMS_DOWNLOAD_TIMEOUT=60000
+ENV DIMS_IMAGEMAGICK_TIMEOUT=20000
+ENV DIMS_CACHE_CONTROL_MAX_AGE=604800
+ENV DIMS_EDGE_CONTROL_DOWNSTREAM_TTL=604800
+ENV DIMS_TRUST_SOURCE=true
+ENV DIMS_MIN_SOURCE_CACHE=0
+ENV DIMS_MAX_SOURCE_CACHE=604800
+ENV DIMS_CACHE_EXPIRE=604800
+ENV DIMS_ERROR_IMAGE_CACHE_EXPIRE=60
+ENV DIMS_ERROR_IMAGE_BACKGROUND="#5ADAFD"
+ENV PREFIX=/usr/local/apache2
+ENV PATH=${PREFIX}/bin:${PATH}
+
+# Imagemagick configuration
+
+# 2GB disk limit
+ENV MAGICK_DISK_LIMIT=2147483648
+
+# 512MB memory limit
+ENV MAGICK_MEMORY_LIMIT=536870912
+
+# 512MB map limit
+ENV MAGICK_MAP_LIMIT=536870912
+
+# 128MB area limit
+ENV MAGICK_AREA_LIMIT=134217728
+
+RUN apk update && \
+    apk add imagemagick imagemagick-jpeg imagemagick-webp imagemagick-tiff curl 
+
+COPY --from=builder /build/mod-dims/zig-out/lib/libmod_dims.so.4.0.0 ${PREFIX}/modules/libmod_dims.so
+COPY dims.conf /usr/local/apache2/conf/httpd.conf
+
+EXPOSE 8000

COPYING → LICENSE

@@ -1,4 +1,5 @@
 Copyright 2009 AOL LLC 
+Copyright 2024 Jeremy Collins
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of

README.markdown → README.md

@@ -1,42 +1,52 @@
-Dependencies
-============
-
-* Apache 2.2.x
-* Imagemagick 6.6+
-* libcurl 7.18.0+
+mod-dims
+========
 
-Compiling
-=========
+mod-dims is an HTTP microservice for dynamic image manipulation. It run as an Apache httpd module.
 
-./autorun.sh --with-imagemagick=/path/to/imagemagick --with-apache=/path/to/apache
+Dependencies
+------------
 
-The paths provided above are prefix paths used to install those dependencies. If you installed
-Imagemagick and Apache (including APR) in /usr/local you would run:
+* Apache 2.4.x
+* Imagemagick 7.1.x
+* libcurl 7.x
 
-./autorun.sh --with-imagemagick=/usr/local --with-apache=/usr/local
+Compiling
+---------
+
+```bash
+$ zig build 
+find zig-out/
+zig-out/
+zig-out/lib
+zig-out/lib/libmod_dims.so.4
+zig-out/lib/libmod_dims.so.4.0.0
+zig-out/lib/libmod_dims.so
+```
 
 Installation
-============
+------------
 
 Add the following to the Apache configuration:
 
+```
     <IfModule !mod_dims.c>
         LoadModule dims_module modules/mod_dims.so
     </IfModule>
 
     AddHandler dims-local .gif .jpg
 
-    <Location /dims/>
-        SetHandler dims
+    <Location /dims3/>
+        SetHandler dims3
     </Location>
 
-    <Location /dims3/>
+    <Location /dims4/>
         SetHandler dims3
     </Location>
 
     <Location /dims-status/>
         SetHandler dims-status
     </Location>
+```
 
 This assumes mod_dims.so has been installed in $HTTP_ROOT/modules.