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>
146 lines
4.4 KiB
Go
146 lines
4.4 KiB
Go
package convert
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
"os/exec"
|
|
"strings"
|
|
"sync"
|
|
"sync/atomic"
|
|
"time"
|
|
)
|
|
|
|
// Capabilities is the snapshot the convert-health endpoint reports
|
|
// and the convert entry points consult before exec'ing.
|
|
//
|
|
// In the runtime-image model, "Ready" means both binaries
|
|
// (pandoc + chromium) are present on PATH. Sandboxing + resource
|
|
// limits live in the wrapper scripts that PATH resolves to — out
|
|
// of zddc-server's concern. The probe doesn't try to validate
|
|
// those; if the wrapper is broken, the first conversion surfaces
|
|
// the failure as a ConvertError with the wrapper's stderr.
|
|
type Capabilities struct {
|
|
PandocBinary string // resolved path, e.g. /usr/local/bin/pandoc
|
|
PandocVersion string // first line of "pandoc --version"
|
|
ChromiumBinary string // resolved path, e.g. /usr/local/bin/chromium-browser
|
|
ChromiumVersion string // first line of "chromium-browser --version"
|
|
ProbedAt time.Time
|
|
Err error
|
|
}
|
|
|
|
// Ready reports whether conversions can be attempted.
|
|
func (c Capabilities) Ready() bool {
|
|
return c.PandocBinary != "" && c.ChromiumBinary != "" && c.Err == nil
|
|
}
|
|
|
|
// Reason returns a short human-friendly explanation when Ready() is
|
|
// false. Used as the body of a 503.
|
|
func (c Capabilities) Reason() string {
|
|
if c.Err != nil {
|
|
return c.Err.Error()
|
|
}
|
|
var missing []string
|
|
if c.PandocBinary == "" {
|
|
missing = append(missing, "pandoc")
|
|
}
|
|
if c.ChromiumBinary == "" {
|
|
missing = append(missing, "chromium-browser")
|
|
}
|
|
if len(missing) > 0 {
|
|
return fmt.Sprintf("conversion binary not found on PATH: %s — runtime image is missing the conversion toolchain (see zddc/runtime.Containerfile)", strings.Join(missing, ", "))
|
|
}
|
|
return "unavailable"
|
|
}
|
|
|
|
var (
|
|
caps atomic.Pointer[Capabilities]
|
|
probeCool sync.Mutex
|
|
)
|
|
|
|
// Available returns the current Capabilities snapshot and whether
|
|
// conversions can proceed.
|
|
func Available() (Capabilities, bool) {
|
|
p := caps.Load()
|
|
if p == nil {
|
|
return Capabilities{}, false
|
|
}
|
|
return *p, p.Ready()
|
|
}
|
|
|
|
// Probe resolves the conversion binaries on PATH and installs the
|
|
// localRunner. Call once at server startup. Returns the captured
|
|
// Capabilities for logging.
|
|
//
|
|
// Image responsibility: the binaries on PATH should be the wrapper
|
|
// scripts at /usr/local/bin/{pandoc,chromium-browser} (shipped by
|
|
// zddc/runtime.Containerfile). Each wrapper handles cgroup setup
|
|
// + bwrap sandbox + exec of the real binary at /usr/bin/<name>.
|
|
// If an operator runs zddc-server outside the runtime image with
|
|
// raw pandoc / chromium on PATH, the conversion still works but
|
|
// without the per-call sandbox + resource caps.
|
|
//
|
|
// Failure here is non-fatal: the server still starts, conversion
|
|
// endpoints just return 503.
|
|
func Probe(ctx context.Context) Capabilities {
|
|
probeCool.Lock()
|
|
defer probeCool.Unlock()
|
|
|
|
c := Capabilities{ProbedAt: time.Now()}
|
|
|
|
pandocBin := currentPandocBinary()
|
|
chromiumBin := currentChromiumBinary()
|
|
|
|
if p, err := exec.LookPath(pandocBin); err == nil {
|
|
c.PandocBinary = p
|
|
if v, err := probeVersion(ctx, p); err == nil {
|
|
c.PandocVersion = v
|
|
}
|
|
}
|
|
if p, err := exec.LookPath(chromiumBin); err == nil {
|
|
c.ChromiumBinary = p
|
|
if v, err := probeVersion(ctx, p); err == nil {
|
|
c.ChromiumVersion = v
|
|
}
|
|
}
|
|
|
|
if c.PandocBinary == "" || c.ChromiumBinary == "" {
|
|
c.Err = fmt.Errorf("%s", c.Reason())
|
|
caps.Store(&c)
|
|
slog.Warn("convert: probe failed", "reason", c.Err.Error())
|
|
return c
|
|
}
|
|
|
|
InstallRunner(newLocalRunner())
|
|
caps.Store(&c)
|
|
slog.Info("convert: ready",
|
|
"pandoc_binary", c.PandocBinary,
|
|
"pandoc_version", c.PandocVersion,
|
|
"chromium_binary", c.ChromiumBinary,
|
|
"chromium_version", c.ChromiumVersion)
|
|
return c
|
|
}
|
|
|
|
// Reprobe re-runs Probe with the existing configuration. Used by
|
|
// the handler when a request hits a not-Ready state — gives the
|
|
// operator a way to recover (e.g. installed pandoc after server
|
|
// start) without a server restart. Cooldown of 60 s between probes
|
|
// to keep error-path requests cheap.
|
|
func Reprobe(ctx context.Context) Capabilities {
|
|
if p := caps.Load(); p != nil {
|
|
if time.Since(p.ProbedAt) < 60*time.Second {
|
|
return *p
|
|
}
|
|
}
|
|
return Probe(ctx)
|
|
}
|
|
|
|
func probeVersion(ctx context.Context, binary string) (string, error) {
|
|
c := exec.CommandContext(ctx, binary, "--version")
|
|
out, err := c.CombinedOutput()
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
line := strings.SplitN(strings.TrimSpace(string(out)), "\n", 2)[0]
|
|
return line, nil
|
|
}
|