The bwrap engine + OCI engine that lived in internal/convert/runner.go
both leak isolation policy into Go code. Replaced with a single image-
side wrapper that drop-in-shadows pandoc and chromium-browser on PATH.
zddc-server's only contract with the image is now "exec.Command(name,
args) gets you that tool's behavior" — sandboxing, resource caps, and
namespace setup live entirely in shell scripts shipped by the image.
Architecture:
- zddc/runtime/zddc-cgroup-init runs at container start. cgroup v2's
"no internal processes" constraint forbids a cgroup from having both
children and processes; the init script moves PID 1 into a child,
enables +memory +pids in subtree_control, then exec's zddc-server.
Best-effort: degrades cleanly to "no resource caps" if cgroupfs
isn't writable.
- zddc/runtime/zddc-sandbox-exec is the per-call wrapper, symlinked
from /usr/local/bin/{pandoc,chromium-browser}. Creates a transient
cgroup v2 (memory.max + pids.max), then bubblewrap-sandboxes the
real binary at /usr/bin/<name>: --unshare-all, --ro-bind /usr,
--proc /proc, --tmpfs /tmp, --clearenv. Caller's scratch dir comes
in via ZDDC_SCRATCH env and is bind-mounted at the SAME path so
absolute paths round-trip unchanged.
Go simplifications (~250 lines net deletion):
- Runner interface: Run(ctx, binary, stdin, scratchDir, cmd) — no
ToolSpec, no mount list, no engine concept. Single localRunner
implementation; bwrapRunner + containerRunner both deleted.
- health.Probe just looks up pandoc + chromium on PATH; Capabilities
drops engine kinds.
- Convert.go: ToHTML/ToPDF write to a per-call scratch dir under
TMPDIR and pass absolute paths; the wrapper bind-mounts the dir.
No more "/tpl" / "/pdf" mount-point indirection.
- Config drops --convert-pandoc-image, --convert-chromium-image,
--convert-engine, --convert-podman-socket (OCI engine gone) and
--convert-cpus (CPU caps don't apply in the new model — wall-clock
+ memory + pids is the cap set). Defaults raised to match the new
caps the user authorized: mem 512→1024 MiB, pids 100→256,
timeout 30→60 s.
Image:
- zddc/runtime.Containerfile builds the production runtime image
(alpine + bubblewrap + pandoc + chromium + font-noto). Two
COPY statements pull in the wrapper scripts; ln -s symlinks the
shadow names.
- bitnest dev image mirrors this layout under /var/lib/zddc-dev-build/.
Container privilege required:
- Nested bwrap needs the outer container to permit user + mount
namespace creation + MS_SLAVE on root. The default seccomp +
AppArmor profiles block all of these. Quadlet adds:
--cap-add=ALL
--security-opt=seccomp=unconfined
--security-opt=apparmor=unconfined
--security-opt=unmask=ALL
Helm chart sets the equivalent via securityContext (capabilities.
add: SYS_ADMIN, seccompProfile.type: Unconfined, appArmorProfile.
type: Unconfined). Trade-off documented in AGENTS.md: zddc-server
RCE now has near-root power within the container, but the bind-
mount layout still bounds blast radius; bwrap is the real boundary
between zddc-server and untrusted markdown.
Tests: convert_test.go fully rewritten for the new Runner signature.
Drops TestBwrapArgs_* (functionality moved out of Go) and
TestImageTag (no more image refs). All 15 Go test packages green.
Verified live on bitnest: pandoc --version round-trip exits 0
through the wrapper; MD→DOCX produces a valid Word 2007+ file
end-to-end.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
118 lines
5.1 KiB
Bash
Executable file
118 lines
5.1 KiB
Bash
Executable file
#!/bin/sh
|
|
# zddc-sandbox-exec — drop-in wrapper for pandoc and chromium-browser.
|
|
#
|
|
# Invoked via symlinks at /usr/local/bin/pandoc and
|
|
# /usr/local/bin/chromium-browser. zddc-server (and any other caller
|
|
# that uses the default PATH) exec's by short name, hits this script
|
|
# first, and we transparently run the real binary at /usr/bin/<name>
|
|
# inside:
|
|
#
|
|
# 1. a transient cgroup v2 (memory + pids cap, kernel-enforced)
|
|
# 2. a bubblewrap sandbox (private namespaces, ro-bind /usr, fresh
|
|
# tmpfs at /tmp, no network)
|
|
#
|
|
# zddc-server's Go code does not know about either layer — its only
|
|
# contract with the image is "if I exec pandoc with these args, I
|
|
# get pandoc behavior back." Swap the wrapper for a different
|
|
# isolation strategy (firejail, nspawn, podman-run, raw exec) and
|
|
# nothing changes in Go.
|
|
#
|
|
# Caller-tunable env (with defaults):
|
|
#
|
|
# ZDDC_SCRATCH host directory to bind-mount read-write
|
|
# inside the sandbox at the SAME path. Set by
|
|
# zddc-server per-conversion; the markdown
|
|
# template, intermediate HTML, and chromium
|
|
# output PDF all live there. Absent = no extra
|
|
# bind mount; /tmp is a fresh tmpfs only.
|
|
# ZDDC_CONV_MEM_MAX cgroup memory.max value (default "1G").
|
|
# cgroup v2 syntax — bytes, "1G", or "max".
|
|
# ZDDC_CONV_PIDS_MAX cgroup pids.max value (default "256").
|
|
# ZDDC_CONV_TMPFS_SIZE bwrap tmpfs /tmp byte size (default 256 MiB).
|
|
|
|
set -eu
|
|
|
|
NAME=$(basename "$0")
|
|
REAL="/usr/bin/$NAME"
|
|
|
|
if [ ! -x "$REAL" ]; then
|
|
echo "zddc-sandbox-exec: $NAME — real binary not found at $REAL" >&2
|
|
exit 127
|
|
fi
|
|
|
|
# ── 1. cgroup v2 (best-effort) ──────────────────────────────────────────
|
|
#
|
|
# zddc-cgroup-init enables +memory +pids in /sys/fs/cgroup/cgroup.
|
|
# subtree_control at container start (see that script for the cgroup
|
|
# v2 "no internal processes" wrinkle that requires the indirection).
|
|
# Here we just need to mkdir a transient child, set caps, move
|
|
# ourselves in. The real binary inherits cgroup membership at exec.
|
|
|
|
CG_ROOT="/sys/fs/cgroup"
|
|
CG_CONTROL="$CG_ROOT/cgroup.subtree_control"
|
|
|
|
if [ -w "$CG_CONTROL" ] && grep -qw memory "$CG_CONTROL" 2>/dev/null; then
|
|
CG="$CG_ROOT/conv.$$"
|
|
if mkdir "$CG" 2>/dev/null; then
|
|
# rmdir on exit so the cgroupfs doesn't leak. Best-effort:
|
|
# the kernel reaps empty cgroups when the last PID leaves
|
|
# anyway, but we tidy up for the case where the wrapper
|
|
# itself exits before exec'ing the real binary.
|
|
trap 'rmdir "$CG" 2>/dev/null || true' EXIT INT TERM
|
|
printf "%s\n" "${ZDDC_CONV_MEM_MAX:-1G}" > "$CG/memory.max" 2>/dev/null || true
|
|
printf "%s\n" "${ZDDC_CONV_PIDS_MAX:-256}" > "$CG/pids.max" 2>/dev/null || true
|
|
printf "%s\n" "$$" > "$CG/cgroup.procs" 2>/dev/null || true
|
|
fi
|
|
fi
|
|
|
|
# ── 2. bwrap sandbox ────────────────────────────────────────────────────
|
|
#
|
|
# Mirror the hardening that internal/convert previously assembled in
|
|
# Go: unshare every namespace (--unshare-all also covers network),
|
|
# bind /usr read-only so the binary + its libs are visible, drop a
|
|
# fresh tmpfs at /tmp, clear the environment to a minimal floor.
|
|
#
|
|
# Building the bwrap argv preserves "$@" (the original pandoc /
|
|
# chromium args) by PREPENDING bwrap flags onto the existing
|
|
# positional parameters. Each `set -- new-flag "$@"` puts one flag
|
|
# at the front; reads back-to-front the final argv is:
|
|
#
|
|
# bwrap --unshare-all --unshare-user-try ... -- REAL_BINARY ORIG_ARGS
|
|
#
|
|
# This is the standard POSIX-sh idiom for "build a command line
|
|
# without an array type."
|
|
|
|
set -- "$REAL" "$@" # REAL ORIG
|
|
set -- -- "$@" # -- REAL ORIG
|
|
|
|
# Optional scratch dir, prepended just before "-- REAL ORIG" so it
|
|
# lands inside the bwrap flag list:
|
|
if [ -n "${ZDDC_SCRATCH:-}" ] && [ -d "$ZDDC_SCRATCH" ]; then
|
|
set -- --bind "$ZDDC_SCRATCH" "$ZDDC_SCRATCH" "$@"
|
|
fi
|
|
|
|
# Common bwrap flags (each one prepended; final order is bottom-up).
|
|
set -- --setenv LANG C.UTF-8 "$@"
|
|
set -- --setenv PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin "$@"
|
|
set -- --setenv HOME /tmp "$@"
|
|
set -- --clearenv "$@"
|
|
set -- --chdir /tmp "$@"
|
|
# bwrap's --size sets the size of the NEXT --tmpfs, so in argv order
|
|
# --size must come before --tmpfs. Building bottom-up via prepend means
|
|
# the LATER statement here lands earlier in argv: write --tmpfs first
|
|
# then --size, so the final $@ starts with "... --size N --tmpfs /tmp".
|
|
set -- --tmpfs /tmp "$@"
|
|
set -- --size "${ZDDC_CONV_TMPFS_SIZE:-268435456}" "$@"
|
|
set -- --dev /dev "$@"
|
|
set -- --proc /proc "$@"
|
|
set -- --ro-bind-try /etc /etc "$@"
|
|
set -- --ro-bind-try /sbin /sbin "$@"
|
|
set -- --ro-bind-try /bin /bin "$@"
|
|
set -- --ro-bind-try /lib64 /lib64 "$@"
|
|
set -- --ro-bind-try /lib /lib "$@"
|
|
set -- --ro-bind /usr /usr "$@"
|
|
set -- --die-with-parent "$@"
|
|
set -- --unshare-user-try "$@"
|
|
set -- --unshare-all "$@"
|
|
|
|
exec bwrap "$@"
|