Say what each action did in a one-line notice (closes #383)

Every action on the webhook pages, and signing out, redirects with a
fixed notice code in the URL, and the page it lands on shows one line
saying what was done. noticeFor maps codes to fixed text and an
unknown code shows nothing, so nothing from the URL is echoed. One
partial, templates/notice.html, shows the line under the navbar on
every page; the error page shows none.

Replay and resubmit use the same codes and partial in place of their
own query parameters and event log banners.

Model: opus-5-5

.gitea/workflows/check.yml

@@ -33,5 +33,5 @@ jobs:
         # report success from cache.
         run: git rev-parse HEAD > .ci-fingerprint
 
-      - name: Build Docker image (runs make fmt-check, golangci-lint, make test, make build)
+      - name: Build Docker image (runs make check)
         run: script/cibuild

Dockerfile

@@ -26,7 +26,7 @@ COPY . .
 # Dockerfile.lint, including --network=none (see its header for why).
 RUN make fmt-check
 RUN --network=none golangci-lint config verify --config .golangci.yml
-RUN --network=none golangci-lint run --config .golangci.yml --build-tags browser ./...
+RUN --network=none golangci-lint run --config .golangci.yml ./...
 
 # Build stage
 # golang:1.26.1-bookworm (Debian-based), 2026-03-17

Dockerfile.browser

@@ -1,29 +0,0 @@
-# Browser test image, built by script/test-browser (make test-browser). It
-# runs the test in internal/server that loads the pages in a headless
-# browser under the real Content-Security-Policy. That test is built only
-# with the browser build tag, so make test leaves it out. Here the browser
-# comes from a digest-pinned image, and if it is missing the test fails.
-
-# golang:1.26.1-bookworm, 2026-03-17: the builder stage's image in Dockerfile.
-FROM golang:1.26.1-bookworm@sha256:4465644228bc2857a954b092167e12aa59c006a3492282a6c820bf4755fd64a4 AS build
-
-WORKDIR /src
-
-COPY go.mod go.sum ./
-RUN go mod download
-
-COPY . .
-
-# The test binary embeds the templates and static files, so the browser
-# stage needs nothing else. -p 4 keeps the compile's memory down, as in
-# script/test.
-RUN make assets && go test -c -p 4 -tags browser -o /browser.test ./internal/server
-
-# chromedp/headless-shell:151.0.7922.109 (Debian trixie), 2026-08-11. The
-# browser is on PATH as headless-shell, where the test's browser library
-# looks for it.
-FROM chromedp/headless-shell:151.0.7922.109@sha256:2d349b544a1ea6b5b5fd7c0fe99215ff662339c57407ee2e8c0a11af93516b04 AS browser
-
-COPY --from=build /browser.test /browser.test
-
-RUN /browser.test -test.v -test.timeout 90s -test.run '^TestAlpineRunsUnderTheSecurityPolicy$'

Dockerfile.lint

@@ -34,6 +34,4 @@ COPY . .
 # `run` silently ignores config keys it does not recognize, so a typo would
 # disable a setting without a word. `config verify` is what catches that.
 RUN --network=none golangci-lint config verify --config .golangci.yml
-# --build-tags browser also lints the browser test, which is built only with
+RUN --network=none golangci-lint run --config .golangci.yml ./...
-# that tag (make test-browser).
-RUN --network=none golangci-lint run --config .golangci.yml --build-tags browser ./...

Makefile

@@ -1,4 +1,4 @@
-.PHONY: bootstrap setup assets test test-browser lint fmt fmt-check check build run dev deps docker clean hooks css version
+.PHONY: bootstrap setup assets test lint fmt fmt-check check build run dev deps docker clean hooks css version
 
 # Default target
 .DEFAULT_GOAL := check
@@ -33,9 +33,6 @@ assets:
 test:
 	@script/test
 
-test-browser:
-	@script/test-browser
-
 lint:
 	@script/lint
 

README.md

@@ -19,8 +19,8 @@ before deploying one.
 ### Prerequisites
 
 - Go 1.26.1+ (the version in `go.mod`)
-- Docker (for `make lint` and so for `make check`, for the browser test in
+- Docker (for linting, for the test stage of the CI gate, and for
-  `make test-browser`, for the CI gate, and for containerized deployment)
+  containerized deployment)
 
 golangci-lint is not a prerequisite and must not be installed on the
 host: `script/bootstrap` does not install it, and `make lint` runs the
@@ -58,7 +58,6 @@ make fmt        # Format code (gofmt + goimports)
 make fmt-check  # Fail if gofmt would change anything (writes nothing)
 make lint       # Run golangci-lint in Docker (Dockerfile.lint)
 make test       # Run tests with race detection
-make test-browser # Run the browser test in Docker (Dockerfile.browser)
 make check      # test + lint + fmt-check (CI gate)
 make build      # Build binary to bin/webhooker (version-stamped)
 make version    # Print the version this checkout would stamp
@@ -136,20 +135,16 @@ TTY detection, and security headers are always applied.
 | `BIND_ADDRESS`          | IP address the HTTP listener binds. Loopback by default, so the cleartext listener is not published on every interface. The Docker image ships `0.0.0.0` instead. See [Bind address](#bind-address) | `127.0.0.1` (image: `0.0.0.0`) |
 | `DATA_DIR`              | Directory for all SQLite databases  | `/var/lib/webhooker` |
 | `DEBUG`                 | Enable debug logging                | `false`  |
+| `MAINTENANCE_MODE`      | Report `maintenanceMode: true` in the healthcheck JSON. It does not change how any request is served — no maintenance page exists | `false`  |
 | `METRICS_USERNAME`      | Basic auth username for `/metrics`. Must be set together with `METRICS_PASSWORD`; one without the other fails startup | `""`     |
 | `METRICS_PASSWORD`      | Basic auth password for `/metrics`. Must be set together with `METRICS_USERNAME`; one without the other fails startup | `""`     |
 | `SENTRY_DSN`            | Sentry error reporting DSN. Unset leaves error reporting off; a value the Sentry SDK cannot parse fails startup rather than serving with reporting silently off | `""`     |
-| `RETENTION_SWEEP_INTERVAL` | How often the retention reaper and archive sweeper run (Go duration, must be positive). A value that does not parse, or is zero or negative, fails startup | `1h` |
+| `RETENTION_SWEEP_INTERVAL` | How often the retention reaper and archive sweeper run (Go duration, must be positive) | `1h` |
 | `SESSION_IDLE_TIMEOUT`  | Idle session timeout (Go duration)  | `24h`    |
 | `RECEIVER_RATE_LIMIT`   | Receiver requests/minute per IP per entrypoint (10x that per IP across the route) | `120` |
 | `TRUSTED_PROXIES`       | CIDRs whose forwarded headers are trusted. A set value replaces the default. If any client can reach webhooker, or the proxy in front of it, from an RFC 1918 source address, set it to the proxy's address alone. See [Trusted proxies](#trusted-proxies) | `10.0.0.0/8,172.16.0.0/12,192.168.0.0/16` (RFC 1918) |
 | `ALLOWED_EGRESS_CIDRS`  | CIDRs that delivery targets may reach despite the SSRF blocklist. Read [Allowing egress to your own network](#allowing-egress-to-your-own-network) before setting it | `""` (none) |
 
-The Settings page of the web UI (`/settings`, behind the login) lists
-every one of these with the value the running server loaded. It is
-read-only, and it shows `METRICS_PASSWORD` and `SENTRY_DSN` only as
-set or not set, never their values.
-
 #### Allowing egress to your own network
 
 By default every delivery target must resolve to a public address. The
@@ -163,20 +158,19 @@ WireServer, which serves an Azure VM its credentials. Because it is a
 public address, listing it in `ALLOWED_EGRESS_CIDRS` reopens it.
 
 That is all the default blocklist covers: the IPv4 private and reserved
-ranges; of IPv6, only loopback (`::1`), the unspecified address (`::`),
+ranges; of IPv6, only loopback (`::1`), unique local addresses
-unique local addresses (`fc00::/7`), link-local addresses (`fe80::/10`),
+(`fc00::/7`) and link-local addresses (`fe80::/10`); and certain public
-multicast (`ff00::/8`) and documentation space (`2001:db8::/32`); and
+addresses. A public address belongs on the default blocklist only if it
-certain public addresses. A public address belongs on the default
+hands credentials, user data or bootstrap material to whatever can reach
-blocklist only if it hands credentials, user data or bootstrap material
+it, without the caller presenting anything. A provider's other public
-to whatever can reach it, without the caller presenting anything. A
+addresses are not refused. IBM Cloud, for example, serves its package
-provider's other public addresses are not refused. IBM Cloud, for
+mirrors, time servers and object storage on `161.26.0.0/16`, and the
-example, serves its package mirrors, time servers and object storage on
+private endpoints of its own cloud services on `166.8.0.0/14`. Neither
-`161.26.0.0/16`, and the private endpoints of its own cloud services on
+range hands out credentials that way: the token service among those
-`166.8.0.0/14`. Neither range hands out credentials that way: the token
+endpoints issues a token only in exchange for something the caller
-service among those endpoints issues a token only in exchange for
+presents, such as an API key. Reaching these services can be a
-something the caller presents, such as an API key. Reaching these
+legitimate delivery, and every cloud has some, so a partial list would
-services can be a legitimate delivery, and every cloud has some, so a
+promise coverage it does not give.
-partial list would promise coverage it does not give.
 
 That default is also inconvenient for the thing webhooker is mostly
 for: taking a public webhook and forwarding it to something on your own
@@ -216,16 +210,16 @@ Two things this setting cannot do:
   the list is always an allowlist; an empty list (the default) means
   every private and reserved range stays refused. Note that
   `0.0.0.0/0` gets you most of the way there anyway, per above.
-- **It cannot open link-local, the unspecified addresses, or a cloud
+- **It cannot open link-local, or a cloud metadata endpoint at a
-  metadata endpoint at a non-public address that discloses credentials
+  non-public address that discloses credentials or user data.** An
-  or user data.** A metadata address is on the list below when it is not
+  address is on the list below when it is not a public address and both
-  a public address and both of these hold: the provider fixes it, so it
+  of these hold: the provider fixes it, so it cannot collide with
-  cannot collide with anything you run; and reaching it hands out
+  anything you run; and reaching it hands out credentials, user data or
-  credentials, user data or bootstrap material. Those stay blocked no
+  bootstrap material. Those stay blocked no matter what you list,
-  matter what you list, including when you list them outright or list a
+  including when you list them outright or list a supernet such as
-  supernet such as `0.0.0.0/0`, `::/0`, `fd00::/8` or `100.64.0.0/10`.
+  `0.0.0.0/0`, `::/0`, `fd00::/8` or `100.64.0.0/10`. Treat this as best
-  Treat this as best effort rather than a guarantee — it is a
+  effort rather than a guarantee — it is a hand-maintained list and the
-  hand-maintained list and the caveat below the table applies:
+  caveat below the table applies:
 
   | Blocked unconditionally | What it is |
   | ----------------------- | ---------- |
@@ -239,25 +233,14 @@ Two things this setting cannot do:
   | `fd00:a9fe:a9fe::1/128` | Linode/Akamai metadata over IPv6 |
   | `100.100.100.200/32` | Alibaba Cloud metadata, inside CGNAT |
   | `192.0.0.192/32` | Oracle Cloud Classic metadata |
-  | `0.0.0.0/32` | IPv4 unspecified address, which reaches this host's loopback on Linux |
-  | `::/128` | IPv6 unspecified address, which reaches this host's loopback on Linux |
   | `::a9fe:a9fe/128` | `169.254.169.254` as an IPv4-compatible IPv6 address |
   | `64:ff9b::a9fe:a9fe/128` | `169.254.169.254` behind the NAT64 well-known prefix |
 
   The IPv4-mapped form `::ffff:169.254.169.254` is covered by the
-  `169.254.0.0/16` entry. Reaching any of these but the two unspecified
+  `169.254.0.0/16` entry. Reaching any of these is credential or
-  addresses is credential or user-data theft rather than delivery to an
+  user-data theft rather than delivery to an internal service. Every
-  internal service. Every entry outside the two link-local blocks is a
+  entry outside the two link-local blocks is a single address, so
-  single address, so blocking it costs you nothing else on the network
+  blocking it costs you nothing else on the network around it.
-  around it.
-
-  The unspecified addresses `0.0.0.0` and `::` hand out nothing
-  themselves, but no host can have either, and on Linux a connection to
-  one reaches this host's own loopback. They are listed so that an
-  allowlist reaches loopback only through an entry that covers a loopback
-  address, such as `127.0.0.0/8`, `::1` or `0.0.0.0/0`, never through one
-  that covers only `0.0.0.0` or `::`; `0.0.0.0/8`, for example, does not
-  open loopback.
 
   The six ULA entries, all inside `fd00::/8`, are why this matters in
   practice: `fd00::/8` is an ordinary block to allowlist for your own
@@ -457,19 +440,6 @@ Your proxy must therefore **append** the peer address to
 `option forwardfor`, Caddy and AWS ALB by default), and must append a
 bare address with no port.
 
-Every log line that names a client carries two addresses: `remoteIP`,
-the connecting peer, which behind a proxy is the proxy; and `clientIP`,
-the client the rate limiters identify by the rules above, which is the
-field to read when tracing who sent what. Those lines are the
-`http request` access log line, the rate-limit rejection lines
-(`login failure limit exceeded` among them), the
-`csrf: token validation failed` warning and the receiver's
-`webhook request received` line. `clientIP` is only as trustworthy as
-`TRUSTED_PROXIES`: for a request from a peer inside the list, it is
-read out of the `X-Forwarded-For` that peer sent, so a peer that does
-not belong in the list can make it name any address it likes. For a
-request from any other peer, both fields name the peer.
-
 #### Sessions
 
 Sessions are bounded by two independent clocks, and end at whichever
@@ -528,8 +498,8 @@ no report is being sent — which is why it aborts rather than starting
 with reporting off. Leaving it unset is not a mistake and not affected:
 error reporting is simply off and startup is normal.
 
-The boolean variable `DEBUG` accepts exactly the spellings Go's
+Boolean variables (`DEBUG`, `MAINTENANCE_MODE`) accept exactly the
-`strconv.ParseBool` accepts — `1`, `t`, `T`, `TRUE`,
+spellings Go's `strconv.ParseBool` accepts — `1`, `t`, `T`, `TRUE`,
 `true`, `True`, `0`, `f`, `F`, `FALSE`, `false`, `False` — and nothing
 else. `yes`, `on`, and `off` are rejected rather than quietly treated
 as false.
@@ -557,8 +527,8 @@ If it is lost, run `webhooker resetpw admin` on a stopped deployment.
 ```
 
 It is a banner rather than a log line because that is the only time it
-is ever shown: as one `INFO` record it would sit among the records fx
+is ever shown: as one `INFO` record it sat among the roughly 45 fx
-writes as each start hook runs, and under `docker run -d`
+`PROVIDE`/`RUN`/`HOOK` lines a boot writes, and under `docker run -d`
 it is one line in a log subject to rotation. The database stores only
 its Argon2id hash. There is no second account and no forgot-password
 flow, so the banner and the reset command below are the only two ways
@@ -628,8 +598,7 @@ Changing a password you still know needs none of this — use
 
 `DEBUG=true` lowers the log level to `DEBUG`, which turns on every
 statement GORM runs, the two by-design lookup misses on the
-unauthenticated routes, the rate limiter's own rejections, and fx's
+unauthenticated routes, and the rate limiter's own rejections. It is
-records of building the dependency graph at startup. It is
 meant to be safe to turn on while diagnosing a live service and safe to
 paste the output of into a bug report.
 
@@ -729,8 +698,7 @@ The app runs as a non-root user (`webhooker`, UID 1000), exposes port
 The `/var/lib/webhooker` volume holds all SQLite databases: the main
 application database (`webhooker.db`), the per-webhook event databases
 (`events-{uuid}.db`), and any archive databases written by `database`
-targets (`archive-{webhook_name}-{target_name}-{target_uuid}.db`). Mount
+targets (`archive-{uuid}.db`). Mount this as a persistent volume to
-this as a persistent volume to
 preserve data across container restarts.
 
 **The container sets its data directory's owner and mode itself
@@ -855,9 +823,9 @@ reports.
    was given, so on any port other than 443 `$host` makes every form
    POST — including login — fail with `403 origin invalid`, with
    nothing in the error naming the cause.
-5. **Keep the proxy's access log.** webhooker's own access log names
+5. **Keep the proxy's access log.** webhooker's own access log records
-   the client in its `clientIP` field only while `TRUSTED_PROXIES`
+   the peer address, which behind a proxy is always the proxy. The
-   covers the proxy; the proxy's log names it regardless. nginx's
+   proxy's log is the only record of which client sent what. nginx's
    default `combined` format already logs `$remote_addr`; do not
    replace it with one that drops the client address, and retain those
    logs as long as you would want to answer a question about traffic.
@@ -886,8 +854,9 @@ server {
     # webhooker's message.
     client_max_body_size 1m;
 
-    # $remote_addr is the client. webhooker's own log names it, as
+    # $remote_addr is the client. webhooker's own log records this
-    # clientIP, only while TRUSTED_PROXIES covers this proxy.
+    # proxy and nothing else, so this file is the only place the
+    # client's address is written down.
     access_log /var/log/nginx/webhooker.access.log combined;
 
     location / {
@@ -968,13 +937,13 @@ is both the simplest and the only complete rule:
   encryption key), users, API keys, webhooks, entrypoints, targets.
 - `events-{webhook_uuid}.db` — **one per webhook**. Events, deliveries,
   delivery results.
-- `archive-{webhook_name}-{target_name}-{target_uuid}.db` — **one per
+- `archive-{webhook_uuid}.db` — **one per webhook that has a `database`
-  `database` target**. Archived events. The two names are made safe for
+  target**. Archived events. Keyed on the webhook UUID, not the target
-  a file name, and the file is renamed when the webhook or the target is
+  UUID: a webhook with several `database` targets still has exactly one
-  (see [Database Architecture](#database-architecture)).
+  archive file.
 
-`{webhook_uuid}` and `{target_uuid}` are UUID primary keys in their
+`{webhook_uuid}` is the webhook's UUID primary key in its canonical
-canonical 36-character hyphenated form, so a real filename looks like
+36-character hyphenated form, so a real filename looks like
 `events-3f2a1c9e-....db`. The only other file is `webhooker.lock`, the
 always-empty [single-instance lock](#single-instance-lock); it holds no
 state and is not part of the backup set — a copied one is stale and
@@ -1048,8 +1017,8 @@ stopped copy.
 
 Archive databases are the one exception the service is built for: the
 archive writer closes and reopens its handle around writes (debounced
-to at most one reopen per second), so an operator can move an
+to at most one reopen per second), so an operator can move
-`archive-….db` away for offline retention while the service runs,
+`archive-{uuid}.db` away for offline retention while the service runs,
 and it is recreated on the next write. See
 [Database Architecture](#database-architecture). That is a
 move-the-file-away workflow, not a substitute for the backup procedures
@@ -1067,7 +1036,7 @@ happens on the next write past the debounce window, when the connection
 pool retires the idle connection (about a minute after the last write),
 or at the idle archive sweep — measured, the same file was a complete
 20 KB `.db` with no sidecars about a minute after its last write. A
-clean stop closes it too. So either move the `archive-….db` together
+clean stop closes it too. So either move `archive-{uuid}.db` together
 with any `-wal`/`-shm` beside it, or wait until there are none.
 
 ### Restore
@@ -1202,7 +1171,7 @@ commit still produce a byte-identical binary.
 Treat a backup with the same care as the credentials inside it. Encrypt
 backups at rest and restrict who can read them.
 
-- `events-{uuid}.db` and `archive-….db` hold the **full payload
+- `events-{uuid}.db` and `archive-{uuid}.db` hold the **full payload
   body and headers** of every event as received, including whatever the
   sending service put in them — tokens, signatures, personal data.
 - Event databases written before
@@ -1271,7 +1240,7 @@ What that means for an operator:
 This repository adheres to the
 [Scripts to Rule Them All](https://github.com/github/scripts-to-rule-them-all)
 standard: normalized scripts in `script/` are the entrypoints for the
-development workflow. Eleven of the Makefile's eighteen targets are thin
+development workflow. Ten of the Makefile's seventeen targets are thin
 shims that call them; `build`, `run`, `dev`, `deps`, `clean`, `css` and
 `version` are inline commands with no script behind them, though `build`,
 `run` and `dev` first run `script/assets`, and `build` and `version` both
@@ -1292,8 +1261,6 @@ We provide:
 - `script/assets` — extract Alpine.js from its tarball in `3p/` (see
   [Third-party browser assets](#third-party-browser-assets))
 - `script/test` — run the test suite
-- `script/test-browser` — run the browser test in Docker (see
-  [Third-party browser assets](#third-party-browser-assets))
 - `script/lint` — run golangci-lint in Docker (see Linting below)
 - `script/fmt` — format all code (writes)
 - `script/fmt-check` — check formatting (read-only)
@@ -1314,33 +1281,11 @@ We provide:
 
 ## Third-party browser assets
 
-The web UI serves one third-party script, Alpine.js, in its CSP build: the npm
+The web UI serves one third-party script, Alpine.js. Its npm package tarball
-package `@alpinejs/csp`. The pages' Content-Security-Policy forbids eval, which
+is committed as `3p/alpinejs-3.14.9.tgz`, byte for byte as the npm registry
-the standard `alpinejs` build needs to run the expressions written in the
+publishes it. It is a dependency, not this repo's build output, so
-markup. The CSP build runs no expressions, so every Alpine directive in
+`REPO_POLICIES.md`'s rule against committed build artifacts does not apply.
-`templates/` only names a property or method of a component registered in
+The directory is `3p/` rather than `vendor/` because Go treats a root
-`static/js/app.js`: `x-data="collapsible"` and `@click="toggle"`, never
-`x-data="{ open: false }"` or `@click="open = !open"`.
-
-A browser test in `internal/server` loads the webhook page and the event log
-under the real policy and checks that: both add forms stay hidden until Add is
-clicked; choosing Slack in the add target form leaves the HTTP fields out of
-what it submits, also after leaving the page and going back to it, when the
-browser restores the choice; the Copy button beside an entrypoint URL reads
-"Copied" once clicked; an event expands and collapses, and so do a delivery's
-attempts inside it; and at phone width the menu button opens and closes the
-mobile menu. It also fails if the browser reports a console warning or error,
-an uncaught exception, or anything the policy refused. `make check` and the
-image build lint it but do not run it, and `make test` leaves it out (its file
-is built only with the `browser` build tag). Run it with `make test-browser`
-after changing `templates/` or `static/js/`: that builds `Dockerfile.browser`,
-which runs the test in a digest-pinned headless browser image, so the host
-needs no browser.
-
-The package's tarball is committed as `3p/alpinejs-csp-3.14.9.tgz`, byte for
-byte as the npm registry publishes it. It is a dependency, not this repo's build
-output, so `REPO_POLICIES.md`'s rule against committed build artifacts does not
-apply. The directory is `3p/` rather than `vendor/` because Go treats a root
 `vendor/` directory as its module vendor directory.
 
 `script/assets` (`make assets`) extracts the browser build,
@@ -1351,11 +1296,10 @@ nothing downloads Alpine.js. The extracted file is not committed, and
 `.dockerignore` keeps any host copy out of the build context.
 
 To move to a new version: download
-`https://registry.npmjs.org/@alpinejs/csp/-/csp-<version>.tgz`, check it against
+`https://registry.npmjs.org/alpinejs/-/alpinejs-<version>.tgz`, check it
-the `dist.integrity` hash listed at
+against the `dist.integrity` hash listed at
-`https://registry.npmjs.org/@alpinejs/csp/<version>`, replace the tarball in
+`https://registry.npmjs.org/alpinejs/<version>`, replace the tarball in `3p/`
-`3p/` with it as `alpinejs-csp-<version>.tgz`, update its file name in
+with it, update its file name in `script/assets`, and run `make check`.
-`script/assets`, and run `make check` and `make test-browser`.
 
 ## Rationale
 
@@ -1645,9 +1589,8 @@ events should be forwarded.
   is built on the same HTTP core as `http` and honours `max_retries`
   identically, circuit breaker included. See the Slack target section
   under "Per-Webhook Event Databases" for the message format.
-- **`database`** — Archive the full event as a row into the target's
+- **`database`** — Archive the full event as a row into a separate
-  own archive database
+  per-webhook archive database (`archive-{webhookID}.db`) for long-term
-  (`archive-{webhook_name}-{target_name}-{target_uuid}.db`) for long-term
   retention, with an optional creation-validated expiry (default: keep
   forever). No external delivery and no retries; an archive write
   failure fails the delivery. See the database target section under
@@ -1825,7 +1768,7 @@ retries) is individually logged for full observability.
 #### EventTotals and TargetTotals
 
 Running counts in each event database, read by the statistics pane at the
-top of the webhook page and by the webhook list. `EventTotals` is one row:
+top of the webhook page. `EventTotals` is one row:
 
 | Field            | Type      | Description |
 | ---------------- | --------- | ----------- |
@@ -1857,14 +1800,6 @@ target. Its failure percentage for a window is the deliveries that became
 `failed` in it out of all that became `delivered` or `failed` in it, and
 a dash when none did.
 
-The webhook list at `/hooks` shows three of the pane's figures for each
-webhook: its events within retention and its last event, both from
-`EventTotals`, and its deliveries that failed in the last 24 hours,
-counted with the pane's query. It opens each webhook's event database once
-(the handle stays open) and runs those two reads there, so its cost grows
-with the number of webhooks and, for each, with the deliveries that
-finished in the last 24 hours, never with the events stored.
-
 #### Event-tier indexes
 
 These indexes on the per-webhook event databases are declared in the model
@@ -1872,7 +1807,7 @@ tags, so `AutoMigrate` creates them on a fresh database:
 
 | Table              | Columns                     | Serves |
 | ------------------ | --------------------------- | ------ |
-| `deliveries`       | `status`, `deleted_at`, `finished_at`, `target_id` | Startup recovery, the retry and pending sweeps every 60 seconds and the queue-depth sampler every 30 seconds, which select deliveries by status, and the webhook page's statistics and the webhook list, which count each target's deliveries by status and when they finished |
+| `deliveries`       | `status`, `deleted_at`, `finished_at`, `target_id` | Startup recovery, the retry and pending sweeps every 60 seconds and the queue-depth sampler every 30 seconds, which select deliveries by status, and the webhook page's statistics, which count each target's deliveries by status and when they finished |
 | `deliveries`       | `event_id`, `deleted_at`    | The event log, which loads each event's deliveries, and retention, which counts and deletes the deliveries of expired events |
 | `delivery_results` | `delivery_id`, `deleted_at` | The event log, which loads the attempts of a page's deliveries, and retention, which deletes the attempts of expired events |
 | `events`           | `deleted_at`, `created_at`  | The webhook page's statistics, which count recent events |
@@ -1969,41 +1904,9 @@ The **database target type** builds on this architecture to provide
 long-term archiving, separate from the per-webhook event database (which
 may prune events under its own retention). Delivering to a database
 target writes the full event — body, headers, method, content type, and
-webhook/entrypoint/event identifiers — as a row into the target's own
+webhook/entrypoint/event identifiers — as a row into a dedicated archive
-archive database, `archive-{webhook_name}-{target_name}-{target_uuid}.db`,
+database, `archive-{webhookID}.db`, stored under the data directory
-stored under the data directory beside the event database. Each
+beside the event database. After each write the archive handle is closed
-`database` target has its own archive file, even when one webhook has
-several.
-
-Both names are made safe for a file name the same way: lowercased, ASCII
-letters and digits kept, every other run of characters turned into a
-single `-`, no `-` at either end, cut to 40 characters, and `unnamed`
-when nothing is left. The target UUID keeps the file name unique. A
-webhook named `Orders (EU)` with a target named `Long-term archive`
-archives into `archive-orders-eu-long-term-archive-{target_uuid}.db`.
-Renaming the webhook or the target renames the file, under the same
-lock the archive writes and the archive sweeper take. Webhook edits,
-target edits and target creation run one at a time, so no edit can
-rename the file between another's rename and save, and the name on disk
-matches the UI. A rename never replaces a file: if one already has
-the new name, the edit is refused with an error naming that file, and
-the stored name stays. If the archive is not there (the operator moved
-it away), the rename is not an error, and the next write creates the
-file under the new name.
-
-The file is moved just before the new name is saved. If the process
-stops between the two, the archive is left under the new name while the
-UI still shows the old one, and the next delivery starts a second
-archive under the name shown. To bring them back together, stop the
-service before moving anything, and move each archive as its `.db`
-together with any `-wal` and `-shm` beside it, since the `-wal` can hold
-rows that are not yet in the `.db`. If no file has the name shown, move
-the archive under the new name back to it. If a second archive already
-has the name shown, move the archive under the new name out of the data
-directory instead and keep it as you would any archive moved away. Then
-start the service again.
-
-After each write the archive handle is closed
 and reopened, debounced to at most once per second, so an operator can
 move the archive file away for offline archiving without stopping the
 service; a moved or removed archive file is recreated automatically on
@@ -2014,56 +1917,35 @@ older than the expiry are pruned each time the archive is (re)opened. An
 archive write failure is never silent success: the delivery records a
 failed attempt with the error and is marked failed.
 
-Because reopens only happen on writes, an archive whose target has
+Because reopens only happen on writes, an archive belonging to a webhook
-stopped receiving events would never be pruned. A background **archive
+that has stopped receiving events would never be pruned. A background
-sweeper** closes that gap: on the same interval as the event retention
+**archive sweeper** closes that gap: on the same interval as the event
-reaper (`RETENTION_SWEEP_INTERVAL`) it prunes every archive whose
+retention reaper (`RETENTION_SWEEP_INTERVAL`) it prunes every archive
-database target declares a positive expiry, whether or not the target
+whose database target declares a positive expiry, whether or not the
-is still receiving traffic. The sweep never creates an archive — a
+webhook is still receiving traffic. The sweep never creates an archive —
-target whose archive file does not yet exist is skipped, not initialised
+a webhook whose archive file does not yet exist is skipped, not
-— it takes the same per-target lock the write path uses, so it can never
+initialised — it takes the same per-webhook lock the write path uses, so
-interleave with a write, and it leaves the archive closed afterwards so
+it can never interleave with a write, and it leaves the archive closed
-the move-the-file-away workflow keeps working. Archives with no expiry,
+afterwards so the move-the-file-away workflow keeps working. Archives
-or the expiry `never`, are not touched by the sweep at all.
+with no expiry, or the expiry `never`, are not touched by the sweep at
+all.
 
-Because each `database` target has its own archive file, a target's
+Note that a webhook has one archive file but may carry more than one
-`expiry` governs only its own archive. Two `database` targets on one
+`database` target, each with its own `expiry`. The shortest expiry
-webhook with different expiries keep two archives, each pruned on its
+configured on any of them therefore governs the whole archive, and the
-own schedule.
+sweep applies it whether or not the webhook is still receiving events.
+Configure a single `database` target per webhook unless you intend that.
 
-Each `database` target on the webhook page has a **Download** button,
+Deleting a webhook releases its archive: the delivery engine's cached
-which returns its archive as one gzipped JSON file,
+archive writer is dropped and its file handle closed, so nothing lingers
-`archive-{webhook_name}-{target_name}-{YYYYMMDDTHHMMSSZ}.json.gz`, the
+after the webhook is gone. The archive **file itself is deliberately
-names made safe as above and the time in UTC. The file holds one
+left on disk**. Unlike the event database — per-webhook working storage
-object: `webhook` and `target`, each an `id` and a `name`;
+that is hard-deleted with the webhook — an archive is long-term storage
-`exported_at`; and `archived_events`, one object per archived row with
+an operator may still want to keep or move away for offline retention,
-every column, keyed by column name. A body that is not valid UTF-8 is
+and destroying it as a side effect of deleting a webhook would be
-written in base64, with `"body_encoding": "base64"` beside it. An
+unrecoverable. Removing `archive-{webhookID}.db` is the operator's call.
-archive that does not exist yet, or was moved away, downloads with an
+Deleting a webhook's last `database` target releases the writer the same
-empty `archived_events`; the download never creates the file.
+way, and for the same reason leaves the file alone.
-
-The download streams: each row is read and written out compressed
-before the next is read, so neither the archive nor the JSON is held in
-memory. It reads on a connection of its own, inside one read-only
-transaction, so the file holds the archive as it stood when the
-download started, and archive writes go on meanwhile, since under WAL a
-reader never blocks a writer. While it runs, the `-wal` cannot be
-checkpointed past what it reads, so a long download lets the `-wal`
-grow. It finds the file by the stored names under the lock that webhook
-edits, target edits and target creation hold, and lets go once the file
-is open: a rename during the download moves the file without affecting
-it.
-
-Deleting a webhook releases its archives: the delivery engine's cached
-archive writers are dropped and their file handles closed, so nothing
-lingers after the webhook is gone. The archive **files themselves are
-deliberately left on disk**. Unlike the event database — per-webhook
-working storage that is hard-deleted with the webhook — an archive is
-long-term storage an operator may still want to keep or move away for
-offline retention, and destroying it as a side effect of deleting a
-webhook would be unrecoverable. Removing an `archive-….db` is the
-operator's call. Deleting a `database` target releases its writer the
-same way, and for the same reason leaves its file alone.
 
 The **Slack target type** sends webhook events as formatted messages to
 any Slack-compatible incoming webhook URL (works with Slack, Mattermost,
@@ -2510,21 +2392,20 @@ trade.
 Net: **one `INFO` line per request, of at most 2,560 bytes.** That
 ceiling is arithmetic, not an observation: 3 × (512 + 11) for `url`,
 `useragent` and `referer`, plus 128 + 11 for `request_id`, plus 32 + 11
-for `method`, plus a 405-byte fixed portion (the field names, the
+for `method`, plus a 336-byte fixed portion (the field names, the
-punctuation, both timestamps at their longest, `remoteIP` and
+punctuation, both timestamps at their longest, an IPv6 `remoteIP` with
-`clientIP` each charged as an IPv6 address with a zone, the status and
+a zone, the status and the latency) — 2,087 bytes, stated at 2,560 so
-the latency) — 2,156 bytes, stated at 2,560 so the figure has headroom.
+the figure has headroom. `internal/middleware/accesslog_test.go`
-`internal/middleware/accesslog_test.go` asserts it against 8 KB of
+asserts it against 8 KB of client-chosen text in the path, in the
-client-chosen text in the path, in the query, and in each of
+query, and in each of `User-Agent`, `Referer` and `X-Request-Id`,
-`User-Agent`, `Referer`, `X-Request-Id` and `X-Forwarded-For`,
 including cases built from the characters the handlers escape, and
-against a 5xx that keeps its concrete path while all three header fields
+against the widest access log line the service can be made to write: a
-are also at their budget and an `X-Forwarded-For` sent from a trusted
+5xx that keeps its concrete path while all three header fields are also
-proxy ends in an IPv6 client address at its longest followed by an 8 KB
+at their budget. Every case runs through both handlers
-zone, where `clientIP` must name the address without the zone. Every
+`internal/logger` can select — the JSON one and the text one it installs
-case runs through both handlers `internal/logger` can select — the JSON
+on a tty — since the two do not escape alike and the ceiling is quoted
-one and the text one it installs on a tty — since the two do not escape
+unqualified. Measured over a real connection, the widest access log line
-alike and the ceiling is quoted unqualified.
+is 1,972 bytes.
 
 Multiply that ceiling by the request rate to size log storage. Note
 that the rate is not bounded by the limits above on every route:
@@ -2632,10 +2513,11 @@ on all three arms of `Trace`, including the routine one an operator
 reaches at `DEBUG`, which is the only level at which a successful
 `INSERT` is written at all. One GORM path does not consult the filter —
 `(*gorm.DB).Scan`, which records the statement through GORM's own trace
-recorder. No production code path calls it; only tests do, and what a
+recorder. No production code path calls it; its one caller is
-test binds is fixture data. `internal/gormlog/scan_guard_test.go` fails
+`internal/database/database_test.go:91`, whose `SELECT 1` binds
-if a non-test file calls it. `Pluck`, `Row` and `Raw` all run through
+nothing, and `internal/gormlog/scan_guard_test.go` fails if a non-test
-the normal callback processor and are filtered.
+file calls it. `Pluck`, `Row` and `Raw` all run through the normal
+callback processor and are filtered.
 See `#### What DEBUG=true exposes` under Configuration.
 
 What that ceiling does **not** cover, stated here so the figure is not
@@ -2661,20 +2543,16 @@ read as more than it is:
   that type on a specific webhook, and each line it writes is bounded
   per event by the 1 MB receiver body cap. Adding one is a decision to
   spend log volume on that webhook's payloads.
-- **The Go runtime**, which does not go through `internal/logger`. The
+- **Two writers that do not go through `internal/logger` at all**, both
-  runtime writes an unrecovered panic or a fatal error itself, as plain
+  on standard error. `fx` prints the dependency graph and the lifecycle
-  text on standard error, and that output cannot be redirected. A panic
+  hooks through its default console logger at startup and shutdown —
-  in a background worker rather than in a request handler is the case
+  nothing calls `fx.WithLogger`, and `fx.New` builds that logger over
-  that reaches it, since nothing recovers those. It carries no
+  `os.Stderr`. The Go runtime writes a panic or a fatal error itself; a
-  client-chosen value at a client-chosen length: the service's own
+  panic in a background worker rather than in a request handler is the
-  `panic` calls are invariant guards over constants and over
+  case that reaches it, since nothing recovers those. Neither carries a
-  `crypto/rand`, apart from the one that hands `http.ErrAbortHandler`
+  client-chosen value at a client-chosen length: the five `panic` calls
-  back to `net/http`, described below.
+  in this service are invariant guards over constants and over
-- **A failure before fx's logger is built**, such as an invalid
+  `crypto/rand`.
-  configuration value. fx's logger takes the configuration, so when
-  that fails fx's own console logger still prints the failure as plain
-  text on standard error. Its values come from the operator's
-  environment, not from a client.
 - **`net/http`'s own faults**, which are _not_ a separate writer.
   `internal/server/http.go` builds its server with a nil `ErrorLog`, so
   `net/http` falls back to the `log` package's default logger — and
@@ -2865,9 +2743,9 @@ remedies are to block the source at the reverse proxy, or to
 rate-limit `POST /pages/login` there — the one place a limit can be
 applied without reintroducing the lockout, because the proxy sees the
 real client address. `TRUSTED_PROXIES` does not stop the saturation.
-The flood's source is in the `clientIP` field of webhooker's access
+The flood's source is in the proxy's access log: webhooker's own logs
-log while `TRUSTED_PROXIES` covers the proxy, and in the proxy's own
+record the proxy's address, not the client's (see
-access log either way (see [Trusted proxies](#trusted-proxies)).
+[Deployment behind a reverse proxy](#deployment-behind-a-reverse-proxy)).
 
 Finer-grained per-webhook rate limits (configured in the web UI and
 enforced in the webhook handler) can layer on top of this env-level
@@ -2880,7 +2758,7 @@ abuse limit later; they are tracked as future work.
 | Method | Path                        | Description |
 | ------ | --------------------------- | ----------- |
 | `GET`  | `/`                         | Root redirect, 303 (authenticated → `/hooks`, unauthenticated → `/pages/login`) |
-| `GET`  | `/.well-known/healthcheck`  | Health check (JSON: `status`, `now`, `uptimeSeconds`, `uptimeHuman`, `version`, `appname`) |
+| `GET`  | `/.well-known/healthcheck`  | Health check (JSON: `status`, `now`, `uptimeSeconds`, `uptimeHuman`, `version`, `appname`, `maintenanceMode`) |
 | `GET`, `HEAD` | `/s/*`              | Static file serving (embedded CSS, JS). `GET` and `HEAD` only — `POST`, `PUT`, `PATCH`, `DELETE`, `OPTIONS`, `TRACE` and `CONNECT` are answered `405 Method Not Allowed` with `Allow: GET, HEAD`. Any other method (such as `PROPFIND`) is refused by chi before it reaches this route, and gets `405` without an `Allow` header. Pinned by `TestStaticServesOnlyGetAndHead` |
 | `POST` | `/h/{uuid}`                 | Webhook receiver endpoint. `POST` only — every other method is answered `405 Method Not Allowed` with `Allow: POST`. Rate limited (see [Rate Limiting](#rate-limiting)) |
 
@@ -2902,7 +2780,6 @@ returns to the page that was asked for.
 | ------ | ------------------------ | ----------- |
 | `GET`  | `/user/{username}`       | User profile page |
 | `POST` | `/user/{username}/password` | Change the user's password (5 per minute per bucket, then `429`; `503` if no verification slot frees up within 5s, or immediately if 16 requests are already queued for one) |
-| `GET`  | `/settings`              | Read-only list of the configuration the server is running with; `METRICS_PASSWORD` and `SENTRY_DSN` show only as set or not set |
 | `GET`  | `/hooks`                 | List user's webhooks |
 | `GET`  | `/hooks/new`             | Create webhook form |
 | `POST` | `/hooks/new`             | Create webhook submission |
@@ -2920,7 +2797,6 @@ returns to the page that was asked for.
 | `POST` | `/hook/{id}/targets`     | Add target to webhook |
 | `GET`  | `/hook/{id}/targets/{targetID}/edit` | Edit target form. The one page that renders a target's destination URL and header values in full, rather than masked |
 | `POST` | `/hook/{id}/targets/{targetID}/edit` | Edit target submission |
-| `GET`  | `/hook/{id}/targets/{targetID}/download` | Download a `database` target's archive as one gzipped JSON file. See [Database Architecture](#database-architecture) |
 | `POST` | `/hook/{id}/targets/{targetID}/delete` | Delete a target |
 | `POST` | `/hook/{id}/targets/{targetID}/toggle` | Enable or disable a target |
 
@@ -2955,7 +2831,7 @@ imports. The entry point is `cmd/webhooker/main.go`.
 ```
 webhooker/
 ├── 3p/
-│   └── alpinejs-csp-3.14.9.tgz  # Alpine.js CSP build npm package, extracted by make assets
+│   └── alpinejs-3.14.9.tgz    # Alpine.js npm package, extracted by make assets
 ├── cmd/webhooker/
 │   └── main.go               # Entry point: subcommand dispatch; no args locks DATA_DIR and wires fx
 ├── internal/
@@ -2966,8 +2842,7 @@ webhooker/
 │   ├── resetpw/
 │   │   └── resetpw.go         # `webhooker resetpw`: set an account's password, stopped deployments only
 │   ├── config/
-│   │   ├── config.go          # Configuration loading from environment variables
+│   │   └── config.go          # Configuration loading from environment variables
-│   │   └── testing.go         # ClearEnvForTest: an empty environment for one test
 │   ├── database/
 │   │   ├── base_model.go      # BaseModel with UUID primary keys
 │   │   ├── database.go        # GORM connection, migrations, admin seed
@@ -3002,7 +2877,6 @@ webhooker/
 │   │   ├── target_slack.go    # Slack/Mattermost incoming-webhook target
 │   │   ├── target_database.go # Database archive target
 │   │   ├── target_database_archive.go  # Archive file lifecycle and pruning
-│   │   ├── target_database_export.go   # Archive download as gzipped JSON
 │   │   ├── target_log.go      # Log target (stdout)
 │   │   ├── target_config_view.go  # Masked target config for templates
 │   │   ├── archive_sweeper.go # Periodic pruning of idle archives
@@ -3019,7 +2893,6 @@ webhooker/
 │   │   ├── healthcheck.go     # Health check handler
 │   │   ├── index.go           # Index page handler
 │   │   ├── profile.go         # User profile handler
-│   │   ├── settings.go        # Read-only Settings page handler
 │   │   ├── source_management.go  # Webhook CRUD handlers
 │   │   └── webhook.go         # Webhook receiver handler
 │   ├── healthcheck/
@@ -3027,7 +2900,7 @@ webhooker/
 │   ├── lifecycle/
 │   │   └── lifecycle.go       # Shared stop-hook waiter, bounded by the stop context
 │   ├── logger/
-│   │   └── logger.go          # slog setup with TTY detection; fx's event logger
+│   │   └── logger.go          # slog setup with TTY detection
 │   ├── metrics/
 │   │   └── metrics.go         # Delivery Prometheus collectors, labelled by target type
 │   ├── middleware/
@@ -3051,15 +2924,14 @@ webhooker/
 │   ├── static.go              # //go:embed directive
 │   ├── css/input.css          # Tailwind input, source for tailwind.css (make css)
 │   ├── css/tailwind.css       # Generated stylesheet the pages load
-│   ├── css/style.css          # Hand-written, loaded after tailwind.css: btn-small, the pointer cursor for input.css's buttons, the webhook list cards' focus outline
+│   ├── css/style.css          # Older hand-written stylesheet, no longer loaded
-│   ├── js/app.js              # Copy-to-clipboard, and the Alpine.js components
+│   ├── js/app.js              # Progressive-enhancement copy-to-clipboard
-│   └── js/alpine.min.js       # Alpine.js CSP build, extracted from 3p/ by make assets, not committed
+│   └── js/alpine.min.js       # Alpine.js, extracted from 3p/ by make assets, not committed
 ├── templates/                 # Go HTML templates (base, login, sources, etc.)
 ├── script/                    # Scripts to Rule Them All entrypoints
 ├── Dockerfile                 # Three stages: lint, test+build, Alpine runtime
 ├── Dockerfile.lint            # Lint-only image built by script/lint
-├── Dockerfile.browser         # Browser test image built by script/test-browser
+├── Makefile                   # 10 of 17 targets shim script/; 7 are inline
-├── Makefile                   # 11 of 18 targets shim script/; 7 are inline
 ├── go.mod / go.sum
 └── .golangci.yml              # Linter configuration
 ```
@@ -3085,8 +2957,8 @@ Components are wired via Uber fx in this order:
 13. `delivery.New` — Event-driven delivery engine
 14. `delivery.NewArchiveSweeper` — Periodic pruning of idle archives
 15. `delivery.Engine` → `delivery.Notifier` — interface bridge
-16. `delivery.Engine` → `delivery.Archives` — interface bridge so
+16. `delivery.Engine` → `delivery.WebhookEvictor` — interface bridge so
-    deleting or renaming a webhook or target reaches its archive files
+    deleting a webhook releases its archive writer
 17. `server.New` — HTTP server and router
 
 The server starts via `fx.Invoke(func(*server.Server, *delivery.Engine,
@@ -3108,7 +2980,7 @@ Applied to all routes in this order:
    (HSTS, X-Content-Type-Options, X-Frame-Options, CSP, Referrer-Policy,
    Permissions-Policy)
 3. **Logging** — Structured request logging (method, URL, status,
-   latency, remote IP, client IP, user agent, request ID)
+   latency, remote IP, user agent, request ID)
 4. **Metrics** — Prometheus HTTP metrics (if `METRICS_USERNAME` and
    `METRICS_PASSWORD` are both set)
 5. **CORS** — Cross-origin resource sharing headers
@@ -3130,14 +3002,14 @@ local record instead of nothing. What that placement gives up is
 recovery of a panic in the six entries above it, none of which does
 more than set a header or start a timer.
 
-Each admin page route group (`/pages`, `/user/*`, `/settings`, `/hooks`,
+Each admin page route group (`/pages`, `/user/*`, `/hooks`,
-`/hook/*`) starts with its own **Recoverer** and, if `SENTRY_DSN` is set, its
+`/hook/*`) starts with its own **Recoverer** and, if `SENTRY_DSN` is
-own **Sentry** error reporting. That Recoverer answers a panic with the `500`
+set, its own **Sentry** error reporting. That Recoverer answers a panic
-error page in the normal layout; the global one keeps the plain-text `500` for
+with the `500` error page in the normal layout; the global one keeps
-every other route.
+the plain-text `500` for every other route.
 
-Additionally, form endpoints (`/pages`, `/user/*`, `/settings`,
+Additionally, form endpoints (`/pages`, `/user/*`, `/hooks`,
-`/hooks`, `/hook/*`) apply a **MaxBodySize** middleware that limits
+`/hook/*`) apply a **MaxBodySize** middleware that limits
 POST/PUT/PATCH request bodies to 1 MB. It is registered ahead of the
 CSRF middleware in every one of those route groups, because
 gorilla/csrf parses the form; if the cap were installed after it, form
@@ -3156,7 +3028,7 @@ declared length. A chunked request, or
 one that lies about its length, is hard-capped by
 `http.MaxBytesReader` and fails downstream at form-parse time.
 
-Those same five route groups then apply **CSRF** and **NoCache**
+Those same four route groups then apply **CSRF** and **NoCache**
 (`Cache-Control: no-store`, `Pragma: no-cache`), and every group except
 `/pages` applies **RequireAuth**. The rate limiters are per-route
 rather than global: **PasswordChangeRateLimit** on
@@ -3202,12 +3074,12 @@ check, see [The login endpoint](#the-login-endpoint).
   by middleware that runs before CSRF parses the form
 - **CSRF protection** via [gorilla/csrf](https://github.com/gorilla/csrf)
   on all state-changing forms (cookie-based double-submit tokens with
-  HMAC authentication). Applied to `/pages`, `/hooks`, `/hook`,
+  HMAC authentication). Applied to `/pages`, `/hooks`, `/hook`, and
-  `/settings`, and `/user` routes. Excluded from `/h` (inbound webhook
+  `/user` routes. Excluded from `/h` (inbound webhook POSTs) and
-  POSTs) and `/api` (stateless API). The middleware detects TLS
+  `/api` (stateless API). The middleware detects TLS per-request through
-  per-request through `internal/reqtls.IsTLS` — the same predicate the
+  `internal/reqtls.IsTLS` — the same predicate the session cookie uses —
-  session cookie uses — to set appropriate cookie security flags and
+  to set appropriate cookie security flags and Origin/Referer validation
-  Origin/Referer validation mode
+  mode
 - **The entrypoint URL is the receiver's only credential.** Nothing
   about an inbound request is verified; possession of the UUID
   authorises submission, and no shared secret or signature check will
@@ -3221,8 +3093,7 @@ check, see [The login endpoint](#the-login-endpoint).
   route through a single decision function, so they cannot disagree
   about a destination. An operator can permit specific blocks with
   [`ALLOWED_EGRESS_CIDRS`](#allowing-egress-to-your-own-network); the
-  guard cannot be switched off, and link-local, the unspecified
+  guard cannot be switched off, and link-local plus a
-  addresses `0.0.0.0` and `::`, and a
   [pinned set](#allowing-egress-to-your-own-network) of known cloud
   metadata endpoints — several of which are ULAs outside link-local —
   stay blocked whatever is listed, though listing `0.0.0.0/0` or
@@ -3269,9 +3140,9 @@ each hook. The order, read off the fx stop-hook log:
 
 1. `ArchiveSweeper`
 2. `RetentionReaper`
-3. `server` — the HTTP drain, bounded by `server.ShutdownTimeout`
+3. `server` — the HTTP drain, bounded separately by
-   (**3 seconds**) and by what the hooks before it left, then a Sentry
+   `server.ShutdownTimeout` (**3 seconds**), then a Sentry flush if
-   flush if `SENTRY_DSN` is set
+   `SENTRY_DSN` is set
 4. `delivery.Engine` — waits for its workers, then closes the archive
    databases
 5. `healthcheck`
@@ -3291,30 +3162,23 @@ exhaust the sequence budget at the instant it finished, and every
 later hook — the delivery engine, the healthcheck, the webhook DB
 manager and the database close — would be skipped in exactly the
 case where the drain mattered. 3 seconds leaves 2 seconds
-(`server.TailHookReserve`) for the tail. The reserve is that
+(`server.TailHookReserve`) for the tail, which is far more than the
-remainder, not a figure sized to the tail, which takes about a
+microseconds it needs.
-millisecond.
 
 That reserve belongs to the tail hooks, not to the server hook, and
-the server hook could take it in two ways. The hooks before it may
+the Sentry flush is what could take it: it runs after the drain
-already have spent part of the budget, so a full 3-second drain
+**inside the same hook**, and `sentry.Flush` takes a bare duration
-would come out of the reserve; the drain is therefore also bounded
+and honours no context, so an unreachable Sentry endpoint would add
-by whatever is left on the stop context minus the reserve. And the
+its own timeout on top of a full-length drain and consume the whole
-Sentry flush runs after the drain **inside the same hook**, and
+sequence budget by itself. It is therefore clamped to whatever is
-`sentry.Flush` takes a bare duration and honours no context, so an
+left on the stop context minus the reserve, and skipped when that
-unreachable Sentry endpoint would add its own timeout on top of a
+leaves too little to be worth attempting — so a full-length drain
-full-length drain and consume the whole sequence budget by itself.
+means Sentry events are dropped rather than the database close being
-It is clamped the same way, and skipped when that leaves too little
+skipped.
-to be worth attempting — so a full-length drain means Sentry events
-are dropped rather than the database close being skipped.
 
-This does not make the database close unconditional. A slow
+This does not make the database close unconditional: a wedged
-`ArchiveSweeper` or `RetentionReaper` is enough to cut the shutdown
+`ArchiveSweeper` or `RetentionReaper` still runs first and can
-short, not only one that consumes the whole budget: what they spend
+consume the whole budget on its own.
-comes out of the drain first, so after 2 seconds of theirs a request
-still in flight gets 1 second to finish, and after 3 it gets none.
-Past 3 seconds they spend the reserve itself, and one that takes the
-whole budget skips every hook after it, the database close included.
 
 The value is chosen to sit inside the container stop grace period.
 Docker's default `docker stop` grace is 10 seconds and the Dockerfile
@@ -3412,9 +3276,8 @@ linked, which is what lets it run on the Alpine runtime image.
 inside the image, so a build that succeeds is a repo that is formatted,
 linted, tested and compiled. `script/lint` also uses Docker
 (`Dockerfile.lint`, see Linting above), so `make lint` and `make check`
-run the same pinned linter version the gate does; of the steps
+run the same pinned linter version the gate does; only `script/test`
-`make check` runs, only `script/test` and `script/fmt-check` run on the
+and `script/fmt-check` run on the host.
-host.
 
 #### CI gate honesty
 

cmd/webhooker/main.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"go.uber.org/fx"
-	"go.uber.org/fx/fxevent"
 	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/datadir"
@@ -38,19 +37,17 @@ import (
 // hook that used the whole budget would exhaust it at that instant,
 // and fx would skip every hook after the server — the delivery
 // engine, the healthcheck, the webhook DB manager and the database
-// close. That hook is the HTTP drain plus the Sentry flush that
+// close. That hook is the 3s HTTP drain plus the Sentry flush that
-// follows it in the same hook, and each is clamped to the stop
+// follows it in the same hook, so the flush is clamped to the stop
 // context's remaining time less server.TailHookReserve rather than
-// running for its own fixed 3s and 2s; the reserve is what the tail
+// running for its own fixed 2s; the reserve is what the tail hooks
-// hooks live on, and they are microsecond-scale in normal operation.
+// live on, and they are microsecond-scale in normal operation.
 // TestStopTimeout_LeavesHeadroomForTailHooks pins the arithmetic
-// across every drain length and every amount of budget the hooks
+// across every drain length.
-// before the server may already have spent.
 //
 // This does not make the database close unconditional: the
-// ArchiveSweeper and RetentionReaper hooks run before the server.
+// ArchiveSweeper and RetentionReaper hooks run before the server
-// What they spend comes out of the drain first, but past 3s it comes
+// and can still consume the whole budget on their own.
-// out of the reserve, and they can consume the whole budget.
 const stopTimeout = 5 * time.Second
 
 // exitUsage is the status for a command line this binary cannot make
@@ -171,19 +168,6 @@ func run(stderr io.Writer) int {
 func newApp() *fx.App {
 	return fx.New(
 		fx.StopTimeout(stopTimeout),
-		// fx's own events go through the service's logger, not fx's
-		// console logger on standard error. The exception is a failure
-		// before this logger is built, such as an invalid configuration
-		// value, which fx's console logger still prints there. fx holds
-		// its events back until this logger is built and then replays
-		// them, so it takes the configuration, which sets the level
-		// DEBUG=true asks for: without it the replay would run at INFO
-		// and drop every record of how the graph was built.
-		fx.WithLogger(
-			func(l *logger.Logger, _ *config.Config) fxevent.Logger {
-				return logger.NewFxLogger(l.Get())
-			},
-		),
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -208,10 +192,11 @@ func newApp() *fx.App {
 			// Wire *delivery.Engine as delivery.Notifier so the
 			// webhook handler can notify the engine of new deliveries.
 			func(e *delivery.Engine) delivery.Notifier { return e },
-			// Wire *delivery.Engine as delivery.Archives so deleting
+			// Wire *delivery.Engine as delivery.WebhookEvictor so
-			// or renaming a webhook or target reaches its archive
+			// deleting a webhook releases its archive writer.
-			// files.
+			func(e *delivery.Engine) delivery.WebhookEvictor {
-			func(e *delivery.Engine) delivery.Archives { return e },
+				return e
+			},
 			server.New,
 		),
 		fx.Invoke(

cmd/webhooker/main_test.go

@@ -2,19 +2,12 @@ package main
 
 import (
 	"bytes"
-	"encoding/json"
-	"io"
-	"log/slog"
-	"net"
-	"os"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/datadir"
 	"sneak.berlin/go/webhooker/internal/resetpw"
 	"sneak.berlin/go/webhooker/internal/server"
@@ -37,7 +30,6 @@ const dockerStopGrace = 10 * time.Second
 // fx.New applies options before it executes invokes, so the timeout
 // is set whether or not the graph itself can be constructed here.
 func TestNewApp_StopTimeout(t *testing.T) {
-	config.ClearEnvForTest(t)
 	t.Setenv("DATA_DIR", t.TempDir())
 
 	got := newApp().StopTimeout()
@@ -46,100 +38,6 @@ func TestNewApp_StopTimeout(t *testing.T) {
 	require.Less(t, got, dockerStopGrace)
 }
 
-// freePort returns a loopback TCP port that was free a moment ago, by
-// taking one and releasing it.
-func freePort(t *testing.T) int {
-	t.Helper()
-
-	var listenCfg net.ListenConfig
-
-	l, err := listenCfg.Listen(t.Context(), "tcp", "127.0.0.1:0")
-	require.NoError(t, err)
-
-	addr, ok := l.Addr().(*net.TCPAddr)
-	require.True(t, ok, "listener is not TCP")
-	require.NoError(t, l.Close())
-
-	return addr.Port
-}
-
-// TestNewApp_SendsFxEventsToTheLogger starts and stops the app main
-// runs, with DEBUG=true, and reads back what reached the service's
-// logger. fx's own events must arrive there as structured records:
-// the start at INFO, and at DEBUG the records of how the graph was
-// built.
-//
-// fx holds its events back until its logger is built and then replays
-// them all at once, so the earliest of them arriving shows the replay
-// ran at DEBUG: that globals.New was provided, which fx records before
-// anything is built, and the run of logger.New, which happens before
-// the configuration sets the level.
-func TestNewApp_SendsFxEventsToTheLogger(t *testing.T) {
-	config.ClearEnvForTest(t)
-	t.Setenv("DATA_DIR", t.TempDir())
-	t.Setenv("PORT", strconv.Itoa(freePort(t)))
-	t.Setenv("DEBUG", "true")
-
-	// internal/logger writes to whatever os.Stdout is when it builds
-	// its handler. A file is not a terminal, so that handler is the
-	// JSON one the service uses in production.
-	out, err := os.CreateTemp(t.TempDir(), "stdout")
-	require.NoError(t, err)
-
-	stdout := os.Stdout
-	os.Stdout = out
-
-	t.Cleanup(func() {
-		os.Stdout = stdout
-		_ = out.Close()
-	})
-
-	app := newApp()
-	require.NoError(t, app.Start(t.Context()))
-	require.NoError(t, app.Stop(t.Context()))
-
-	_, err = out.Seek(0, io.SeekStart)
-	require.NoError(t, err)
-
-	written, err := io.ReadAll(out)
-	require.NoError(t, err)
-
-	type record struct {
-		Level       string `json:"level"`
-		Msg         string `json:"msg"`
-		Name        string `json:"name"`
-		Constructor string `json:"constructor"`
-	}
-
-	var records []record
-
-	for line := range strings.Lines(string(written)) {
-		var r record
-
-		// The first-boot banner is plain text, not a record.
-		if json.Unmarshal([]byte(line), &r) == nil {
-			records = append(records, r)
-		}
-	}
-
-	const pkg = "sneak.berlin/go/webhooker/internal/"
-
-	info := slog.LevelInfo.String()
-	debug := slog.LevelDebug.String()
-
-	assert.Contains(t, records, record{Level: info, Msg: "started"})
-	assert.Contains(t, records, record{
-		Level: debug, Msg: "provided", Constructor: pkg + "globals.New()",
-	})
-	assert.Contains(t, records, record{
-		Level: debug, Msg: "run", Name: pkg + "logger.New()",
-	})
-	assert.Contains(t, records, record{Level: debug, Msg: "invoking"})
-	assert.Contains(t, records, record{
-		Level: debug, Msg: "initialized custom fxevent.Logger",
-	})
-}
-
 // TestRunRefusesLockedDataDir pins what an operator's second start
 // does. The entry point must refuse before it builds the fx graph —
 // nothing may open a database in a DATA_DIR another process holds —
@@ -252,40 +150,22 @@ const tailHeadroom = 2 * time.Second
 // can produce, since a shorter drain leaves the flush more room and
 // the worst case is not necessarily at either extreme.
 //
-// Nor does the hook start on a full budget: the ArchiveSweeper and
+// Shrinking either budget, or unbounding the flush again, must fail
-// RetentionReaper hooks run before it, and whatever they spent is
+// here rather than silently recreating a hook that swallows the
-// gone. The outer sweep walks every amount they can spend. Once they
+// whole sequence.
-// have eaten into the headroom themselves, the hook must spend
-// nothing of what is left. A drain that starts on the full budget
-// must still get all of ShutdownTimeout, so a smaller stopTimeout
-// cannot silently shorten every drain.
-//
-// Shrinking either budget, or unbounding the drain or the flush
-// again, must fail here rather than silently recreating a hook that
-// swallows the whole sequence.
 func TestStopTimeout_LeavesHeadroomForTailHooks(t *testing.T) {
 	t.Parallel()
 
 	require.Less(t, server.ShutdownTimeout, stopTimeout)
-	require.Equal(
-		t, server.ShutdownTimeout, server.DrainBudget(stopTimeout),
-		"a drain that starts on the full stop budget is cut short",
-	)
 
 	const step = 10 * time.Millisecond
 
-	for spent := time.Duration(0); spent <= stopTimeout; spent += step {
+	for drain := time.Duration(0); drain <= server.ShutdownTimeout; drain += step {
-		remaining := stopTimeout - spent
+		hook := drain + server.SentryFlushBudget(stopTimeout-drain)
-		longest := max(server.DrainBudget(remaining), 0)
 
-		for drain := time.Duration(0); drain <= longest; drain += step {
+		require.LessOrEqual(
-			hook := drain + server.SentryFlushBudget(remaining-drain)
+			t, hook+tailHeadroom, stopTimeout,
-
+			"a %s drain leaves the tail hooks short", drain,
-			require.GreaterOrEqual(
+		)
-				t, remaining-hook, min(remaining, tailHeadroom),
-				"a %s drain after %s of earlier hooks leaves "+
-					"the tail hooks short", drain, spent,
-			)
-		}
 	}
 }

go.mod

@@ -4,8 +4,6 @@ go 1.26.1
 
 require (
 	github.com/99designs/basicauth-go v0.0.0-20230316000542-bf6f9cbbf0f8
-	github.com/chromedp/cdproto v0.0.0-20260922220944-a19bff23514f
-	github.com/chromedp/chromedp v0.16.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/getsentry/sentry-go v0.25.0
 	github.com/go-chi/chi v1.5.5
@@ -20,7 +18,7 @@ require (
 	github.com/prometheus/client_model v0.5.0
 	github.com/slok/go-http-metrics v0.11.0
 	github.com/stretchr/testify v1.11.1
-	go.uber.org/fx v1.24.0
+	go.uber.org/fx v1.20.1
 	golang.org/x/crypto v0.38.0
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/sqlite v1.5.4
@@ -31,17 +29,13 @@ require (
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chromedp/sysutil v1.1.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3 // indirect
-	github.com/gobwas/httphead v0.1.0 // indirect
-	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.4.0 // indirect
 	github.com/gorilla/securecookie v1.1.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.10 // indirect
+	github.com/kr/text v0.2.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-sqlite3 v1.14.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
@@ -50,12 +44,13 @@ require (
 	github.com/prometheus/procfs v0.12.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
-	go.uber.org/dig v1.19.0 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/dig v1.17.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/mod v0.17.0 // indirect
 	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/sys v0.47.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
 	golang.org/x/text v0.25.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/protobuf v1.31.0 // indirect

go.sum

@@ -1,15 +1,14 @@
 github.com/99designs/basicauth-go v0.0.0-20230316000542-bf6f9cbbf0f8 h1:nMpu1t4amK3vJWBibQ5X/Nv0aXL+b69TQf2uK5PH7Go=
 github.com/99designs/basicauth-go v0.0.0-20230316000542-bf6f9cbbf0f8/go.mod h1:3cARGAK9CfW3HoxCy1a0G4TKrdiKke8ftOMEOHyySYs=
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chromedp/cdproto v0.0.0-20260922220944-a19bff23514f h1:8PK9FM4bE0C8GMoWBW5lVsef3U7sPICjDg6JqngyYhk=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/chromedp/cdproto v0.0.0-20260922220944-a19bff23514f/go.mod h1:3v4FIp5njIUyPDvqXsxEOxnB34lijG0up98/5kM1KaE=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/chromedp/chromedp v0.16.0 h1:rOO4deOm4CbZgBCa8mD9g2rDyIoNs0BkgvNrlbp5ouk=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/chromedp/chromedp v0.16.0/go.mod h1:rbuGKFT1vMcFcFqKfPIO1GpX/N+2s8onm2qMxZLbU5U=
-github.com/chromedp/sysutil v1.1.0 h1:PUFNv5EcprjqXZD9nJb9b/c9ibAbxiYo4exNWZyipwM=
-github.com/chromedp/sysutil v1.1.0/go.mod h1:WiThHUdltqCNKGc4gaU50XgYjwjYIhKWoHGPTUfWTJ8=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
@@ -24,14 +23,6 @@ github.com/go-chi/httprate v0.15.0 h1:j54xcWV9KGmPf/X4H32/aTH+wBlrvxL7P+SdnRqxh5
 github.com/go-chi/httprate v0.15.0/go.mod h1:rzGHhVrsBn3IMLYDOZQsSU4fJNWcjui4fWKJcCId1R4=
 github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
 github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
-github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3 h1:UADEEmDKgfXbtnGJZ97beY5XLo9ZechG1nlU4KnRrkE=
-github.com/go-json-experiment/json v0.0.0-20260820222146-c27c302e5fc3/go.mod h1:tphK2c80bpPhMOI4v6bIc2xWywPfbqi1Z06+RcrMkDg=
-github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
-github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
-github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
-github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.4.0 h1:CTaoG1tojrh4ucGPcoJFiAQUAsEWekEWvLy7GsVNqGs=
-github.com/gobwas/ws v1.4.0/go.mod h1:G3gNqMNtPppf5XUz7O4shetPpcZ1VJ7zt18dlUeakrc=
 github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
 github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -64,20 +55,17 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80 h1:6Yzfa6GP0rIo/kULo2bwGEkFvCePZ3qHDDTC3/J9Swo=
-github.com/ledongthuc/pdf v0.0.0-20220302134840-0c2507a12d80/go.mod h1:imJHygn/1yfhB7XSJJKlFZKl/J+dCPAknuiaGOshXAs=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
 github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
-github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde h1:x0TT0RDC7UhAVbbWWBzr41ElhJx5tXPWkIHA2HWPRuw=
-github.com/orisano/pixelmatch v0.0.0-20220722002657-fb0b55479cde/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
 github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=
@@ -94,24 +82,28 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/slok/go-http-metrics v0.11.0 h1:ABJUpekCZSkQT1wQrFvS4kGbhea/w6ndFJaWJeh3zL0=
 github.com/slok/go-http-metrics v0.11.0/go.mod h1:ZGKeYG1ET6TEJpQx18BqAJAvxw9jBAZXCHU7bWQqqAc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
 github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
-go.uber.org/dig v1.19.0 h1:BACLhebsYdpQ7IROQ1AGPjrXcP5dF80U3gKoFzbaq/4=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
-go.uber.org/dig v1.19.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/fx v1.24.0 h1:wE8mruvpg2kiiL1Vqd0CC+tr0/24XIB10Iwp2lLWzkg=
+go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI=
-go.uber.org/fx v1.24.0/go.mod h1:AmDeGyS+ZARGKM4tlH4FY2Jr63VjbEDJHtqXTGP5hbo=
+go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU=
-go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk=
-go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
+go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg=
-go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
-go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
+go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
+go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
 golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
 golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
@@ -119,8 +111,8 @@ golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
 golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
-golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
 golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=

internal/config/config.go

@@ -80,7 +80,8 @@ const (
 	// process over a Docker network or a private LAN connects from.
 	defaultTrustedProxies = "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16"
 
-	// maxPort is the highest valid TCP port number.
+	// maxPort is the highest valid TCP port number. The lower
+	// bound (at least 1) is enforced by envPositiveInt.
 	maxPort = 65535
 
 	// mappedV4Offset is the number of leading bits an IPv4-mapped
@@ -104,7 +105,7 @@ var ErrInvalidEnvironment = errors.New("invalid environment")
 var ErrNonPositiveValue = errors.New("value must be positive")
 
 // ErrInvalidPort is returned when an environment variable holding a
-// TCP port number is set to a number outside 1 to 65535.
+// TCP port number is set above the valid port range.
 var ErrInvalidPort = errors.New("invalid port")
 
 // ErrInvalidCIDR is returned when an environment variable holding a
@@ -148,6 +149,7 @@ type ConfigParams struct {
 type Config struct {
 	DataDir         string
 	Debug           bool
+	MaintenanceMode bool
 	Environment     string
 	MetricsPassword string
 	MetricsUsername string
@@ -194,13 +196,12 @@ type Config struct {
 	// otherwise refuse. The guard itself is always on: there is no
 	// setting that disables SSRF protection, and delivery's
 	// alwaysBlockedNetworks stays blocked no matter what is listed
-	// here. That set is link-local, the unspecified addresses
+	// here. That set is link-local plus the cloud metadata
-	// 0.0.0.0 and ::, and the cloud metadata endpoints outside
+	// endpoints outside it that disclose credentials or user data
-	// link-local that disclose credentials or user data at a
+	// at a provider-fixed, non-public address; it is not
-	// provider-fixed, non-public address; it is not exhaustive of
+	// exhaustive of every cloud's metadata address. See
-	// every cloud's metadata address. See
+	// alwaysBlockedNetworks for the authoritative list and the
-	// alwaysBlockedNetworks for the authoritative list and why
+	// criterion it is built from.
-	// each entry is on it.
 	AllowedEgressCIDRs []netip.Prefix
 
 	params *ConfigParams
@@ -362,27 +363,17 @@ func envPositiveInt(
 // envPort returns the value of the named environment variable parsed
 // as a TCP port number. Returns defaultValue if not set. A set value
 // that is unparseable, below 1, or above maxPort is a hard error
-// naming the key and the bad value; every out-of-range value wraps
+// naming the key and the bad value.
-// ErrInvalidPort, including one too large or too small for an int.
 func envPort(key string, defaultValue int) (int, error) {
-	v := os.Getenv(key)
+	port, err := envPositiveInt(key, defaultValue)
-	if v == "" {
+	if err != nil {
-		return defaultValue, nil
+		return 0, err
 	}
 
-	// strconv.ErrRange means a number too large or too small for an
+	if port > maxPort {
-	// int, which is outside the port range as well.
-	port, err := strconv.Atoi(v)
-	if err != nil && !errors.Is(err, strconv.ErrRange) {
 		return 0, fmt.Errorf(
-			"invalid integer for %s: %q: %w", key, v, err,
+			"%w: %s must be at most %d, got %d",
-		)
+			ErrInvalidPort, key, maxPort, port,
-	}
-
-	if err != nil || port < 1 || port > maxPort {
-		return 0, fmt.Errorf(
-			"%w: %s must be from 1 to %d, got %q",
-			ErrInvalidPort, key, maxPort, v,
 		)
 	}
 
@@ -666,6 +657,11 @@ func loadFromEnv() (*Config, error) {
 		return nil, err
 	}
 
+	maintenanceMode, err := envBool("MAINTENANCE_MODE", false)
+	if err != nil {
+		return nil, err
+	}
+
 	retentionSweepInterval, err := envPositiveDuration(
 		"RETENTION_SWEEP_INTERVAL",
 		defaultRetentionSweepInterval,
@@ -715,6 +711,7 @@ func loadFromEnv() (*Config, error) {
 	return &Config{
 		DataDir:                DataDir(),
 		Debug:                  debug,
+		MaintenanceMode:        maintenanceMode,
 		Environment:            environment,
 		MetricsUsername:        metricsUsername,
 		MetricsPassword:        metricsPassword,
@@ -801,6 +798,7 @@ func New(lc fx.Lifecycle, params ConfigParams) (*Config, error) {
 		// host can reach the admin UI.
 		"bindAddress", s.BindAddress,
 		"debug", s.Debug,
+		"maintenanceMode", s.MaintenanceMode,
 		"dataDir", s.DataDir,
 		"retentionSweepInterval", s.RetentionSweepInterval.String(),
 		// Logged because a perfectly valid non-positive value here

internal/config/config_test.go

@@ -3,6 +3,7 @@ package config_test
 import (
 	"bytes"
 	"log/slog"
+	"os"
 	"testing"
 	"time"
 
@@ -70,12 +71,14 @@ func TestEnvironmentConfig(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
 			if tt.envValue != "" {
 				t.Setenv(
 					"WEBHOOKER_ENVIRONMENT", tt.envValue,
 				)
+			} else {
+				require.NoError(t, os.Unsetenv(
+					"WEBHOOKER_ENVIRONMENT",
+				))
 			}
 
 			for k, v := range tt.envVars {
@@ -121,11 +124,6 @@ func testEnvironmentConfigSuccess(
 
 	app := fxtest.New(
 		t,
-		// fx's own log is discarded, not sent to t.Logf: a hook still
-		// running after a start or stop timeout would write there after
-		// the test has returned. The same holds for every fxtest.New
-		// below.
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -196,11 +194,14 @@ func TestRetentionSweepInterval(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 
 			if tt.set {
 				t.Setenv("RETENTION_SWEEP_INTERVAL", tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(
+					"RETENTION_SWEEP_INTERVAL",
+				))
 			}
 
 			if tt.expectError {
@@ -271,7 +272,6 @@ func testRetentionSweepIntervalSuccess(
 
 	app := fxtest.New(
 		t,
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -335,11 +335,14 @@ func TestSessionIdleTimeout(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 
 			if tt.set {
 				t.Setenv("SESSION_IDLE_TIMEOUT", tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(
+					"SESSION_IDLE_TIMEOUT",
+				))
 			}
 
 			if tt.expectError {
@@ -361,7 +364,6 @@ func testSessionIdleTimeoutSuccess(
 
 	app := fxtest.New(
 		t,
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -388,17 +390,20 @@ func TestDefaultDataDir(t *testing.T) {
 		t.Run("env="+name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
 			if env != "" {
 				t.Setenv("WEBHOOKER_ENVIRONMENT", env)
+			} else {
+				require.NoError(t, os.Unsetenv(
+					"WEBHOOKER_ENVIRONMENT",
+				))
 			}
 
+			require.NoError(t, os.Unsetenv("DATA_DIR"))
+
 			var cfg *config.Config
 
 			app := fxtest.New(
 				t,
-				fx.NopLogger,
 				fx.Provide(
 					globals.New,
 					logger.New,
@@ -433,9 +438,9 @@ func TestDataDirHelper(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
+			if set == "" {
-
+				require.NoError(t, os.Unsetenv("DATA_DIR"))
-			if set != "" {
+			} else {
 				t.Setenv("DATA_DIR", set)
 			}
 
@@ -498,11 +503,14 @@ func TestReceiverRateLimit(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 
 			if tt.set {
 				t.Setenv("RECEIVER_RATE_LIMIT", tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(
+					"RECEIVER_RATE_LIMIT",
+				))
 			}
 
 			if tt.expectError {
@@ -526,7 +534,6 @@ func testReceiverRateLimitSuccess(
 
 	app := fxtest.New(
 		t,
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -614,11 +621,12 @@ func TestTrustedProxies(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 
 			if tt.set {
 				t.Setenv("TRUSTED_PROXIES", tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv("TRUSTED_PROXIES"))
 			}
 
 			if tt.expectError {
@@ -642,7 +650,6 @@ func testTrustedProxiesSuccess(
 
 	app := fxtest.New(
 		t,
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -725,11 +732,14 @@ func TestAllowedEgressCIDRs(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 
 			if tt.set {
 				t.Setenv("ALLOWED_EGRESS_CIDRS", tt.value)
+			} else {
+				require.NoError(
+					t, os.Unsetenv("ALLOWED_EGRESS_CIDRS"),
+				)
 			}
 
 			if tt.expectError {
@@ -753,7 +763,6 @@ func testAllowedEgressCIDRsSuccess(
 
 	app := fxtest.New(
 		t,
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -797,10 +806,13 @@ func TestEgressAllowlistWarning(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", config.EnvironmentDev)
 
-			if tt.allowed != "" {
+			if tt.allowed == "" {
+				require.NoError(
+					t, os.Unsetenv("ALLOWED_EGRESS_CIDRS"),
+				)
+			} else {
 				t.Setenv("ALLOWED_EGRESS_CIDRS", tt.allowed)
 			}
 
@@ -933,14 +945,20 @@ func TestMetricsAuthConfig(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
 			if tt.username.set {
 				t.Setenv("METRICS_USERNAME", tt.username.value)
+			} else {
+				require.NoError(
+					t, os.Unsetenv("METRICS_USERNAME"),
+				)
 			}
 
 			if tt.password.set {
 				t.Setenv("METRICS_PASSWORD", tt.password.value)
+			} else {
+				require.NoError(
+					t, os.Unsetenv("METRICS_PASSWORD"),
+				)
 			}
 
 			if tt.expectError {
@@ -988,7 +1006,6 @@ func assertMetricsAuthAccepted(t *testing.T, expectAuth bool) {
 
 	app := fxtest.New(
 		t,
-		fx.NopLogger,
 		fx.Provide(globals.New, logger.New, config.New),
 		fx.Populate(&cfg),
 	)

internal/config/dotenv_test.go

@@ -22,6 +22,17 @@ const malformedDotEnv = "PORT 19615\n" +
 	"this is not = valid ! syntax\n" +
 	"\"unclosed\n"
 
+// unsetDotEnvKey makes dotEnvKey genuinely absent for the duration of
+// the test and restores it afterwards. t.Setenv registers the restore;
+// the Unsetenv that follows is what the test actually needs, because a
+// variable set to the empty string is still present in os.Environ and
+// godotenv would refuse to overwrite it.
+func unsetDotEnvKey(t *testing.T) {
+	t.Helper()
+	t.Setenv(dotEnvKey, "placeholder")
+	require.NoError(t, os.Unsetenv(dotEnvKey))
+}
+
 // writeDotEnv writes contents to a .env file in a fresh temporary
 // directory and returns its path.
 func writeDotEnv(t *testing.T, contents string) string {
@@ -39,9 +50,9 @@ func writeDotEnv(t *testing.T, contents string) string {
 // normally rather than be refused for a file it was never meant to
 // have.
 //
-//nolint:paralleltest // ClearEnvForTest uses t.Setenv.
+//nolint:paralleltest // unsetDotEnvKey uses t.Setenv.
 func TestLoadDotEnv_MissingFileIsFine(t *testing.T) {
-	config.ClearEnvForTest(t)
+	unsetDotEnvKey(t)
 
 	absent := filepath.Join(t.TempDir(), config.DotEnvPath)
 	require.NoError(t, config.LoadDotEnvFileForTest(absent))
@@ -54,9 +65,9 @@ func TestLoadDotEnv_MissingFileIsFine(t *testing.T) {
 // reaches the environment, which is the whole reason the file is read
 // at all.
 //
-//nolint:paralleltest // ClearEnvForTest uses t.Setenv.
+//nolint:paralleltest // unsetDotEnvKey uses t.Setenv.
 func TestLoadDotEnv_AppliesValues(t *testing.T) {
-	config.ClearEnvForTest(t)
+	unsetDotEnvKey(t)
 
 	path := writeDotEnv(t, "# a comment\n"+dotEnvKey+"=from-dot-env\n")
 
@@ -82,9 +93,9 @@ func TestLoadDotEnv_RealEnvironmentWins(t *testing.T) {
 // reverts to its default; the process used to start that way with no
 // log line naming the file at all.
 //
-//nolint:paralleltest // ClearEnvForTest uses t.Setenv.
+//nolint:paralleltest // unsetDotEnvKey uses t.Setenv.
 func TestLoadDotEnv_MalformedFileAborts(t *testing.T) {
-	config.ClearEnvForTest(t)
+	unsetDotEnvKey(t)
 
 	path := writeDotEnv(
 		t, malformedDotEnv+dotEnvKey+"=from-dot-env\n",
@@ -132,7 +143,7 @@ func TestLoadDotEnv_UnreadableFileAborts(t *testing.T) {
 //
 //nolint:paralleltest // t.Chdir moves the whole process.
 func TestLoadDotEnv_ReadsTheWorkingDirectory(t *testing.T) {
-	config.ClearEnvForTest(t)
+	unsetDotEnvKey(t)
 
 	dir := t.TempDir()
 	require.NoError(t, os.WriteFile(

internal/config/env_test.go

@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -17,9 +18,10 @@ const testEnvKey = "WEBHOOKER_TEST_VALUE"
 
 // Real configuration variables exercised by the config.New tests.
 const (
-	envKeyPort        = "PORT"
+	envKeyPort            = "PORT"
-	envKeyDebug       = "DEBUG"
+	envKeyDebug           = "DEBUG"
-	envKeyBindAddress = "BIND_ADDRESS"
+	envKeyMaintenanceMode = "MAINTENANCE_MODE"
+	envKeyBindAddress     = "BIND_ADDRESS"
 )
 
 // Sample BIND_ADDRESS values used by the tables below.
@@ -120,10 +122,10 @@ func TestEnvBool(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
 			if tt.set {
 				t.Setenv(testEnvKey, tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(testEnvKey))
 			}
 
 			got, err := config.EnvBoolForTest(
@@ -144,62 +146,17 @@ func TestEnvBool(t *testing.T) {
 	}
 }
 
-// envIntCase is one row of the envPositiveInt and envPort tables.
-type envIntCase struct {
-	name        string
-	set         bool
-	value       string
-	expectError bool
-	errIs       error
-	expected    int
-}
-
-// runEnvIntCases runs each row through parse, which is
-// envPositiveInt or envPort, with testEnvKey set to the row's value
-// or left unset.
-func runEnvIntCases(
-	t *testing.T,
-	parse func(key string, defaultValue int) (int, error),
-	defaultValue int,
-	tests []envIntCase,
-) {
-	t.Helper()
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Cannot use t.Parallel() here because t.Setenv
-			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
-			if tt.set {
-				t.Setenv(testEnvKey, tt.value)
-			}
-
-			got, err := parse(testEnvKey, defaultValue)
-
-			if tt.expectError {
-				require.Error(t, err)
-				assert.Contains(t, err.Error(), testEnvKey)
-				assert.Contains(t, err.Error(), tt.value)
-
-				if tt.errIs != nil {
-					require.ErrorIs(t, err, tt.errIs)
-				}
-
-				return
-			}
-
-			require.NoError(t, err)
-			assert.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-//nolint:paralleltest // runEnvIntCases uses t.Setenv.
 func TestEnvPositiveInt(t *testing.T) {
 	const defaultValue = 7
 
-	runEnvIntCases(t, config.EnvPositiveIntForTest, defaultValue, []envIntCase{
+	tests := []struct {
+		name        string
+		set         bool
+		value       string
+		expectError bool
+		errIs       error
+		expected    int
+	}{
 		{
 			name:     "unset returns the default integer",
 			expected: defaultValue,
@@ -236,14 +193,51 @@ func TestEnvPositiveInt(t *testing.T) {
 			expectError: true,
 			errIs:       config.ErrNonPositiveValue,
 		},
-	})
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Cannot use t.Parallel() here because t.Setenv
+			// is incompatible with parallel subtests.
+			if tt.set {
+				t.Setenv(testEnvKey, tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(testEnvKey))
+			}
+
+			got, err := config.EnvPositiveIntForTest(
+				testEnvKey, defaultValue,
+			)
+
+			if tt.expectError {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), testEnvKey)
+				assert.Contains(t, err.Error(), tt.value)
+
+				if tt.errIs != nil {
+					require.ErrorIs(t, err, tt.errIs)
+				}
+
+				return
+			}
+
+			require.NoError(t, err)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
 }
 
-//nolint:paralleltest // runEnvIntCases uses t.Setenv.
 func TestEnvPort(t *testing.T) {
 	const defaultValue = 8080
 
-	runEnvIntCases(t, config.EnvPortForTest, defaultValue, []envIntCase{
+	tests := []struct {
+		name        string
+		set         bool
+		value       string
+		expectError bool
+		errIs       error
+		expected    int
+	}{
 		{
 			name:     "unset returns the default port",
 			expected: defaultValue,
@@ -271,14 +265,7 @@ func TestEnvPort(t *testing.T) {
 			set:         true,
 			value:       "0",
 			expectError: true,
-			errIs:       config.ErrInvalidPort,
+			errIs:       config.ErrNonPositiveValue,
-		},
-		{
-			name:        "negative is rejected",
-			set:         true,
-			value:       "-1",
-			expectError: true,
-			errIs:       config.ErrInvalidPort,
 		},
 		{
 			name:        "above the port range is rejected",
@@ -287,14 +274,37 @@ func TestEnvPort(t *testing.T) {
 			expectError: true,
 			errIs:       config.ErrInvalidPort,
 		},
-		{
+	}
-			name:        "too large for an int is rejected",
+
-			set:         true,
+	for _, tt := range tests {
-			value:       "99999999999999999999",
+		t.Run(tt.name, func(t *testing.T) {
-			expectError: true,
+			// Cannot use t.Parallel() here because t.Setenv
-			errIs:       config.ErrInvalidPort,
+			// is incompatible with parallel subtests.
-		},
+			if tt.set {
-	})
+				t.Setenv(testEnvKey, tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(testEnvKey))
+			}
+
+			got, err := config.EnvPortForTest(
+				testEnvKey, defaultValue,
+			)
+
+			if tt.expectError {
+				require.Error(t, err)
+				assert.Contains(t, err.Error(), testEnvKey)
+
+				if tt.errIs != nil {
+					require.ErrorIs(t, err, tt.errIs)
+				}
+
+				return
+			}
+
+			require.NoError(t, err)
+			assert.Equal(t, tt.expected, got)
+		})
+	}
 }
 
 // TestEnvBindAddress covers BIND_ADDRESS parsing.
@@ -310,10 +320,10 @@ func TestEnvBindAddress(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
 			if tt.set {
 				t.Setenv(testEnvKey, tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(testEnvKey))
 			}
 
 			got, err := config.EnvBindAddressForTest(
@@ -476,7 +486,6 @@ func TestNewRejectsBadEnvValues(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
 			t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 			t.Setenv(tt.key, tt.value)
 
@@ -595,6 +604,12 @@ func flagEnvValueCases() []badEnvValueCase {
 			value:       "ture",
 			expectError: true,
 		},
+		{
+			name:        "unparseable MAINTENANCE_MODE aborts startup",
+			key:         envKeyMaintenanceMode,
+			value:       "sometimes",
+			expectError: true,
+		},
 	}
 }
 
@@ -638,15 +653,22 @@ func sentryEnvValueCases() []badEnvValueCase {
 // break the legitimate unset case: absent variables still get their
 // documented defaults.
 func TestNewUsesDefaultsWhenUnset(t *testing.T) {
-	config.ClearEnvForTest(t)
 	t.Setenv("WEBHOOKER_ENVIRONMENT", "dev")
 
+	for _, key := range []string{
+		envKeyPort, envKeyDebug, envKeyMaintenanceMode,
+		envKeyBindAddress, envKeySentryDSN,
+	} {
+		require.NoError(t, os.Unsetenv(key))
+	}
+
 	cfg, err := buildConfig(t)
 	require.NoError(t, err)
 	require.NotNil(t, cfg)
 
 	assert.Equal(t, 8080, cfg.Port)
 	assert.False(t, cfg.Debug)
+	assert.False(t, cfg.MaintenanceMode)
 
 	// Loopback, not the wildcard: the default must not publish the
 	// cleartext admin UI and the unauthenticated receiver on every

internal/config/sentry_test.go

@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"os"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -100,10 +101,10 @@ func TestEnvSentryDSN(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			// Cannot use t.Parallel() here because t.Setenv
 			// is incompatible with parallel subtests.
-			config.ClearEnvForTest(t)
-
 			if tt.set {
 				t.Setenv(envKeySentryDSN, tt.value)
+			} else {
+				require.NoError(t, os.Unsetenv(envKeySentryDSN))
 			}
 
 			got, err := config.EnvSentryDSNForTest(envKeySentryDSN)

internal/config/testing.go

@@ -1,50 +0,0 @@
-package config
-
-import (
-	"os"
-	"strings"
-	"testing"
-)
-
-// ClearEnvForTest unsets every variable in the process environment
-// for the rest of the test, so a test sees only the variables it sets
-// itself, not whatever the developer's shell exports. When the test
-// ends it leaves the environment exactly as it found it: each variable
-// it unset is put back, and any variable added since is removed.
-func ClearEnvForTest(t *testing.T) {
-	t.Helper()
-
-	present := make(map[string]bool)
-
-	for _, entry := range os.Environ() {
-		key, _, _ := strings.Cut(entry, "=")
-		present[key] = true
-
-		// t.Setenv registers the restore; the Unsetenv after it is
-		// what makes the key absent, since a key set to the empty
-		// string is still present, and godotenv will not overwrite a
-		// present key.
-		t.Setenv(key, "")
-
-		err := os.Unsetenv(key)
-		if err != nil {
-			t.Fatalf("unsetting %s: %v", key, err)
-		}
-	}
-
-	// A variable the test adds other than through t.Setenv, as loading
-	// a .env file does, has no restore of its own.
-	t.Cleanup(func() {
-		for _, entry := range os.Environ() {
-			key, _, _ := strings.Cut(entry, "=")
-			if present[key] {
-				continue
-			}
-
-			err := os.Unsetenv(key)
-			if err != nil {
-				t.Errorf("unsetting %s: %v", key, err)
-			}
-		}
-	})
-}

internal/config/testing_test.go

@@ -1,36 +0,0 @@
-package config_test
-
-import (
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/config"
-)
-
-// TestClearEnvForTest_RemovesAddedVariables pins that a variable set
-// after the clear other than through t.Setenv, as a test's .env file
-// sets one, is gone once the test ends, so it cannot reach the tests
-// that run after it.
-//
-//nolint:paralleltest // ClearEnvForTest uses t.Setenv.
-func TestClearEnvForTest_RemovesAddedVariables(t *testing.T) {
-	// The outer clear keeps a value of the key exported in the shell
-	// from making it a variable the inner clear has to put back.
-	config.ClearEnvForTest(t)
-
-	t.Run("loads a .env file after the clear", func(t *testing.T) {
-		config.ClearEnvForTest(t)
-
-		path := writeDotEnv(t, dotEnvKey+"=from-dot-env\n")
-		require.NoError(t, config.LoadDotEnvFileForTest(path))
-		require.Equal(t, "from-dot-env", os.Getenv(dotEnvKey))
-	})
-
-	_, present := os.LookupEnv(dotEnvKey)
-	assert.False(
-		t, present,
-		"a variable set after the clear must not outlive the test",
-	)
-}

internal/database/model_apikey.go

@@ -15,7 +15,6 @@ type APIKey struct {
 	Description string     `json:"description"`
 	LastUsedAt  *time.Time `json:"lastUsedAt,omitempty"`
 
-	// Relations. No model marshals the record it belongs to:
+	// Relations
-	// User.APIKeys leads back here, and the JSON could loop.
+	User User `json:"user,omitzero"`
-	User User `json:"-"`
 }

internal/database/model_delivery.go

@@ -56,10 +56,8 @@ type Delivery struct {
 	// the index.
 	FinishedAt *time.Time `gorm:"index:idx_deliveries_status,priority:3" json:"finishedAt,omitempty"`
 
-	// Relations. No model marshals the record it belongs to:
+	// Relations
-	// Event.Deliveries and Target.Deliveries lead back here, and the
+	Event           Event            `json:"event,omitzero"`
-	// JSON could loop.
+	Target          Target           `json:"target,omitzero"`
-	Event           Event            `json:"-"`
-	Target          Target           `json:"-"`
 	DeliveryResults []DeliveryResult `json:"deliveryResults,omitempty"`
 }

internal/database/model_delivery_result.go

@@ -23,7 +23,6 @@ type DeliveryResult struct {
 	Error        string `json:"error,omitempty"`
 	Duration     int64  `json:"durationMs"` // Duration in milliseconds
 
-	// Relations. No model marshals the record it belongs to:
+	// Relations
-	// Delivery.DeliveryResults leads back here, and the JSON could loop.
+	Delivery Delivery `json:"delivery,omitzero"`
-	Delivery Delivery `json:"-"`
 }

internal/database/model_entrypoint.go

@@ -15,7 +15,6 @@ type Entrypoint struct {
 	Description string `json:"description"`
 	Active      bool   `gorm:"default:true" json:"active"`
 
-	// Relations. No model marshals the record it belongs to:
+	// Relations
-	// Webhook.Entrypoints leads back here, and the JSON could loop.
+	Webhook Webhook `json:"webhook,omitzero"`
-	Webhook Webhook `json:"-"`
 }

internal/database/model_event.go

@@ -44,9 +44,8 @@ type Event struct {
 	// kept as the record of where the copy came from either way.
 	ResubmittedFromID *string `gorm:"type:uuid;index" json:"resubmittedFromId,omitempty"`
 
-	// Relations. No model marshals the record it belongs to, so
+	// Relations
-	// Webhook and Entrypoint are left out of the JSON.
+	Webhook    Webhook    `json:"webhook,omitzero"`
-	Webhook    Webhook    `json:"-"`
+	Entrypoint Entrypoint `json:"entrypoint,omitzero"`
-	Entrypoint Entrypoint `json:"-"`
 	Deliveries []Delivery `json:"deliveries,omitempty"`
 }

internal/database/model_parent_test.go

@@ -1,126 +0,0 @@
-package database_test
-
-import (
-	"testing"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestPreloadedModelsMarshalWithoutTheirParent pins that a child's
-// reference to the record it belongs to is left out of the JSON, so a
-// webhook and its targets cannot marshal each other in a loop, and that
-// GORM still preloads that reference, since it ignores json tags.
-func TestPreloadedModelsMarshalWithoutTheirParent(t *testing.T) {
-	t.Parallel()
-
-	db := startedTestDB(t)
-
-	stored := database.Webhook{
-		UserID:      uuid.New().String(),
-		Name:        testWebhookName,
-		Entrypoints: []database.Entrypoint{{Path: uuid.New().String()}},
-		Targets: []database.Target{{
-			Name: "log",
-			Type: database.TargetTypeLog,
-		}},
-	}
-	require.NoError(t, db.Create(&stored).Error)
-
-	entrypointID := stored.Entrypoints[0].ID
-	targetID := stored.Targets[0].ID
-
-	var webhook database.Webhook
-
-	require.NoError(t, db.
-		Preload("Entrypoints.Webhook").
-		Preload("Targets.Webhook").
-		First(&webhook, "id = ?", stored.ID).Error)
-
-	require.Len(t, webhook.Entrypoints, 1)
-	require.Len(t, webhook.Targets, 1)
-	assert.Equal(t, stored.ID, webhook.Entrypoints[0].Webhook.ID)
-	assert.Equal(t, stored.ID, webhook.Targets[0].Webhook.ID)
-
-	encoded := marshalModel(t, webhook)
-
-	assert.Contains(t, encoded, entrypointID)
-	assert.Contains(t, encoded, targetID)
-
-	// Each child holds the parent's id as its webhookId, so the parent
-	// is looked for by its own id field.
-	parentIDField := `"id":"` + stored.ID + `"`
-
-	assert.NotContains(t, marshalModel(t, webhook.Entrypoints[0]), parentIDField)
-	assert.NotContains(t, marshalModel(t, webhook.Targets[0]), parentIDField)
-
-	var target database.Target
-
-	require.NoError(t, db.
-		Preload("Webhook").
-		First(&target, "id = ?", targetID).Error)
-
-	assert.Equal(t, stored.ID, target.Webhook.ID)
-
-	encoded = marshalModel(t, target)
-
-	assert.Contains(t, encoded, stored.ID)
-	assert.NotContains(t, encoded, parentIDField)
-}
-
-// TestModelsMarshalWithoutTheirParent covers the other references to a
-// parent: each model is built with its parent set, and the parent's id
-// must not appear in the JSON.
-func TestModelsMarshalWithoutTheirParent(t *testing.T) {
-	t.Parallel()
-
-	parent := database.BaseModel{ID: uuid.New().String()}
-
-	cases := []struct {
-		name  string
-		model any
-	}{
-		{
-			name:  "Webhook.User",
-			model: database.Webhook{User: database.User{BaseModel: parent}},
-		},
-		{
-			name:  "APIKey.User",
-			model: database.APIKey{User: database.User{BaseModel: parent}},
-		},
-		{
-			name:  "Delivery.Event",
-			model: database.Delivery{Event: database.Event{BaseModel: parent}},
-		},
-		{
-			name:  "Delivery.Target",
-			model: database.Delivery{Target: database.Target{BaseModel: parent}},
-		},
-		{
-			name: "DeliveryResult.Delivery",
-			model: database.DeliveryResult{
-				Delivery: database.Delivery{BaseModel: parent},
-			},
-		},
-		{
-			name:  "Event.Webhook",
-			model: database.Event{Webhook: database.Webhook{BaseModel: parent}},
-		},
-		{
-			name: "Event.Entrypoint",
-			model: database.Event{
-				Entrypoint: database.Entrypoint{BaseModel: parent},
-			},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			assert.NotContains(t, marshalModel(t, tc.model), parent.ID)
-		})
-	}
-}

internal/database/model_target.go

@@ -34,8 +34,7 @@ type Target struct {
 	MaxRetries   int `json:"maxRetries,omitempty"`
 	MaxQueueSize int `json:"maxQueueSize,omitempty"`
 
-	// Relations. No model marshals the record it belongs to:
+	// Relations
-	// Webhook.Targets leads back here, and the JSON could loop.
+	Webhook    Webhook    `json:"webhook,omitzero"`
-	Webhook    Webhook    `json:"-"`
 	Deliveries []Delivery `json:"deliveries,omitempty"`
 }

internal/database/model_webhook.go

@@ -66,9 +66,8 @@ type Webhook struct {
 	// must equal DefaultRetentionDays.
 	RetentionDays int `gorm:"default:30" json:"retentionDays"`
 
-	// Relations. No model marshals the record it belongs to:
+	// Relations
-	// User.Webhooks leads back here, and the JSON could loop.
+	User        User         `json:"user,omitzero"`
-	User        User         `json:"-"`
 	Entrypoints []Entrypoint `json:"entrypoints,omitempty"`
 	Targets     []Target     `json:"targets,omitempty"`
 }

internal/database/retention.go

@@ -184,6 +184,16 @@ func (r *RetentionReaper) sweep(ctx context.Context) {
 
 		wh := webhooks[i]
 
+		// Skip retain-forever webhooks before building any query.
+		// RetainsForever covers both the RetentionForeverDays
+		// sentinel and the non-positive values that predate it: the
+		// sentinel is a positive number, so without this the reaper
+		// would compute a cutoff a thousand years in the past and
+		// issue a DELETE matching nothing on every single sweep.
+		if wh.RetainsForever() {
+			continue
+		}
+
 		// Nothing to reap if the per-webhook database has never
 		// been created.
 		if !r.dbManager.DBExists(wh.ID) {
@@ -202,13 +212,6 @@ func (r *RetentionReaper) reapWebhook(
 	webhookID string,
 	retentionDays int,
 ) {
-	// A retain-forever webhook has no cutoff, so its database is not
-	// even opened.
-	cutoff, ok := retentionCutoff(time.Now(), retentionDays)
-	if !ok {
-		return
-	}
-
 	db, err := r.dbManager.GetDB(webhookID)
 	if err != nil {
 		r.log.Error(
@@ -220,6 +223,11 @@ func (r *RetentionReaper) reapWebhook(
 		return
 	}
 
+	cutoff, ok := retentionCutoff(time.Now(), retentionDays)
+	if !ok {
+		return
+	}
+
 	deleted, err := reapExpired(ctx, db, cutoff)
 	if err != nil {
 		r.log.Error(

internal/database/retention_test.go

@@ -362,7 +362,7 @@ func TestRetentionReaper_HugeFiniteRetentionRetainsRecentEvents(
 		t,
 		overflowingRetentionDays,
 		database.RetentionForeverDays,
-		"the test value must not be treated as retain-forever",
+		"the test value must not be rescued by the forever skip",
 	)
 
 	webhookID := createWebhook(

internal/database/totals_test.go

@@ -102,13 +102,6 @@ func TestWebhookDBManager_TotalsSurviveReopen(t *testing.T) {
 // seedExpiredEvents stores count events created at the given time,
 // each with a delivered delivery to one target and a failed delivery
 // to the other, and one attempt for each delivery.
-//
-// It and seedBareEvents insert 50 rows per statement, not more. The
-// SQLite driver looks up each parameter's value by scanning the
-// statement's arguments from the first until it reaches that
-// parameter's, so the time to bind a statement grows with the square of
-// its parameter count: at 500 rows, several thousand parameters, the
-// seeding took most of these tests' time under -race.
 func seedExpiredEvents(
 	t *testing.T,
 	db *gorm.DB,
@@ -145,8 +138,8 @@ func seedExpiredEvents(
 		)
 	}
 
-	require.NoError(t, db.CreateInBatches(events, 50).Error)
+	require.NoError(t, db.CreateInBatches(events, 500).Error)
-	require.NoError(t, db.CreateInBatches(deliveries, 50).Error)
+	require.NoError(t, db.CreateInBatches(deliveries, 500).Error)
 
 	results := make([]database.DeliveryResult, len(deliveries))
 	for i := range deliveries {
@@ -155,7 +148,7 @@ func seedExpiredEvents(
 		}
 	}
 
-	require.NoError(t, db.CreateInBatches(results, 50).Error)
+	require.NoError(t, db.CreateInBatches(results, 500).Error)
 }
 
 // seedBareEvents stores count events created at the given time, with
@@ -179,7 +172,7 @@ func seedBareEvents(
 		events[i].CreatedAt = createdAt
 	}
 
-	require.NoError(t, db.CreateInBatches(events, 50).Error)
+	require.NoError(t, db.CreateInBatches(events, 500).Error)
 }
 
 // TestRetentionReaper_PrunesMoreThanOneBatch verifies that a prune

internal/database/webhook_db_manager.go

@@ -33,19 +33,6 @@ var errInvalidCachedDBType = errors.New(
 	"invalid cached database type",
 )
 
-// ErrEventDBNotRemoved is in DeleteDB's error when the event
-// database file itself could not be removed: it is still on disk.
-var ErrEventDBNotRemoved = errors.New(
-	"event database file not removed",
-)
-
-// ErrSidecarNotRemoved is in DeleteDB's error when the event
-// database file was removed, so its events are gone, but its -wal
-// or -shm sidecar could not be.
-var ErrSidecarNotRemoved = errors.New(
-	"event database file removed, but a -wal or -shm sidecar was not",
-)
-
 // WebhookDBManager manages per-webhook SQLite database files
 // for event storage. Each webhook gets its own dedicated
 // database containing Events, Deliveries, DeliveryResults and the
@@ -164,10 +151,7 @@ func (m *WebhookDBManager) DBExists(
 }
 
 // DeleteDB closes the connection and deletes the database file
-// for a webhook, with its -wal and -shm sidecars. The files are
+// for a webhook. The file is permanently removed.
-// permanently removed. Each file is tried even when another could
-// not be removed, and the error wraps ErrEventDBNotRemoved or
-// ErrSidecarNotRemoved to say which was left, naming each file.
 func (m *WebhookDBManager) DeleteDB(
 	webhookID string,
 ) error {
@@ -186,23 +170,16 @@ func (m *WebhookDBManager) DeleteDB(
 		}
 	}
 
+	// Delete the main DB file and WAL/SHM files
 	path := m.dbPath(webhookID)
-
+	for _, suffix := range []string{"", "-wal", "-shm"} {
-	dbErr := removeFile(path)
+		err := os.Remove(path + suffix)
-	sidecarErr := errors.Join(
+		if err != nil && !os.IsNotExist(err) {
-		removeFile(path+"-wal"),
+			return fmt.Errorf(
-		removeFile(path+"-shm"),
+				"deleting webhook database file %s%s: %w",
-	)
+				path, suffix, err,
-
+			)
-	if dbErr != nil {
+		}
-		return fmt.Errorf(
-			"%w: %w",
-			ErrEventDBNotRemoved, errors.Join(dbErr, sidecarErr),
-		)
-	}
-
-	if sidecarErr != nil {
-		return fmt.Errorf("%w: %w", ErrSidecarNotRemoved, sidecarErr)
 	}
 
 	m.log.Info(
@@ -213,17 +190,6 @@ func (m *WebhookDBManager) DeleteDB(
 	return nil
 }
 
-// removeFile removes path. A file that is already gone counts as
-// removed; the error from any other failure names the file.
-func removeFile(path string) error {
-	err := os.Remove(path)
-	if errors.Is(err, os.ErrNotExist) {
-		return nil
-	}
-
-	return err
-}
-
 // CloseAll closes all open per-webhook database connections.
 // Called during application shutdown.
 func (m *WebhookDBManager) CloseAll() error {

internal/database/webhook_db_manager_test.go

@@ -182,91 +182,17 @@ func TestWebhookDBManager_DeleteDB(t *testing.T) {
 	}
 	require.NoError(t, db.Create(event).Error)
 
-	// Under WAL, an open database that has been written to has both
-	// sidecars beside it.
-	dbPath := mgr.DBPath(webhookID)
-	require.FileExists(t, dbPath+"-wal")
-	require.FileExists(t, dbPath+"-shm")
-
 	// Delete the DB
 	require.NoError(t, mgr.DeleteDB(webhookID))
 
 	// File should no longer exist
 	assert.False(t, mgr.DBExists(webhookID))
 
-	// Verify the files are actually gone from disk
+	// Verify the file is actually gone from disk
-	assert.NoFileExists(t, dbPath)
-	assert.NoFileExists(t, dbPath+"-wal")
-	assert.NoFileExists(t, dbPath+"-shm")
-}
-
-// blockRemoval puts a non-empty directory at path, which os.Remove
-// cannot remove whoever runs the test, root included.
-func blockRemoval(t *testing.T, path string) {
-	t.Helper()
-
-	require.NoError(t, os.MkdirAll(filepath.Join(path, "keep"), 0o700))
-}
-
-// TestWebhookDBManager_DeleteDBKeepsDatabaseFile proves that when the
-// event database file cannot be removed, the error says so, and both
-// sidecars are still removed.
-func TestWebhookDBManager_DeleteDBKeepsDatabaseFile(t *testing.T) {
-	t.Parallel()
-
-	mgr, lc := setupTestWebhookDBManager(t)
-	ctx := context.Background()
-	require.NoError(t, lc.Start(ctx))
-
-	defer func() { require.NoError(t, lc.Stop(ctx)) }()
-
-	webhookID := uuid.New().String()
 	dbPath := mgr.DBPath(webhookID)
 
-	blockRemoval(t, dbPath)
+	_, err = os.Stat(dbPath)
-	require.NoError(t, os.WriteFile(dbPath+"-wal", nil, 0o600))
+	assert.True(t, os.IsNotExist(err))
-	require.NoError(t, os.WriteFile(dbPath+"-shm", nil, 0o600))
-
-	err := mgr.DeleteDB(webhookID)
-
-	require.ErrorIs(t, err, database.ErrEventDBNotRemoved)
-	require.NotErrorIs(t, err, database.ErrSidecarNotRemoved)
-	assert.Contains(t, err.Error(), dbPath)
-	assert.NoFileExists(t, dbPath+"-wal")
-	assert.NoFileExists(t, dbPath+"-shm")
-}
-
-// TestWebhookDBManager_DeleteDBKeepsSidecar proves that when the
-// event database file is removed but a sidecar is not, the error
-// says the database file is gone, and the other sidecar is still
-// removed.
-func TestWebhookDBManager_DeleteDBKeepsSidecar(t *testing.T) {
-	t.Parallel()
-
-	mgr, lc := setupTestWebhookDBManager(t)
-	ctx := context.Background()
-	require.NoError(t, lc.Start(ctx))
-
-	defer func() { require.NoError(t, lc.Stop(ctx)) }()
-
-	webhookID := uuid.New().String()
-	dbPath := mgr.DBPath(webhookID)
-
-	require.NoError(t, mgr.CreateDB(webhookID))
-	// Closing removes the sidecars, so the ones below are the only
-	// ones there.
-	require.NoError(t, mgr.CloseAll())
-
-	blockRemoval(t, dbPath+"-wal")
-	require.NoError(t, os.WriteFile(dbPath+"-shm", nil, 0o600))
-
-	err := mgr.DeleteDB(webhookID)
-
-	require.ErrorIs(t, err, database.ErrSidecarNotRemoved)
-	require.NotErrorIs(t, err, database.ErrEventDBNotRemoved)
-	assert.Contains(t, err.Error(), dbPath+"-wal")
-	assert.NoFileExists(t, dbPath)
-	assert.NoFileExists(t, dbPath+"-shm")
 }
 
 func TestWebhookDBManager_LazyCreation(t *testing.T) {

internal/delivery/archive_sweeper.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"go.uber.org/fx"
-	"gorm.io/gorm"
 	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/lifecycle"
@@ -26,14 +25,14 @@ type ArchiveSweeperParams struct {
 	Logger   *logger.Logger
 }
 
-// ArchiveSweeper periodically prunes expired rows from the
+// ArchiveSweeper periodically prunes expired rows from
-// archive databases of database targets that carry a positive
+// per-webhook archive databases whose database target carries a
-// expiry.
+// positive expiry.
 //
 // Without it, pruning happens only when an archive is
 // (re)opened, and archives are only ever reopened by writes: an
-// archive whose target has stopped receiving events would keep
+// archive belonging to a webhook that has stopped receiving
-// its expired rows forever. The sweep closes
+// events would keep its expired rows forever. The sweep closes
 // that gap without changing anything for archives whose expiry
 // is unset or "never".
 //
@@ -45,13 +44,8 @@ type ArchiveSweeper struct {
 	eng      *Engine
 	log      *slog.Logger
 	interval time.Duration
-
+	cancel   context.CancelFunc
-	// cancel needs no lock: fx calls the stop hook only after the
+	wg       sync.WaitGroup
-	// start hook has returned, so stop never reads it while start
-	// is still setting it.
-	cancel context.CancelFunc
-
-	wg sync.WaitGroup
 }
 
 // NewArchiveSweeper creates the archive sweeper and registers
@@ -161,25 +155,17 @@ func (s *ArchiveSweeper) run(ctx context.Context) {
 // soft-deleted along with it, so GORM's default scope already
 // excludes them.
 //
-// A failure for one target is logged and the sweep continues,
+// A failure for one webhook is logged and the sweep continues,
 // matching how the write path already treats a prune error as
 // non-fatal.
 func (s *ArchiveSweeper) sweep(ctx context.Context) {
 	var targets []database.Target
 
 	err := s.db.DB().
-		WithContext(ctx).
 		Model(&database.Target{}).
 		Where("type = ?", database.TargetTypeDatabase).
 		Find(&targets).Error
 	if err != nil {
-		// The app stopping as a sweep starts cancels the listing.
-		// Stopping is not a failure, so it must not produce an
-		// error line.
-		if ctx.Err() != nil {
-			return
-		}
-
 		s.log.Error(
 			"archive sweep: failed to list database targets",
 			"error", err,
@@ -224,20 +210,19 @@ func (s *ArchiveSweeper) sweepTarget(target *database.Target) {
 		return
 	}
 
-	err = s.eng.dbTarget.sweepArchive(target.ID, expiry)
+	err = s.eng.dbTarget.sweepWebhook(target.WebhookID, expiry)
 	if err == nil {
 		return
 	}
 
-	// A writer evicted, or a target row gone, underneath the sweep
+	// A writer evicted underneath the sweep means the operator
-	// means the operator deleted the target or its webhook while
+	// deleted the webhook (or its last database target) while the
-	// the sweep was walking the target list. That is an ordinary
+	// sweep was walking the target list. That is an ordinary
 	// interleaving, not a failure, so it must not produce an
 	// error line.
-	if errors.Is(err, errArchiveWriterEvicted) ||
+	if errors.Is(err, errArchiveWriterEvicted) {
-		errors.Is(err, gorm.ErrRecordNotFound) {
 		s.log.Debug(
-			"archive sweep: target deleted mid-sweep",
+			"archive sweep: writer evicted mid-sweep",
 			"webhook_id", target.WebhookID,
 			"target_id", target.ID,
 		)

internal/delivery/archive_sweeper_test.go

@@ -1,11 +1,9 @@
 package delivery_test
 
 import (
-	"bytes"
 	"context"
 	"database/sql"
 	"fmt"
-	"log/slog"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -22,7 +20,6 @@ import (
 	_ "modernc.org/sqlite" // Pure Go SQLite driver.
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
-	"sneak.berlin/go/webhooker/internal/gormlog"
 )
 
 const (
@@ -37,23 +34,18 @@ const (
 	sweepConcurrentWrites = 20
 )
 
-// archiveTestWebhookName is the name of every webhook
+// sweeperEnv bundles the pieces an archive sweep test drives:
-// seedDatabaseTarget creates. It is not safe in a file name as it
+// a main configuration database holding webhooks and targets, a
-// stands, so every archive test goes through archiveNamePart.
+// delivery engine owning the archive writer registry, and the
-const archiveTestWebhookName = "Sweep Test!"
+// data directory the archive files live in.
-
+type sweeperEnv struct {
-// archiveEnv bundles the pieces an archive test drives: a main
-// configuration database holding webhooks and targets, a delivery
-// engine owning the archive writer registry, the archive sweeper,
-// and the data directory the archive files live in.
-type archiveEnv struct {
 	sweeper *delivery.ArchiveSweeper
 	eng     *delivery.Engine
 	mainDB  *database.Database
 	dataDir string
 }
 
-func setupArchiveTest(t *testing.T) *archiveEnv {
+func setupSweeperTest(t *testing.T) *sweeperEnv {
 	t.Helper()
 
 	dataDir := t.TempDir()
@@ -71,8 +63,7 @@ func setupArchiveTest(t *testing.T) *archiveEnv {
 	t.Cleanup(func() { _ = sqlDB.Close() })
 
 	gdb, err := gorm.Open(
-		sqlite.Dialector{Conn: sqlDB},
+		sqlite.Dialector{Conn: sqlDB}, &gorm.Config{},
-		&gorm.Config{Logger: gormlog.New(slog.New(slog.DiscardHandler))},
 	)
 	require.NoError(t, err)
 
@@ -87,7 +78,7 @@ func setupArchiveTest(t *testing.T) *archiveEnv {
 		1,
 	)
 
-	return &archiveEnv{
+	return &sweeperEnv{
 		sweeper: delivery.NewTestArchiveSweeper(
 			mainDB, eng, log,
 		),
@@ -97,27 +88,25 @@ func setupArchiveTest(t *testing.T) *archiveEnv {
 	}
 }
 
-// archivePath returns where the engine keeps a database target's
+// archivePath returns where the engine keeps a webhook's
-// archive file, for the names seedDatabaseTarget gave it.
+// archive file.
-func (env *archiveEnv) archivePath(tgt *database.Target) string {
+func (env *sweeperEnv) archivePath(webhookID string) string {
 	return filepath.Join(
-		env.dataDir,
+		env.dataDir, fmt.Sprintf("archive-%s.db", webhookID),
-		delivery.ArchiveFileName(
-			archiveTestWebhookName, tgt.Name, tgt.ID,
-		),
 	)
 }
 
 // seedDatabaseTarget creates a webhook with one database target
-// carrying the given target config JSON, and returns the target.
+// carrying the given target config JSON, and returns the
-func (env *archiveEnv) seedDatabaseTarget(
+// webhook id.
+func (env *sweeperEnv) seedDatabaseTarget(
 	t *testing.T, configJSON string,
-) *database.Target {
+) string {
 	t.Helper()
 
 	wh := &database.Webhook{
 		UserID: uuid.New().String(),
-		Name:   archiveTestWebhookName,
+		Name:   "sweep-test",
 	}
 	require.NoError(
 		t,
@@ -126,19 +115,9 @@ func (env *archiveEnv) seedDatabaseTarget(
 			Create(wh).Error,
 	)
 
-	return env.addDatabaseTarget(t, wh.ID, configJSON)
-}
-
-// addDatabaseTarget creates one more database target on an
-// existing webhook and returns it.
-func (env *archiveEnv) addDatabaseTarget(
-	t *testing.T, webhookID, configJSON string,
-) *database.Target {
-	t.Helper()
-
 	tgt := &database.Target{
-		WebhookID: webhookID,
+		WebhookID: wh.ID,
-		Name:      "Archive",
+		Name:      "archive",
 		Type:      database.TargetTypeDatabase,
 		Active:    true,
 		Config:    configJSON,
@@ -150,19 +129,19 @@ func (env *archiveEnv) addDatabaseTarget(
 			Create(tgt).Error,
 	)
 
-	return tgt
+	return wh.ID
 }
 
-// seedArchiveRows creates the archive file for a target and
+// seedArchiveRows creates the archive file for a webhook and
 // inserts one row per supplied archived-at timestamp, returning
 // the archive path. The handle is closed before returning, so
 // the archive is idle exactly as it would be with no traffic.
-func (env *archiveEnv) seedArchiveRows(
+func (env *sweeperEnv) seedArchiveRows(
-	t *testing.T, tgt *database.Target, archivedAt ...time.Time,
+	t *testing.T, webhookID string, archivedAt ...time.Time,
 ) string {
 	t.Helper()
 
-	path := env.archivePath(tgt)
+	path := env.archivePath(webhookID)
 
 	sqlDB, err := sql.Open(
 		"sqlite", fmt.Sprintf("file:%s?mode=rwc", path),
@@ -170,8 +149,7 @@ func (env *archiveEnv) seedArchiveRows(
 	require.NoError(t, err)
 
 	gdb, err := gorm.Open(
-		sqlite.Dialector{Conn: sqlDB},
+		sqlite.Dialector{Conn: sqlDB}, &gorm.Config{},
-		&gorm.Config{Logger: gormlog.New(slog.New(slog.DiscardHandler))},
 	)
 	require.NoError(t, err)
 
@@ -182,7 +160,7 @@ func (env *archiveEnv) seedArchiveRows(
 	for i, at := range archivedAt {
 		row := delivery.ExportArchivedEvent{
 			EventID:    fmt.Sprintf("ev-%d", i),
-			WebhookID:  tgt.WebhookID,
+			WebhookID:  webhookID,
 			Method:     http.MethodPost,
 			Body:       `{"seeded":true}`,
 			ArchivedAt: at,
@@ -230,8 +208,7 @@ func countArchivedRows(path string) (int64, error) {
 	defer func() { _ = sqlDB.Close() }()
 
 	gdb, err := gorm.Open(
-		sqlite.Dialector{Conn: sqlDB},
+		sqlite.Dialector{Conn: sqlDB}, &gorm.Config{},
-		&gorm.Config{Logger: gormlog.New(slog.New(slog.DiscardHandler))},
 	)
 	if err != nil {
 		return 0, err
@@ -266,13 +243,13 @@ func TestArchiveSweeper_LoopOutlivesStartHookContext(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 
 	now := time.Now()
 	path := env.seedArchiveRows(
-		t, tgt,
+		t, webhookID,
 		now.Add(-48*time.Hour),
 		now.Add(-time.Minute),
 	)
@@ -310,60 +287,60 @@ func TestArchiveSweeper_LoopOutlivesStartHookContext(
 }
 
 // TestArchiveSweep_DoesNotResurrectEvictedWriter covers the
-// interleaving where a sweep tick has already listed a target
+// interleaving where a sweep tick has already listed a webhook's
-// when the target is deleted and its writer evicted. The sweep
+// target when the webhook is deleted and its writer evicted. The
-// must not put a writer back into the registry: nothing would
+// sweep must not put a writer back into the registry: nothing
-// ever evict it again, which is precisely the leak this change
+// would ever evict it again, which is precisely the leak this
-// exists to close.
+// change exists to close.
 func TestArchiveSweep_DoesNotResurrectEvictedWriter(
 	t *testing.T,
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	// Prime the registry the way a delivery would, then evict as
 	// the deletion path does. The target row is deliberately left
-	// in place: this is the tick that listed the target before
+	// in place: this is the tick that listed the webhook before
 	// the deletion committed.
-	_, err := env.eng.ExportEnsureArchiveWriter(tgt.ID)
+	_, err := env.eng.ExportEnsureArchiveWriter(webhookID)
 	require.NoError(t, err)
 
-	env.eng.EvictTarget(tgt.ID)
+	env.eng.EvictWebhook(webhookID)
-	require.False(t, env.eng.ExportHasArchiveWriter(tgt.ID))
+	require.False(t, env.eng.ExportHasArchiveWriter(webhookID))
 
 	env.sweeper.ExportSweep(context.Background())
 
 	assert.False(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
-		"a sweep must never re-register a writer for a target "+
+		"a sweep must never re-register a writer for a webhook "+
 			"whose registry entry has already been released",
 	)
 }
 
 // TestArchiveSweep_LeavesNoRegistryEntry states the same
 // invariant in its general form: sweeping an archive whose
-// target has no cached writer must not leave one behind, so the
+// webhook has no cached writer must not leave one behind, so the
 // registry keeps holding only writers a delivery created and an
 // eviction can reach.
 func TestArchiveSweep_LeavesNoRegistryEntry(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	path := env.seedArchiveRows(
-		t, tgt,
+		t, webhookID,
 		time.Now().Add(-48*time.Hour),
 		time.Now().Add(-time.Minute),
 	)
 
-	require.False(t, env.eng.ExportHasArchiveWriter(tgt.ID))
+	require.False(t, env.eng.ExportHasArchiveWriter(webhookID))
 
 	env.sweeper.ExportSweep(context.Background())
 
@@ -372,7 +349,7 @@ func TestArchiveSweep_LeavesNoRegistryEntry(t *testing.T) {
 		"the sweep must still prune an idle archive",
 	)
 	assert.False(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
 		"the sweep must release the registry entry it created",
 	)
 }
@@ -387,31 +364,34 @@ func TestArchiveSweep_KeepsWriterAdoptedByDelivery(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	webhookDB := testWebhookDB(t)
 	event := seedEvent(t, webhookDB, `{"n":1}`)
-	d := seedDatabaseTargetDelivery(t, webhookDB, event, tgt)
+	event.WebhookID = webhookID
+	d := seedDatabaseTargetDelivery(
+		t, webhookDB, event, `{"expiry":"1h"}`,
+	)
 
 	env.sweeper.ExportSweep(context.Background())
-	require.False(t, env.eng.ExportHasArchiveWriter(tgt.ID))
+	require.False(t, env.eng.ExportHasArchiveWriter(webhookID))
 
 	env.eng.ExportDeliverDatabase(webhookDB, d)
 
 	assert.True(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
 		"a delivery's writer must stay registered",
 	)
 
 	env.sweeper.ExportSweep(context.Background())
 
 	assert.True(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
 		"a sweep must not drop a writer a delivery owns",
 	)
 }
@@ -443,15 +423,15 @@ func TestArchiveSweep_KeepsWriterAdoptedDuringSweep(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	sweepWriter, created, err := env.eng.ExportSweepWriterFor(
-		tgt.ID,
+		webhookID,
 	)
 	require.NoError(t, err)
 	require.True(
@@ -462,34 +442,37 @@ func TestArchiveSweep_KeepsWriterAdoptedDuringSweep(
 	// The delivery lands mid-sweep and adopts the entry.
 	webhookDB := testWebhookDB(t)
 	event := seedEvent(t, webhookDB, `{"n":1}`)
-	d := seedDatabaseTargetDelivery(t, webhookDB, event, tgt)
+	event.WebhookID = webhookID
+	d := seedDatabaseTargetDelivery(
+		t, webhookDB, event, `{"expiry":"1h"}`,
+	)
 
 	env.eng.ExportDeliverDatabase(webhookDB, d)
 
-	adopted := env.eng.ExportArchiveWriterFor(tgt.ID)
+	adopted := env.eng.ExportArchiveWriterFor(webhookID)
 	require.NotNil(t, adopted)
 	require.True(
 		t, sweepWriter.Same(adopted),
 		"the delivery must have adopted the sweep's writer",
 	)
 	require.True(
-		t, env.eng.ExportArchiveHandleOpen(tgt.ID),
+		t, env.eng.ExportArchiveHandleOpen(webhookID),
 		"the delivery leaves the archive handle open",
 	)
 
 	// The sweep finishes.
-	env.eng.ExportReleaseSweepWriter(tgt.ID, sweepWriter)
+	env.eng.ExportReleaseSweepWriter(webhookID, sweepWriter)
 
 	require.True(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
 		"a writer adopted by a delivery during a sweep must "+
 			"stay registered, or its open handle is unreachable",
 	)
 
-	env.eng.EvictTarget(tgt.ID)
+	env.eng.EvictWebhook(webhookID)
 
 	assert.False(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
 		"the adopted writer must still be evictable",
 	)
 	assert.False(
@@ -498,34 +481,34 @@ func TestArchiveSweep_KeepsWriterAdoptedDuringSweep(
 	)
 }
 
-// TestArchiveSweep_ContinuesAfterPerTargetFailure proves a
+// TestArchiveSweep_ContinuesAfterPerWebhookFailure proves a
-// failure for one target does not abort the sweep for the
+// failure for one webhook does not abort the sweep for the
 // others: an unparseable expiry and an unreadable archive both
 // have to be logged and stepped over.
-func TestArchiveSweep_ContinuesAfterPerTargetFailure(
+func TestArchiveSweep_ContinuesAfterPerWebhookFailure(
 	t *testing.T,
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
 	// Seeded first so the sweep reaches them before the healthy
-	// target: targets come back in insertion order.
+	// webhook: targets come back in insertion order.
-	badConfig := env.seedDatabaseTarget(t, `{"expiry":"!!!"}`)
+	badConfigID := env.seedDatabaseTarget(t, `{"expiry":"!!!"}`)
 	env.seedArchiveRows(
-		t, badConfig, time.Now().Add(-48*time.Hour),
+		t, badConfigID, time.Now().Add(-48*time.Hour),
 	)
 
-	corrupt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	corruptID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	require.NoError(t, os.WriteFile(
-		env.archivePath(corrupt),
+		env.archivePath(corruptID),
 		[]byte("this is not a sqlite database"),
 		0o600,
 	))
 
-	healthy := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	healthyID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	healthyPath := env.seedArchiveRows(
-		t, healthy,
+		t, healthyID,
 		time.Now().Add(-48*time.Hour),
 		time.Now().Add(-time.Minute),
 	)
@@ -535,14 +518,14 @@ func TestArchiveSweep_ContinuesAfterPerTargetFailure(
 	assert.Equal(
 		t, []string{sweepRowNew},
 		archivedEventIDs(t, healthyPath),
-		"a failure for an earlier target must not stop the "+
+		"a failure for an earlier webhook must not stop the "+
 			"sweep from pruning the ones after it",
 	)
 }
 
 // TestArchiveSweep_OpenExistingDoesNotCreateFile pins the second
 // of the two no-create guards. The first is the stat in
-// sweepExpired; this one is the SQLite open mode, which is what
+// sweepWebhook; this one is the SQLite open mode, which is what
 // protects the window between that stat and the open. Flipping
 // the sweep's mode to create-if-missing makes this fail.
 func TestArchiveSweep_OpenExistingDoesNotCreateFile(
@@ -578,13 +561,13 @@ func TestArchiveSweep_OpenExistingDoesNotCreateFile(
 func TestArchiveSweep_PrunesIdleArchive(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 
 	now := time.Now()
 	path := env.seedArchiveRows(
-		t, tgt,
+		t, webhookID,
 		now.Add(-48*time.Hour),
 		now.Add(-time.Minute),
 	)
@@ -617,11 +600,11 @@ func TestArchiveSweep_PrunesIdleArchive(t *testing.T) {
 func TestArchiveSweep_LeavesArchiveClosed(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	path := env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	w := delivery.NewExportArchiveWriter(
@@ -657,94 +640,39 @@ func TestArchiveSweep_ClosesHandleOfRegisteredWriter(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	webhookDB := testWebhookDB(t)
 	event := seedEvent(t, webhookDB, `{"n":1}`)
-	d := seedDatabaseTargetDelivery(t, webhookDB, event, tgt)
+	event.WebhookID = webhookID
+	d := seedDatabaseTargetDelivery(
+		t, webhookDB, event, `{"expiry":"1h"}`,
+	)
 
 	env.eng.ExportDeliverDatabase(webhookDB, d)
 
 	require.True(
-		t, env.eng.ExportArchiveHandleOpen(tgt.ID),
+		t, env.eng.ExportArchiveHandleOpen(webhookID),
 		"the delivery must leave the archive handle open",
 	)
 
 	env.sweeper.ExportSweep(context.Background())
 
 	require.True(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, env.eng.ExportHasArchiveWriter(webhookID),
 		"the delivery's registry entry must survive the sweep",
 	)
 	assert.False(
-		t, env.eng.ExportArchiveHandleOpen(tgt.ID),
+		t, env.eng.ExportArchiveHandleOpen(webhookID),
 		"the sweep must leave the archive closed",
 	)
 }
 
-// TestArchiveSweep_ClosesHandleBeforeReopening proves the sweep
-// closes the handle it finds open before it reopens the file.
-// TestArchiveSweep_LeavesArchiveClosed cannot see this: without the
-// close, the reopen replaces the handle without closing it, the
-// sweep then closes only the new one, and one connection leaks per
-// archive per sweep.
-func TestArchiveSweep_ClosesHandleBeforeReopening(t *testing.T) {
-	t.Parallel()
-
-	path := filepath.Join(t.TempDir(), "archive.db")
-
-	w := delivery.NewExportArchiveWriter(
-		path, archiveTestLogger(), 0,
-	)
-
-	require.NoError(t, w.Open(time.Hour))
-
-	before, err := w.DB().DB()
-	require.NoError(t, err)
-
-	require.NoError(t, w.SweepExpired(time.Hour))
-
-	assert.Error(
-		t, before.PingContext(t.Context()),
-		"the handle open before the sweep must be closed by it",
-	)
-}
-
-// TestArchiveSweep_CancelledSweepLogsNoError proves a sweep whose
-// context is already cancelled, as when the app stops just as a
-// sweep starts, returns without an error line: stopping is not a
-// failure.
-func TestArchiveSweep_CancelledSweepLogsNoError(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-
-	var errorLines bytes.Buffer
-
-	sweeper := delivery.NewTestArchiveSweeper(
-		env.mainDB, env.eng,
-		slog.New(slog.NewTextHandler(
-			&errorLines,
-			&slog.HandlerOptions{Level: slog.LevelError},
-		)),
-	)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-
-	sweeper.ExportSweep(ctx)
-
-	assert.Empty(
-		t, errorLines.String(),
-		"a cancelled sweep must not log at error level",
-	)
-}
-
 // TestArchiveSweep_NeverExpiryUntouched proves the sweep is a
 // no-op for the default retention policy, so archives with no
 // expiry (or the literal "never") behave exactly as before.
@@ -756,11 +684,11 @@ func TestArchiveSweep_NeverExpiryUntouched(t *testing.T) {
 		`{"expiry":""}`,
 		"",
 	} {
-		env := setupArchiveTest(t)
+		env := setupSweeperTest(t)
 
-		tgt := env.seedDatabaseTarget(t, configJSON)
+		webhookID := env.seedDatabaseTarget(t, configJSON)
 		path := env.seedArchiveRows(
-			t, tgt,
+			t, webhookID,
 			time.Now().Add(-10000*time.Hour),
 		)
 
@@ -771,7 +699,7 @@ func TestArchiveSweep_NeverExpiryUntouched(t *testing.T) {
 			"config %q must keep rows forever", configJSON,
 		)
 		assert.False(
-			t, env.eng.ExportHasArchiveWriter(tgt.ID),
+			t, env.eng.ExportHasArchiveWriter(webhookID),
 			"config %q must leave no registry entry behind",
 			configJSON,
 		)
@@ -794,10 +722,10 @@ func TestArchiveSweep_NeverExpirySkipsBeforeOpening(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"never"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"never"}`)
-	path := env.archivePath(tgt)
+	path := env.archivePath(webhookID)
 
 	seedUnmigratedArchive(t, path)
 	require.False(t, archiveTableExists(t, path))
@@ -840,16 +768,16 @@ func archiveTableExists(t *testing.T, path string) bool {
 }
 
 // TestArchiveSweep_DoesNotCreateArchiveFile proves the sweep
-// never conjures an archive: a database target that has never
+// never conjures an archive: a webhook with a database target
-// received an event must still have no archive file (nor SQLite
+// that has never received an event must still have no archive
-// sidecar) after a sweep, and no registry entry either.
+// file (nor SQLite sidecar) after a sweep.
 func TestArchiveSweep_DoesNotCreateArchiveFile(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
-	path := env.archivePath(tgt)
+	path := env.archivePath(webhookID)
 
 	require.NoFileExists(t, path)
 
@@ -861,11 +789,6 @@ func TestArchiveSweep_DoesNotCreateArchiveFile(t *testing.T) {
 			"the sweep must not create an archive file",
 		)
 	}
-
-	assert.False(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
-		"the sweep must leave no registry entry behind",
-	)
 }
 
 // TestArchiveSweep_DoesNotCreateAfterWriterExists covers the
@@ -877,11 +800,11 @@ func TestArchiveSweep_DoesNotCreateAfterWriterExists(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 
-	path, err := env.eng.ExportEnsureArchiveWriter(tgt.ID)
+	path, err := env.eng.ExportEnsureArchiveWriter(webhookID)
 	require.NoError(t, err)
 	require.NoFileExists(t, path)
 
@@ -896,17 +819,17 @@ func TestArchiveSweep_DoesNotCreateAfterWriterExists(
 func TestArchiveSweep_SkipsDeletedWebhookTargets(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	path := env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	require.NoError(
 		t,
 		env.mainDB.DB().
-			Where("webhook_id = ?", tgt.WebhookID).
+			Where("webhook_id = ?", webhookID).
 			Delete(&database.Target{}).Error,
 	)
 
@@ -919,14 +842,14 @@ func TestArchiveSweep_SkipsDeletedWebhookTargets(t *testing.T) {
 }
 
 // TestArchiveSweep_ConcurrentWrites proves the sweep serialises
-// against writes through the target's writer mutex. Run under
+// against writes through the per-webhook writer mutex. Run
-// -race, an unsynchronised sweep would be caught here.
+// under -race, an unsynchronised sweep would be caught here.
 func TestArchiveSweep_ConcurrentWrites(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 
 	webhookDB := testWebhookDB(t)
 
@@ -939,10 +862,13 @@ func TestArchiveSweep_ConcurrentWrites(t *testing.T) {
 
 	for range sweepConcurrentWrites {
 		event := seedEvent(t, webhookDB, `{"n":1}`)
+		event.WebhookID = webhookID
 
 		deliveries = append(
 			deliveries,
-			seedDatabaseTargetDelivery(t, webhookDB, event, tgt),
+			seedDatabaseTargetDelivery(
+				t, webhookDB, event, `{"expiry":"1h"}`,
+			),
 		)
 	}
 
@@ -968,7 +894,7 @@ func TestArchiveSweep_ConcurrentWrites(t *testing.T) {
 
 	wg.Wait()
 
-	assert.FileExists(t, env.archivePath(tgt))
+	assert.FileExists(t, env.archivePath(webhookID))
 }
 
 // TestArchiveSweeper_StopsCleanly proves the background loop
@@ -976,11 +902,11 @@ func TestArchiveSweep_ConcurrentWrites(t *testing.T) {
 func TestArchiveSweeper_StopsCleanly(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
+	webhookID := env.seedDatabaseTarget(t, `{"expiry":"1h"}`)
 	env.seedArchiveRows(
-		t, tgt, time.Now().Add(-48*time.Hour),
+		t, webhookID, time.Now().Add(-48*time.Hour),
 	)
 
 	env.sweeper.ExportSetInterval(time.Millisecond)
@@ -1004,7 +930,7 @@ func TestArchiveSweeper_StopHookHonoursStopTimeout(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	env := setupSweeperTest(t)
 
 	lc := &recordingLifecycle{}
 	env.sweeper.ExportRegisterHooks(lc)

internal/delivery/engine.go

@@ -123,24 +123,21 @@ type Notifier interface {
 	Notify(tasks []Task)
 }
 
-// Archives is how the handlers keep the database targets' archive
+// WebhookEvictor releases the delivery engine's per-webhook
-// files in step with the configuration. Deleting a webhook or a
+// state for a webhook that no longer needs it — currently the
-// target releases the cached archive writers, whose open file
+// cached archive writer of the database target, whose open
-// handles would otherwise outlive them; renaming one renames the
+// file handle would otherwise outlive the webhook.
-// archive files, which are named for the webhook and the target
-// (see ArchiveFileName).
 //
-// It is deliberately separate from Notifier: archiving lifecycle
+// It is deliberately separate from Notifier and deliberately
-// is not notification, and a small interface keeps the handlers
+// one method wide: archiving lifecycle is not notification, and
-// package free of any dependency on the engine's internals while
+// a single-method interface keeps the handlers package free of
-// staying trivially fakeable in tests.
+// any dependency on the engine's internals while staying
+// trivially fakeable in tests.
 //
-// Neither eviction deletes an archive file. Both are idempotent
+// EvictWebhook never deletes an archive file. It is idempotent
-// and are no-ops for a webhook or target with no engine state.
+// and is a no-op for a webhook with no engine state.
-type Archives interface {
+type WebhookEvictor interface {
 	EvictWebhook(webhookID string)
-	EvictTarget(targetID string)
-	Rename(targetID, webhookName, targetName string) error
 }
 
 // EngineParams are the fx dependencies for the delivery
@@ -191,7 +188,7 @@ type Engine struct {
 	httpTarget *httpTarget
 
 	// dbTarget is retained so the engine can reach the archive
-	// writer registry for eviction, renames and the idle sweep.
+	// writer registry for webhook eviction and the idle sweep.
 	dbTarget *databaseTarget
 
 	// inflight is the set of deliveries this engine currently owns.
@@ -260,44 +257,17 @@ func (e *Engine) Notify(tasks []Task) {
 	}
 }
 
-// EvictWebhook implements Archives. The cached archive writer of
+// EvictWebhook implements WebhookEvictor. It releases the
-// every database target of the webhook is dropped from the
+// engine's per-webhook archiving state: the database target's
-// registry and its file handle closed. The archive files
+// cached archive writer is dropped from the registry and its
-// themselves are left on disk — they are long-term storage the
+// file handle closed. The archive file itself is left on disk
-// operator owns.
+// — it is long-term storage the operator owns.
 func (e *Engine) EvictWebhook(webhookID string) {
 	if e.dbTarget == nil {
 		return
 	}
 
-	e.dbTarget.evictWebhook(webhookID)
+	e.dbTarget.evict(webhookID)
-}
-
-// EvictTarget implements Archives. It is EvictWebhook for a single
-// database target, and leaves the archive file on disk the same
-// way.
-func (e *Engine) EvictTarget(targetID string) {
-	if e.dbTarget == nil {
-		return
-	}
-
-	e.dbTarget.evict(targetID)
-}
-
-// Rename implements Archives. It renames a database target's
-// archive file to ArchiveFileName(webhookName, targetName,
-// targetID), under the lock the target's archive writes and the
-// idle sweep take. It never replaces a file: if one already has the
-// new name, the error is ErrArchiveNameTaken. The caller renames
-// before it saves the new name: see databaseTarget.rename.
-func (e *Engine) Rename(
-	targetID, webhookName, targetName string,
-) error {
-	if e.dbTarget == nil {
-		return nil
-	}
-
-	return e.dbTarget.rename(targetID, webhookName, targetName)
 }
 
 // ScheduleRetry schedules a task to be re-enqueued onto the
@@ -411,8 +381,7 @@ func (e *Engine) start() {
 // Once the pool has drained it closes the archive writers, so a
 // clean stop leaves no archive -wal behind. Nothing else holds a
 // writer for long by then: the archive sweeper stops before the
-// engine, and deleting or renaming a webhook or target only closes
+// engine, and deleting a webhook only closes one. If the pool did
-// or moves one. If the pool did
 // not drain in time, the writers are left open, as a kill would
 // leave them. Closing them would wait for any write in progress,
 // and a worker still running would then open new writers that

internal/delivery/engine_integration_test.go

@@ -23,7 +23,6 @@ import (
 	_ "modernc.org/sqlite"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
-	"sneak.berlin/go/webhooker/internal/gormlog"
 )
 
 // iSetup holds common integration test dependencies.
@@ -81,8 +80,7 @@ func iMainDB(t *testing.T) *gorm.DB {
 	t.Cleanup(func() { _ = sqlDB.Close() })
 
 	db, err := gorm.Open(
-		sqlite.Dialector{Conn: sqlDB},
+		sqlite.Dialector{Conn: sqlDB}, &gorm.Config{},
-		&gorm.Config{Logger: gormlog.New(slog.New(slog.DiscardHandler))},
 	)
 	require.NoError(t, err)
 
@@ -357,14 +355,9 @@ func TestProcessRetryTask_SuccessfulRetry(t *testing.T) {
 
 	s := newISetup(t)
 
-	var receivedBody string
-
 	ts := httptest.NewServer(
 		http.HandlerFunc(
-			func(w http.ResponseWriter, r *http.Request) {
+			func(w http.ResponseWriter, _ *http.Request) {
-				body, _ := io.ReadAll(r.Body)
-				receivedBody = string(body)
-
 				w.WriteHeader(http.StatusOK)
 			},
 		),
@@ -404,8 +397,6 @@ func TestProcessRetryTask_SuccessfulRetry(t *testing.T) {
 		context.TODO(), &task,
 	)
 
-	assert.Equal(t, event.Body, receivedBody)
-
 	iAssertStatus(t, s.WebhookDB, d.ID,
 		database.DeliveryStatusDelivered,
 	)
@@ -452,14 +443,9 @@ func TestProcessRetryTask_LargeBody_FetchFromDB(
 
 	s := newISetup(t)
 
-	var receivedBody string
-
 	ts := httptest.NewServer(
 		http.HandlerFunc(
-			func(w http.ResponseWriter, r *http.Request) {
+			func(w http.ResponseWriter, _ *http.Request) {
-				body, _ := io.ReadAll(r.Body)
-				receivedBody = string(body)
-
 				w.WriteHeader(http.StatusOK)
 			},
 		),
@@ -496,8 +482,6 @@ func TestProcessRetryTask_LargeBody_FetchFromDB(
 		context.TODO(), &task,
 	)
 
-	assert.Equal(t, largeBody, receivedBody)
-
 	iAssertStatus(t, s.WebhookDB, d.ID,
 		database.DeliveryStatusDelivered,
 	)
@@ -1427,32 +1411,6 @@ func TestDeliverHTTP_InvalidConfig(t *testing.T) {
 	)
 }
 
-// TestDeliverHTTP_InvalidConfigUnrecordedStaysPending: a delivery is
-// failed for an invalid config only once the reason is recorded.
-// Unrecorded, it stays pending, where the sweep finds it again.
-func TestDeliverHTTP_InvalidConfigUnrecordedStaysPending(t *testing.T) {
-	t.Parallel()
-
-	db := testWebhookDB(t)
-	e := testEngine(t, 1)
-
-	event, del := iSeedEventAndDelivery(
-		t, db, `{"config":"invalid"}`, "",
-	)
-
-	task, d := iHTTPTaskAndDelivery(
-		event, del, "bad-config", `not-json`, 0, 1,
-	)
-
-	require.NoError(t, db.Exec("drop table delivery_results").Error)
-
-	e.ExportDeliverHTTP(context.TODO(), db, d, task)
-
-	iAssertStatus(t, db, del.ID,
-		database.DeliveryStatusPending,
-	)
-}
-
 // --- Notify batching ---
 
 func TestNotify_MultipleTasks(t *testing.T) {

internal/delivery/engine_lifecycle_test.go

@@ -2,6 +2,7 @@ package delivery_test
 
 import (
 	"context"
+	"fmt"
 	"path/filepath"
 	"testing"
 	"time"
@@ -9,7 +10,6 @@ import (
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/fx"
-	"gorm.io/gorm/clause"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
 )
@@ -272,35 +272,22 @@ func TestEngine_StopHookHonoursStopTimeout(t *testing.T) {
 	requireStopHookExpires(t, lc.hooks[0], "delivery engine")
 }
 
-// deliverToArchive gives the setup's webhook a database target,
+// deliverToArchive runs one delivery to a database target through
-// runs one delivery to it through the running engine, and returns
+// the running engine and returns the webhook's archive file path.
-// the target's ID and archive file path. The archive writer holds
+// The archive writer holds the file open afterwards.
-// the file open afterwards.
+func deliverToArchive(t *testing.T, s iSetup) string {
-func deliverToArchive(t *testing.T, s iSetup) (string, string) {
 	t.Helper()
 
-	iCreateWebhook(t, s.MainDB, s.WebhookID, "hook")
-
-	tgt := &database.Target{
-		WebhookID: s.WebhookID,
-		Name:      "archive",
-		Type:      database.TargetTypeDatabase,
-	}
-	require.NoError(
-		t, s.MainDB.Omit(clause.Associations).Create(tgt).Error,
-	)
-
 	deliveryID, task := seedLogTask(t, s)
-	task.TargetID = tgt.ID
 	task.TargetType = database.TargetTypeDatabase
 
 	s.Engine.Notify([]delivery.Task{task})
 
 	iWaitForDelivered(t, s.WebhookDB, deliveryID)
 
-	return tgt.ID, filepath.Join(
+	return filepath.Join(
 		filepath.Dir(s.DBMgr.DBPath(s.WebhookID)),
-		"archive-hook-archive-"+tgt.ID+".db",
+		fmt.Sprintf("archive-%s.db", s.WebhookID),
 	)
 }
 
@@ -317,7 +304,7 @@ func TestEngine_StopHookClosesArchives(t *testing.T) {
 
 	lc := startEngineViaHook(t, s.Engine)
 
-	_, path := deliverToArchive(t, s)
+	path := deliverToArchive(t, s)
 	require.FileExists(
 		t, path+"-wal",
 		"an open archive should have a -wal for the stop to remove",
@@ -351,7 +338,7 @@ func TestEngine_StopHookTimeoutLeavesArchivesOpen(t *testing.T) {
 
 	lc := startEngineViaHook(t, s.Engine)
 
-	targetID, _ := deliverToArchive(t, s)
+	deliverToArchive(t, s)
 
 	release := make(chan struct{})
 
@@ -365,7 +352,7 @@ func TestEngine_StopHookTimeoutLeavesArchivesOpen(t *testing.T) {
 	requireStopHookExpires(t, lc.hooks[0], "delivery engine")
 
 	require.True(
-		t, s.Engine.ExportArchiveHandleOpen(targetID),
+		t, s.Engine.ExportArchiveHandleOpen(s.WebhookID),
 		"a stop that timed out must not close archive writers",
 	)
 }

internal/delivery/engine_test.go

@@ -5,7 +5,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io"
 	"log/slog"
 	"net/http"
 	"net/http/httptest"
@@ -26,7 +25,6 @@ import (
 	_ "modernc.org/sqlite"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
-	"sneak.berlin/go/webhooker/internal/gormlog"
 	"sneak.berlin/go/webhooker/internal/metrics"
 )
 
@@ -51,8 +49,7 @@ func testWebhookDB(t *testing.T) *gorm.DB {
 	t.Cleanup(func() { _ = sqlDB.Close() })
 
 	db, err := gorm.Open(
-		sqlite.Dialector{Conn: sqlDB},
+		sqlite.Dialector{Conn: sqlDB}, &gorm.Config{},
-		&gorm.Config{Logger: gormlog.New(slog.New(slog.DiscardHandler))},
 	)
 	require.NoError(t, err)
 
@@ -354,15 +351,23 @@ func TestDeliverDatabase_ImmediateSuccess(
 
 	db := testWebhookDB(t)
 
-	// The database target archives for real, so the engine needs
+	// The database target archives for real now, so the engine
-	// the target in the main database and a data directory.
+	// needs a webhook DB manager to locate the data directory.
-	env := setupArchiveTest(t)
+	e := delivery.NewTestEngineWithDB(
-	tgt := env.seedDatabaseTarget(t, "")
+		nil,
+		database.NewTestWebhookDBManager(t.TempDir()),
+		slog.New(slog.NewTextHandler(
+			os.Stderr,
+			&slog.HandlerOptions{Level: slog.LevelDebug},
+		)),
+		&http.Client{Timeout: 5 * time.Second},
+		1,
+	)
 
 	event := seedEvent(t, db, `{"db":"target"}`)
-	d := seedDatabaseTargetDelivery(t, db, event, tgt)
+	d := seedDatabaseTargetDelivery(t, db, event, "")
 
-	env.eng.ExportDeliverDatabase(db, d)
+	e.ExportDeliverDatabase(db, d)
 
 	var updated database.Delivery
 
@@ -1059,21 +1064,6 @@ func TestParseHTTPConfig_MissingURL(t *testing.T) {
 	)
 }
 
-func TestParseHTTPConfig_Undecodable(t *testing.T) {
-	t.Parallel()
-
-	e := testEngine(t, 1)
-
-	_, err := e.ExportParseHTTPConfig(
-		`{"url":"https://example.com/hook","timeout":"soon"}`,
-	)
-
-	assert.Error(t, err,
-		"config that does not decode should return error, "+
-			"even when the part that did names a URL",
-	)
-}
-
 func TestScheduleRetry_SendsToRetryChannel(
 	t *testing.T,
 ) {
@@ -1259,33 +1249,6 @@ func TestDoHTTPRequest_ForwardsHeaders(t *testing.T) {
 	)
 }
 
-// A response that ends before the length it announced is an error, not
-// a short body.
-func TestDoHTTPRequest_CutShortResponseIsAnError(t *testing.T) {
-	t.Parallel()
-
-	ts := httptest.NewServer(
-		http.HandlerFunc(
-			func(w http.ResponseWriter, _ *http.Request) {
-				w.Header().Set("Content-Length", "100")
-				_, _ = w.Write([]byte("cut short"))
-			},
-		),
-	)
-	defer ts.Close()
-
-	e := testEngine(t, 1)
-
-	_, body, _, err := e.ExportDoHTTPRequest(
-		context.TODO(),
-		&delivery.HTTPTargetConfig{URL: ts.URL},
-		&database.Event{},
-	)
-
-	require.ErrorIs(t, err, io.ErrUnexpectedEOF)
-	assert.Empty(t, body)
-}
-
 // The event's stored inbound headers carry the same Content-Type the
 // receiver saved as the event's ContentType, so a delivery could send
 // it twice. It must go out exactly once, with a Content-Type configured
@@ -1362,34 +1325,6 @@ func TestApplyRequestHeaders_SendsOneContentType(t *testing.T) {
 	}
 }
 
-// Stored inbound headers that do not decode forward nothing, not the
-// part of them that happened to decode.
-func TestApplyRequestHeaders_UndecodableInboundForwardsNothing(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	req, err := http.NewRequestWithContext(
-		context.Background(),
-		http.MethodPost,
-		"https://target.example.com/hook",
-		http.NoBody,
-	)
-	require.NoError(t, err)
-
-	names := delivery.ExportApplyRequestHeaders(
-		req,
-		&database.Event{
-			Headers: `{"X-Custom":["value1"],"X-Broken":"not a list"}`,
-		},
-		&delivery.HTTPTargetConfig{},
-		"webhooker/dev",
-	)
-
-	assert.Empty(t, names)
-	assert.Empty(t, req.Header.Get("X-Custom"))
-}
-
 func TestProcessDelivery_RoutesToCorrectHandler(
 	t *testing.T,
 ) {
@@ -1397,27 +1332,32 @@ func TestProcessDelivery_RoutesToCorrectHandler(
 
 	db := testWebhookDB(t)
 
-	// The database target archives for real, so the engine needs
+	// The database target archives for real now, so the engine
-	// the target in the main database and a data directory.
+	// needs a webhook DB manager to locate the data directory.
-	env := setupArchiveTest(t)
+	e := delivery.NewTestEngineWithDB(
-	archive := env.seedDatabaseTarget(t, "")
+		nil,
+		database.NewTestWebhookDBManager(t.TempDir()),
+		slog.New(slog.NewTextHandler(
+			os.Stderr,
+			&slog.HandlerOptions{Level: slog.LevelDebug},
+		)),
+		&http.Client{Timeout: 5 * time.Second},
+		1,
+	)
 
 	tests := []struct {
 		name       string
 		targetType database.TargetType
-		targetID   string
 		wantStatus database.DeliveryStatus
 	}{
 		{
 			"database target",
 			database.TargetTypeDatabase,
-			archive.ID,
 			database.DeliveryStatusDelivered,
 		},
 		{
 			"log target",
 			database.TargetTypeLog,
-			uuid.New().String(),
 			database.DeliveryStatusDelivered,
 		},
 	}
@@ -1427,7 +1367,7 @@ func TestProcessDelivery_RoutesToCorrectHandler(
 			t.Parallel()
 
 			runRoutingSubtest(
-				t, db, env.eng, tt.targetType, tt.targetID,
+				t, db, e, tt.targetType,
 				tt.wantStatus,
 			)
 		})
@@ -1439,7 +1379,6 @@ func runRoutingSubtest(
 	db *gorm.DB,
 	e *delivery.Engine,
 	targetType database.TargetType,
-	targetID string,
 	wantStatus database.DeliveryStatus,
 ) {
 	t.Helper()
@@ -1447,7 +1386,8 @@ func runRoutingSubtest(
 	event := seedEvent(t, db, `{"routing":"test"}`)
 
 	dlv := seedDelivery(
-		t, db, event.ID, targetID,
+		t, db, event.ID,
+		uuid.New().String(),
 		database.DeliveryStatusPending,
 	)
 

internal/delivery/export_test.go

@@ -474,7 +474,7 @@ func NewTestCircuitBreaker(
 type ExportArchivedEvent = archivedEvent
 
 // ExportArchiveWriter wraps an archiveWriter so black-box tests
-// can exercise the archive file mechanics.
+// can exercise the per-webhook archive file mechanics.
 type ExportArchiveWriter struct {
 	w *archiveWriter
 }
@@ -512,12 +512,6 @@ func (e *ExportArchiveWriter) Reopen(
 	return e.w.reopen(expiry)
 }
 
-// SetNow replaces the clock the writer measures its reopen
-// debounce on.
-func (e *ExportArchiveWriter) SetNow(now func() time.Time) {
-	e.w.now = now
-}
-
 // Reopens reports how many times the file has been opened.
 func (e *ExportArchiveWriter) Reopens() int {
 	return e.w.reopens
@@ -555,12 +549,6 @@ func (e *ExportArchiveWriter) Evict() {
 	e.w.evict()
 }
 
-// Rename gives the archive file a new name in the same directory,
-// as a rename of the webhook or target does.
-func (e *ExportArchiveWriter) Rename(name string) error {
-	return e.w.rename(name)
-}
-
 // HandleOpen reports whether the writer currently holds an open
 // archive handle.
 func (e *ExportArchiveWriter) HandleOpen() bool {
@@ -580,16 +568,16 @@ func (e *ExportArchiveWriter) Same(
 }
 
 // ExportArchiveWriterFor returns the archive writer the registry
-// currently caches for a database target, or nil when none is
+// currently caches for a webhook, or nil when none is cached. It
-// cached. It never creates one, so a test can hold a reference to
+// never creates one, so a test can hold a reference to the very
-// the very writer an eviction is about to detach.
+// writer an eviction is about to detach.
 func (e *Engine) ExportArchiveWriterFor(
-	targetID string,
+	webhookID string,
 ) *ExportArchiveWriter {
 	e.dbTarget.mu.Lock()
 	defer e.dbTarget.mu.Unlock()
 
-	w, ok := e.dbTarget.writers[targetID]
+	w, ok := e.dbTarget.writers[webhookID]
 	if !ok {
 		return nil
 	}
@@ -598,26 +586,26 @@ func (e *Engine) ExportArchiveWriterFor(
 }
 
 // ExportHasArchiveWriter reports whether the database target
-// type currently caches an archive writer for a target.
+// currently caches an archive writer for a webhook.
 func (e *Engine) ExportHasArchiveWriter(
-	targetID string,
+	webhookID string,
 ) bool {
 	e.dbTarget.mu.Lock()
 	defer e.dbTarget.mu.Unlock()
 
-	_, ok := e.dbTarget.writers[targetID]
+	_, ok := e.dbTarget.writers[webhookID]
 
 	return ok
 }
 
 // ExportArchiveHandleOpen reports whether the cached archive
-// writer for a target holds an open database handle. It
+// writer for a webhook holds an open database handle. It
 // returns false when no writer is cached.
 func (e *Engine) ExportArchiveHandleOpen(
-	targetID string,
+	webhookID string,
 ) bool {
 	e.dbTarget.mu.Lock()
-	w, ok := e.dbTarget.writers[targetID]
+	w, ok := e.dbTarget.writers[webhookID]
 	e.dbTarget.mu.Unlock()
 
 	if !ok {
@@ -631,12 +619,12 @@ func (e *Engine) ExportArchiveHandleOpen(
 }
 
 // ExportEnsureArchiveWriter creates (if needed) and returns the
-// archive file path of the cached writer for a target, so a
+// archive file path of the cached writer for a webhook, so a
 // test can prime the registry the way a delivery would.
 func (e *Engine) ExportEnsureArchiveWriter(
-	targetID string,
+	webhookID string,
 ) (string, error) {
-	w, err := e.dbTarget.writerFor(targetID)
+	w, err := e.dbTarget.writerFor(webhookID)
 	if err != nil {
 		return "", err
 	}
@@ -644,14 +632,14 @@ func (e *Engine) ExportEnsureArchiveWriter(
 	return w.path, nil
 }
 
-// ExportSweepWriterFor takes a target's registry writer exactly
+// ExportSweepWriterFor takes a webhook's registry writer exactly
 // as the idle sweep does, reporting whether the sweep had to
 // create the entry. It lets a test drive the registry through the
 // sweep's own entry point instead of choreographing goroutines.
 func (e *Engine) ExportSweepWriterFor(
-	targetID string,
+	webhookID string,
 ) (*ExportArchiveWriter, bool, error) {
-	w, created, err := e.dbTarget.sweepWriterFor(targetID)
+	w, created, err := e.dbTarget.sweepWriterFor(webhookID)
 	if err != nil {
 		return nil, false, err
 	}
@@ -662,9 +650,9 @@ func (e *Engine) ExportSweepWriterFor(
 // ExportReleaseSweepWriter releases a sweep-created registry entry
 // exactly as a finished sweep does.
 func (e *Engine) ExportReleaseSweepWriter(
-	targetID string, w *ExportArchiveWriter,
+	webhookID string, w *ExportArchiveWriter,
 ) {
-	e.dbTarget.releaseSweepWriter(targetID, w.w)
+	e.dbTarget.releaseSweepWriter(webhookID, w.w)
 }
 
 // NewTestArchiveSweeper builds an ArchiveSweeper backed by the

internal/delivery/recovery_durability_test.go

@@ -376,97 +376,3 @@ func TestFailedResultWriteLeavesDeliveryRecoverable(
 		database.DeliveryStatusPending,
 	)
 }
-
-// TestFailedResultWriteWithRetriesLeavesDeliveryRecoverable is the same
-// rule for a target with retries: whatever the receiver answered, the
-// delivery stays pending and no retry is scheduled. The circuit breaker
-// still learns the answer, because it describes the target's health,
-// not the database's.
-func TestFailedResultWriteWithRetriesLeavesDeliveryRecoverable(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	// The "send succeeded" case starts with the breaker tripped open,
-	// so the delivery goes out as its probe and only a recorded
-	// success closes it again.
-	tests := []struct {
-		name        string
-		answer      int
-		tripped     bool
-		wantBreaker delivery.CircuitState
-	}{
-		{"send succeeded", http.StatusOK, true, delivery.CircuitClosed},
-		{"send failed", http.StatusBadGateway, false, delivery.CircuitOpen},
-	}
-
-	for _, tc := range tests {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			s := newISetup(t)
-			targetID := uuid.New().String()
-
-			ts := httptest.NewServer(http.HandlerFunc(
-				func(w http.ResponseWriter, _ *http.Request) {
-					w.WriteHeader(tc.answer)
-				},
-			))
-			defer ts.Close()
-
-			event := iSeedEvent(
-				t, s.WebhookDB, s.WebhookID, `{"unwritable":true}`,
-			)
-
-			d := iSeedDelivery(
-				t, s.WebhookDB, event.ID, targetID,
-				database.DeliveryStatusPending,
-			)
-
-			require.NoError(
-				t,
-				s.WebhookDB.Exec("drop table delivery_results").Error,
-			)
-
-			// A single failure opens this breaker, and with no
-			// cooldown an open breaker lets the next delivery
-			// through as a probe.
-			cb := delivery.NewTestCircuitBreaker(1, 0)
-			if tc.tripped {
-				cb.RecordFailure()
-			}
-
-			s.Engine.ExportSetCircuitBreaker(targetID, cb)
-
-			full := &database.Delivery{
-				EventID:  event.ID,
-				TargetID: targetID,
-				Status:   database.DeliveryStatusPending,
-				Event:    event,
-				Target: database.Target{
-					Name:       "unwritable",
-					Type:       database.TargetTypeHTTP,
-					Config:     iHTTPConfig(ts.URL),
-					MaxRetries: 3,
-				},
-			}
-			full.ID = d.ID
-
-			sched := &recordingScheduler{}
-
-			s.Engine.ExportDeliverHTTPWithScheduler(
-				context.Background(), s.WebhookDB, full,
-				&delivery.Task{
-					DeliveryID: d.ID,
-					TargetID:   targetID,
-					AttemptNum: 1,
-				},
-				sched,
-			)
-
-			iAssertStatus(t, s.WebhookDB, d.ID, database.DeliveryStatusPending)
-			assert.Empty(t, sched.delays, "no retry may be scheduled")
-			assert.Equal(t, tc.wantBreaker, cb.State())
-		})
-	}
-}

internal/delivery/ssrf.go

@@ -37,8 +37,8 @@ var (
 		"blocked cloud metadata address",
 	)
 	errBlockedMetadata = errors.New(
-		"blocked link-local, cloud instance metadata or " +
+		"blocked link-local or cloud instance metadata " +
-			"unspecified address: ALLOWED_EGRESS_CIDRS cannot open it",
+			"address: ALLOWED_EGRESS_CIDRS cannot open it",
 	)
 	errInvalidScheme = errors.New(
 		"only http and https are allowed",
@@ -72,17 +72,14 @@ var blockedNetworks []*net.IPNet
 var blockedPublicNetworks []*net.IPNet
 
 // alwaysBlockedNetworks are the ranges no configuration can
-// open, so a supplied CIDR that covers one still leaves it
+// open: the link-local blocks and the cloud instance metadata
-// blocked. An entry is here for one of two reasons: it is a
+// endpoints that live outside them. Reaching one is credential
-// metadata endpoint (the link-local blocks and the cloud
+// or user-data theft rather than delivery to an internal
-// instance metadata endpoints that live outside them), or it is
+// service, so a supplied CIDR that covers such an address still
-// an unspecified address. Reaching a metadata endpoint is
+// leaves it blocked.
-// credential or user-data theft rather than delivery to an
-// internal service.
 //
-// Inclusion criterion for metadata endpoints — one belongs here
+// Inclusion criterion — an address belongs here only if BOTH
-// only if BOTH hold, and every metadata entry below satisfies
+// hold, and every entry below satisfies both:
-// both:
 //
 //  1. It is a fixed address assigned by the provider, or a
 //     range reserved by IANA — never one the operator chose.
@@ -93,8 +90,8 @@ var blockedPublicNetworks []*net.IPNet
 //     not cheaply rotated.
 //
 // Both halves are load-bearing, so use them to refuse a
-// metadata candidate and say why. An endpoint disclosing only
+// candidate and say why. An endpoint disclosing only the
-// the operator's own inventory (instance id, region, disks, NICs)
+// operator's own inventory (instance id, region, disks, NICs)
 // fails (2): letting a delivery target reach the operator's own
 // infrastructure is the feature ALLOWED_EGRESS_CIDRS exists to
 // provide. But (2) is not "IAM credentials only" either —
@@ -115,15 +112,6 @@ var blockedPublicNetworks []*net.IPNet
 // This is a criterion, not an enumeration of every metadata
 // address in existence.
 //
-// The unspecified addresses 0.0.0.0 and :: are here for a
-// separate reason: they disclose nothing, but no host can have
-// either, and on Linux a connection to one reaches this host's
-// own loopback. Listing them means an allowlist reaches loopback
-// only through an entry that covers a loopback address
-// (127.0.0.0/8, ::1/128, 0.0.0.0/0), never through one that
-// covers only 0.0.0.0 or :: (0.0.0.0/8, for example). Nothing
-// else lives at either address, so refusing them costs nothing.
-//
 // Every entry is either already in blockedNetworks — this list is
 // what makes it unconditional — or an alternate encoding of
 // 169.254.169.254 that Contains does not match against
@@ -143,46 +131,23 @@ var alwaysBlockedNetworks []*net.IPNet
 //nolint:gochecknoinits // init is the idiomatic way to parse CIDRs once at startup
 func init() {
 	blockedNetworks = mustParseCIDRs([]string{
-		// IPv4 loopback.
 		"127.0.0.0/8",
-		// RFC 1918 private network.
 		"10.0.0.0/8",
-		// RFC 1918 private network.
 		"172.16.0.0/12",
-		// RFC 1918 private network.
 		"192.168.0.0/16",
-		// IPv4 link-local.
 		"169.254.0.0/16",
-		// "This network", holding the IPv4 unspecified address 0.0.0.0.
 		"0.0.0.0/8",
-		// Carrier-grade NAT shared address space.
 		"100.64.0.0/10",
-		// IETF protocol assignments.
 		"192.0.0.0/24",
-		// IPv4 documentation (TEST-NET-1).
 		"192.0.2.0/24",
-		// Benchmarking.
 		"198.18.0.0/15",
-		// IPv4 documentation (TEST-NET-2).
 		"198.51.100.0/24",
-		// IPv4 documentation (TEST-NET-3).
 		"203.0.113.0/24",
-		// IPv4 multicast.
 		"224.0.0.0/4",
-		// Reserved, including the broadcast address.
 		"240.0.0.0/4",
-		// IPv6 loopback.
 		"::1/128",
-		// IPv6 unspecified address.
-		"::/128",
-		// IPv6 unique local addresses.
 		"fc00::/7",
-		// IPv6 link-local.
 		"fe80::/10",
-		// IPv6 multicast.
-		"ff00::/8",
-		// IPv6 documentation.
-		"2001:db8::/32",
 	})
 
 	blockedPublicNetworks = mustParseCIDRs([]string{
@@ -242,14 +207,6 @@ func init() {
 		// allowlist from opening it.
 		"192.0.0.192/32",
 
-		// The unspecified addresses, each of which reaches this
-		// host's loopback on Linux.
-		//
-		// IPv4 unspecified address, inside the blocked 0.0.0.0/8.
-		"0.0.0.0/32",
-		// IPv6 unspecified address.
-		"::/128",
-
 		// 169.254.169.254 as an IPv4-compatible IPv6 address.
 		"::a9fe:a9fe/128",
 		// 169.254.169.254 behind the NAT64 well-known prefix.
@@ -386,9 +343,8 @@ func (g *Guard) allows(ip net.IP) bool {
 // The order is the policy:
 //
 //  1. alwaysBlockedNetworks is refused before the allowlist is
-//     consulted, so no configured CIDR reaches link-local, a
+//     consulted, so no configured CIDR reaches link-local or a
-//     cloud metadata endpoint at a non-public address, or an
+//     cloud metadata endpoint at a non-public address.
-//     unspecified address.
 //  2. The allowlist is consulted next, so a listed private
 //     network, or a listed public address on the default
 //     blocklist, becomes reachable.

internal/delivery/ssrf_allowlist_test.go

@@ -168,13 +168,12 @@ func TestGuardAllowlist_UnlistedPrivateStillRefused(t *testing.T) {
 
 // TestGuardAllowlist_MetadataAlwaysRefused is the load-bearing
 // case: cloud instance metadata endpoints are credential theft
-// rather than delivery to an internal service, and the
+// rather than delivery to an internal service, so no allowlist
-// unspecified addresses 0.0.0.0 and :: reach this host's loopback
+// reaches one. Every guard below names a CIDR that covers its
-// on Linux, so no allowlist reaches any of them. Every guard
+// target — including 0.0.0.0/0, ::/0, and the ordinary ULA and
-// below names a CIDR that covers its target — including
+// CGNAT blocks an operator would really list — and the address
-// 0.0.0.0/0, ::/0, and the ordinary ULA and CGNAT blocks an
+// must stay refused anyway, on both the validation and the
-// operator would really list — and the address must stay
+// delivery path.
-// refused anyway, on both the validation and the delivery path.
 func TestGuardAllowlist_MetadataAlwaysRefused(t *testing.T) {
 	t.Parallel()
 
@@ -220,17 +219,15 @@ type metadataAlwaysRefusedCase struct {
 }
 
 // metadataAlwaysRefusedCases enumerates every unconditionally
-// blocked address (link-local, the cloud metadata endpoints and
+// blocked address together with an allowlist entry that would
-// the unspecified addresses) together with an allowlist entry
+// otherwise reach it. Split by family of address only to stay
-// that would otherwise reach it. Split by family of address only
+// under the function-length limit.
-// to stay under the function-length limit.
 func metadataAlwaysRefusedCases() []metadataAlwaysRefusedCase {
 	cases := linkLocalRefusedCases()
 	cases = append(cases, ulaMetadataRefusedCases()...)
 	cases = append(cases, ipv4MetadataRefusedCases()...)
-	cases = append(cases, encodedMetadataRefusedCases()...)
 
-	return append(cases, unspecifiedRefusedCases()...)
+	return append(cases, encodedMetadataRefusedCases()...)
 }
 
 // linkLocalRefusedCases covers the link-local blocks, including
@@ -370,23 +367,6 @@ func encodedMetadataRefusedCases() []metadataAlwaysRefusedCase {
 	}
 }
 
-// unspecifiedRefusedCases covers the unspecified addresses, each
-// of which reaches this host's loopback on Linux.
-func unspecifiedRefusedCases() []metadataAlwaysRefusedCase {
-	return []metadataAlwaysRefusedCase{
-		{
-			name:   "IPv4 unspecified address under 0.0.0.0/0",
-			allow:  allowAllIPv4,
-			target: "http://0.0.0.0:8080/hook",
-		},
-		{
-			name:   "IPv6 unspecified address under ::/0",
-			allow:  allowAllIPv6,
-			target: "http://[::]:8080/hook",
-		},
-	}
-}
-
 // TestGuardAllowlist_PublicUnaffected asserts the allowlist does
 // not narrow anything: public addresses were reachable before it
 // existed and stay reachable, whether or not a list is set.
@@ -544,10 +524,6 @@ func TestAlwaysBlockedNetworks_PinnedSet(t *testing.T) {
 		// Oracle Cloud Classic metadata, inside the blocked
 		// 192.0.0.0/24.
 		"192.0.0.192/32",
-		// The IPv4 and IPv6 unspecified addresses, each of
-		// which reaches this host's loopback on Linux.
-		"0.0.0.0/32",
-		"::/128",
 		// 169.254.169.254 as an IPv4-compatible IPv6 address.
 		"::a9fe:a9fe/128",
 		// 169.254.169.254 behind the NAT64 well-known prefix.
@@ -580,8 +556,7 @@ func TestDefaultBlocklist_PinnedSet(t *testing.T) {
 		{cidr: "172.16.0.0/12", reopenable: true},
 		{cidr: "192.168.0.0/16", reopenable: true},
 		{cidr: linkLocalIPv4, reopenable: false},
-		// Its first address, 0.0.0.0, is in the unconditional set.
+		{cidr: "0.0.0.0/8", reopenable: true},
-		{cidr: "0.0.0.0/8", reopenable: false},
 		{cidr: "100.64.0.0/10", reopenable: true},
 		{cidr: "192.0.0.0/24", reopenable: true},
 		{cidr: "192.0.2.0/24", reopenable: true},
@@ -591,11 +566,8 @@ func TestDefaultBlocklist_PinnedSet(t *testing.T) {
 		{cidr: "224.0.0.0/4", reopenable: true},
 		{cidr: "240.0.0.0/4", reopenable: true},
 		{cidr: "::1/128", reopenable: true},
-		{cidr: "::/128", reopenable: false},
 		{cidr: "fc00::/7", reopenable: true},
 		{cidr: "fe80::/10", reopenable: false},
-		{cidr: "ff00::/8", reopenable: true},
-		{cidr: "2001:db8::/32", reopenable: true},
 		{cidr: "168.63.129.16/32", public: true, reopenable: true},
 	}
 

internal/delivery/ssrf_test.go

@@ -101,42 +101,6 @@ func TestValidateTargetURL_Blocked(t *testing.T) {
 	}
 }
 
-// TestDefaultGuard_RefusesUnspecifiedMulticastAndDocumentation
-// covers the unspecified addresses and the IPv6 multicast and
-// documentation ranges: with no allowlist set, each is refused
-// both when a target is created and when a delivery dials it.
-func TestDefaultGuard_RefusesUnspecifiedMulticastAndDocumentation(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	guard := delivery.NewTestGuard()
-
-	targets := []string{
-		// The unspecified addresses. On Linux a connection to
-		// either reaches this host's loopback.
-		"http://0.0.0.0:8080/hook",
-		"http://[::]:8080/hook",
-		// IPv6 multicast, all nodes.
-		"http://[ff02::1]/hook",
-		// IPv6 documentation.
-		"http://[2001:db8::1]/hook",
-	}
-
-	for _, target := range targets {
-		t.Run(target, func(t *testing.T) {
-			t.Parallel()
-
-			require.Error(t,
-				guard.ValidateTargetURL(context.Background(), target),
-				"%s must be refused at target creation", target,
-			)
-
-			assertDialRefused(t, guard, target)
-		})
-	}
-}
-
 func TestValidateTargetURL_Allowed(t *testing.T) {
 	t.Parallel()
 

internal/delivery/target_database.go

@@ -3,7 +3,7 @@ package delivery
 import (
 	"context"
 	"fmt"
-	"strings"
+	"path/filepath"
 	"sync"
 	"time"
 
@@ -11,75 +11,22 @@ import (
 	"sneak.berlin/go/webhooker/internal/database"
 )
 
-// archiveNameMaxLen is how many characters of a webhook or target
+// databaseTarget is a no-retry target that archives the
-// name an archive file name keeps.
+// full inbound event into a per-webhook archive SQLite file,
-const archiveNameMaxLen = 40
+// separate from the per-webhook event database. The event is
-
+// already persisted in the per-webhook event DB by the time
-// databaseTarget is a no-retry target that archives the full
+// delivery runs; the database target additionally writes a
-// inbound event into the target's own archive SQLite file, separate
+// durable long-term copy into archive-{webhookID}.db and then
-// from the per-webhook event database. The event is already
+// records a single attempt whose outcome reflects whether the
-// persisted in the per-webhook event DB by the time delivery runs;
+// archive write succeeded. See archiveWriter for the
-// the database target additionally writes a durable long-term copy
+// close/reopen, auto-recreate, and expiry semantics.
-// into the file ArchiveFileName names and then records a single
-// attempt whose outcome reflects whether the archive write
-// succeeded. See archiveWriter for the close/reopen, auto-recreate,
-// and expiry semantics.
 type databaseTarget struct {
 	eng *Engine
 
-	// writers holds one archive writer per database target, keyed
-	// by target ID.
 	mu      sync.Mutex
 	writers map[string]*archiveWriter
 }
 
-// ArchiveFileName returns the file name of a database target's
-// archive: archive-WEBHOOKNAME-TARGETNAME-TARGETID.db, with both
-// names passed through archiveNamePart. The target ID keeps the
-// name unique when two targets' names come out the same.
-func ArchiveFileName(webhookName, targetName, targetID string) string {
-	return "archive-" + archiveNamePart(webhookName) + "-" +
-		archiveNamePart(targetName) + "-" + targetID + ".db"
-}
-
-// archiveNamePart makes a webhook or target name safe to put in a
-// file name. It is lowercased; ASCII letters and digits are kept,
-// every other run of characters becomes a single "-", and no "-" is
-// left at either end. It is cut to archiveNameMaxLen characters, and
-// a name with nothing left is "unnamed".
-func archiveNamePart(name string) string {
-	var b strings.Builder
-
-	dash := false
-
-	for _, r := range strings.ToLower(name) {
-		if (r < 'a' || r > 'z') && (r < '0' || r > '9') {
-			dash = b.Len() > 0
-
-			continue
-		}
-
-		if dash {
-			b.WriteByte('-')
-
-			dash = false
-		}
-
-		b.WriteRune(r)
-	}
-
-	part := b.String()
-	if len(part) > archiveNameMaxLen {
-		part = strings.TrimRight(part[:archiveNameMaxLen], "-")
-	}
-
-	if part == "" {
-		return "unnamed"
-	}
-
-	return part
-}
-
 // Deliver implements Target. It archives the event, then
 // records one successful attempt and marks the delivery
 // delivered. An archiving error fails the delivery: the
@@ -145,7 +92,7 @@ func (t *databaseTarget) Deliver(
 	)
 }
 
-// archive writes the full event as a row into the target's
+// archive writes the full event as a row into the webhook's
 // archive database, honouring the optional per-target expiry
 // parsed from the target config JSON.
 func (t *databaseTarget) archive(d *database.Delivery) error {
@@ -159,7 +106,7 @@ func (t *databaseTarget) archive(d *database.Delivery) error {
 		return err
 	}
 
-	w, err := t.writerFor(d.TargetID)
+	w, err := t.writerFor(webhookID)
 	if err != nil {
 		return err
 	}
@@ -177,31 +124,30 @@ func (t *databaseTarget) archive(d *database.Delivery) error {
 	return w.write(row, expiry)
 }
 
-// writerFor returns the archive writer for a database target,
+// writerFor returns the archiveWriter for a webhook, creating
-// creating and caching it on first use. Each target has one writer
+// and caching it on first use. Each webhook has one writer so
-// so its close/reopen debounce state is shared across concurrent
+// its close/reopen debounce state is shared across concurrent
-// deliveries, and so a rename and the idle sweep take the same lock
+// deliveries. The archive file lives beside the per-webhook
-// as its writes.
+// event database in the data directory.
 func (t *databaseTarget) writerFor(
-	targetID string,
+	webhookID string,
 ) (*archiveWriter, error) {
+	path, err := t.archivePath(webhookID)
+	if err != nil {
+		return nil, err
+	}
+
 	t.mu.Lock()
 	defer t.mu.Unlock()
 
-	w, ok := t.writers[targetID]
+	if t.writers == nil {
+		t.writers = make(map[string]*archiveWriter)
+	}
+
+	w, ok := t.writers[webhookID]
 	if !ok {
-		var err error
+		w = newArchiveWriter(path, t.eng.log)
-
+		t.writers[webhookID] = w
-		w, err = t.newWriter(targetID)
-		if err != nil {
-			return nil, err
-		}
-
-		if t.writers == nil {
-			t.writers = make(map[string]*archiveWriter)
-		}
-
-		t.writers[targetID] = w
 	}
 
 	// A delivery claims the entry: even if the idle sweep created
@@ -213,39 +159,40 @@ func (t *databaseTarget) writerFor(
 }
 
 // sweepWriterFor returns the archive writer the idle sweep should
-// prune a target's archive through, together with whether the sweep
+// prune a webhook through, together with whether the sweep itself
-// itself created the registry entry.
+// created the registry entry.
 //
 // The sweep must route its prune through the registered writer so
 // the writer's mutex orders it against concurrent writes, but it
 // must never leave a registry entry behind: a sweep that ran
-// concurrently with the target's deletion would otherwise
+// concurrently with the webhook's deletion would otherwise
 // re-create an entry that nothing will ever evict again, which is
 // exactly the leak eviction exists to prevent. An entry the sweep
 // creates is therefore marked sweep-owned and handed back to
 // releaseSweepWriter when the sweep is done.
 func (t *databaseTarget) sweepWriterFor(
-	targetID string,
+	webhookID string,
 ) (*archiveWriter, bool, error) {
-	t.mu.Lock()
+	path, err := t.archivePath(webhookID)
-	defer t.mu.Unlock()
-
-	w, ok := t.writers[targetID]
-	if ok {
-		return w, false, nil
-	}
-
-	w, err := t.newWriter(targetID)
 	if err != nil {
 		return nil, false, err
 	}
 
+	t.mu.Lock()
+	defer t.mu.Unlock()
+
 	if t.writers == nil {
 		t.writers = make(map[string]*archiveWriter)
 	}
 
+	w, ok := t.writers[webhookID]
+	if ok {
+		return w, false, nil
+	}
+
+	w = newArchiveWriter(path, t.eng.log)
 	w.sweepOwned = true
-	t.writers[targetID] = w
+	t.writers[webhookID] = w
 
 	return w, true, nil
 }
@@ -262,92 +209,57 @@ func (t *databaseTarget) sweepWriterFor(
 // delivery that adopted the writer keeps a registered, evictable
 // one.
 func (t *databaseTarget) releaseSweepWriter(
-	targetID string, w *archiveWriter,
+	webhookID string, w *archiveWriter,
 ) {
 	t.mu.Lock()
 	defer t.mu.Unlock()
 
-	cur, ok := t.writers[targetID]
+	cur, ok := t.writers[webhookID]
 	if !ok || cur != w || !cur.sweepOwned {
 		return
 	}
 
-	delete(t.writers, targetID)
+	delete(t.writers, webhookID)
 }
 
-// newWriter builds the writer for a database target's archive. The
+// archivePath returns the archive file path for a webhook: it
-// file is the one ArchivePath gives for the webhook and the target as
+// lives beside the per-webhook event database in the data
-// the main database names them now; from then on only rename changes
+// directory. It does not touch the filesystem.
-// the name the writer uses. It does not touch the archive file.
+func (t *databaseTarget) archivePath(
-func (t *databaseTarget) newWriter(
+	webhookID string,
-	targetID string,
+) (string, error) {
-) (*archiveWriter, error) {
 	if t.eng.dbManager == nil {
-		return nil, errArchiveNoDataDir
+		return "", errArchiveNoDataDir
 	}
 
-	var target database.Target
+	dir := filepath.Dir(t.eng.dbManager.DBPath(webhookID))
 
-	err := t.eng.database.DB().
+	return filepath.Join(
-		Preload("Webhook").
+		dir, fmt.Sprintf("archive-%s.db", webhookID),
-		First(&target, "id = ?", targetID).Error
+	), nil
-	if err != nil {
-		return nil, fmt.Errorf(
-			"loading database target %s: %w", targetID, err,
-		)
-	}
-
-	w := newArchiveWriter(
-		ArchivePath(t.eng.dbManager, &target.Webhook, &target),
-		t.eng.log,
-	)
-	w.webhookID = target.WebhookID
-
-	return w, nil
 }
 
-// rename moves a database target's archive file to the name for
+// evict drops a webhook's archive writer from the registry and
-// webhookName and targetName. It goes through the target's writer,
+// closes its handle, so a deleted webhook does not leave a
-// so the move holds the lock that writes and the idle sweep take,
+// writer (and an open archive handle within its debounce
-// and later writes use the new name.
+// window) alive for the process lifetime.
-//
-// The writer is created if there is none, and it stays cached. The
-// handlers rename before they save the new name, so until the save
-// the main database still has the old one; a delivery in that window
-// must find this writer rather than build one from the old name.
-func (t *databaseTarget) rename(
-	targetID, webhookName, targetName string,
-) error {
-	w, err := t.writerFor(targetID)
-	if err != nil {
-		return err
-	}
-
-	return w.rename(ArchiveFileName(webhookName, targetName, targetID))
-}
-
-// evict drops a database target's archive writer from the registry
-// and closes its handle, so a deleted target does not leave a
-// writer (and an open archive handle within its debounce window)
-// alive for the process lifetime.
 //
 // The map entry is removed under the registry lock, which is
 // then released before the handle is closed under the writer's
 // own lock: that ordering keeps the registry available to other
-// targets while an in-flight write on this one drains, and
+// webhooks while an in-flight write on this one drains, and
 // closing under the writer's lock means eviction can never race
 // a write.
 //
-// Eviction is idempotent and silent for a target with no writer,
+// Eviction is idempotent and silent for a webhook with no
-// which is the common case: only a database target that has
+// writer, which is the common case: a webhook with no database
-// received an event or been renamed has one. It never deletes the
+// target never creates one. It never deletes the archive file.
-// archive file.
+func (t *databaseTarget) evict(webhookID string) {
-func (t *databaseTarget) evict(targetID string) {
 	t.mu.Lock()
 
-	w, ok := t.writers[targetID]
+	w, ok := t.writers[webhookID]
 	if ok {
-		delete(t.writers, targetID)
+		delete(t.writers, webhookID)
 	}
 
 	t.mu.Unlock()
@@ -360,41 +272,13 @@ func (t *databaseTarget) evict(targetID string) {
 
 	t.eng.log.Info(
 		"evicted archive writer",
-		"target_id", targetID,
+		"webhook_id", webhookID,
 		"path", w.path,
 	)
 }
 
-// evictWebhook evicts, exactly as evict does, the writer of every
-// database target of a webhook.
-func (t *databaseTarget) evictWebhook(webhookID string) {
-	t.mu.Lock()
-
-	var gone []*archiveWriter
-
-	for targetID, w := range t.writers {
-		if w.webhookID == webhookID {
-			delete(t.writers, targetID)
-
-			gone = append(gone, w)
-		}
-	}
-
-	t.mu.Unlock()
-
-	for _, w := range gone {
-		w.evict()
-
-		t.eng.log.Info(
-			"evicted archive writer",
-			"webhook_id", webhookID,
-			"path", w.path,
-		)
-	}
-}
-
 // evictAll evicts every cached archive writer, exactly as evict
-// does for one target. The engine calls it at shutdown, once its
+// does for one webhook. The engine calls it at shutdown, once its
 // workers have returned. Closing the last handle on an archive
 // moves the contents of its -wal into the .db and removes the
 // -wal, so a clean stop leaves each archive as a single file.
@@ -411,25 +295,38 @@ func (t *databaseTarget) evictAll() {
 	}
 }
 
-// sweepArchive prunes one database target's archive of rows older
+// sweepWebhook prunes one webhook's archive of rows older than
-// than expiry, without requiring a write. A missing archive file is
+// expiry, without requiring a write. It returns nil (nothing to
-// left missing (see sweepExpired), so a sweep never creates an
+// do) when the archive file does not exist, so a sweep never
-// archive for a target that has never received an event.
+// creates an archive for a webhook that has a database target
+// but has never received an event.
 //
 // It also never leaves a registry entry behind: an entry it had
 // to create to reach the writer's mutex is released again once
-// the prune is done, so a sweep racing a target deletion cannot
+// the prune is done, so a sweep racing a webhook deletion cannot
 // resurrect the writer the eviction just dropped.
-func (t *databaseTarget) sweepArchive(
+func (t *databaseTarget) sweepWebhook(
-	targetID string, expiry time.Duration,
+	webhookID string, expiry time.Duration,
 ) error {
-	w, created, err := t.sweepWriterFor(targetID)
+	path, err := t.archivePath(webhookID)
+	if err != nil {
+		return err
+	}
+
+	// Check before taking a writer at all: a webhook whose
+	// archive has never been created gets no writer, no handle,
+	// and no file.
+	if !fileExists(path) {
+		return nil
+	}
+
+	w, created, err := t.sweepWriterFor(webhookID)
 	if err != nil {
 		return err
 	}
 
 	if created {
-		defer t.releaseSweepWriter(targetID, w)
+		defer t.releaseSweepWriter(webhookID, w)
 	}
 
 	return w.sweepExpired(expiry)

internal/delivery/target_database_archive.go

@@ -4,10 +4,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/fs"
 	"log/slog"
 	"os"
-	"path/filepath"
 	"sync"
 	"time"
 
@@ -43,7 +41,7 @@ const (
 
 var (
 	// errArchiveMissingWebhookID is returned when an event to
-	// archive has no webhook id to record in its archive row.
+	// archive has no webhook id to key its archive file on.
 	errArchiveMissingWebhookID = errors.New(
 		"cannot archive event without a webhook id",
 	)
@@ -63,19 +61,13 @@ var (
 	)
 
 	// errArchiveWriterEvicted is returned when a writer that has
-	// been evicted (its target or its webhook was deleted) is used
+	// been evicted (its webhook was deleted, or its last database
-	// again. An evicted writer is no longer in the registry, so
+	// target was removed) is used again. An evicted writer is no
-	// reopening its file would leak a handle nothing owns.
+	// longer in the registry, so reopening its file would leak a
+	// handle nothing owns.
 	errArchiveWriterEvicted = errors.New(
 		"archive writer has been evicted",
 	)
-
-	// ErrArchiveNameTaken is returned when an archive cannot be
-	// renamed because a file already has the new name. That file may
-	// be an archive with rows of its own, so it is never replaced.
-	ErrArchiveNameTaken = errors.New(
-		"a file already has the archive's new name",
-	)
 )
 
 // databaseTargetConfig is the optional per-target JSON config
@@ -88,7 +80,7 @@ type databaseTargetConfig struct {
 }
 
 // archivedEvent is one fully captured webhook event stored in a
-// database target's archive for long-term retention. It is a
+// per-webhook archive database for long-term retention. It is a
 // self-contained copy — independent of the per-webhook event
 // database, which may prune events under its own retention.
 type archivedEvent struct {
@@ -178,8 +170,8 @@ func ValidateArchiveExpiry(expiry string) error {
 	return nil
 }
 
-// archiveWriter owns one database target's archive SQLite file.
+// archiveWriter owns one per-webhook archive SQLite file. It
-// It serialises writes, and after each write closes and reopens
+// serialises writes, and after each write closes and reopens
 // the file (debounced to at most once per debounce window) so
 // an operator can move the file away for offline archiving. The
 // next write recreates a moved or removed file, because the
@@ -194,26 +186,17 @@ type archiveWriter struct {
 	lastReopen time.Time
 	reopens    int
 
-	// now is the clock the reopen debounce is measured on. It is
-	// time.Now outside tests.
-	now func() time.Time
-
 	// evicted marks a writer that has been removed from the
-	// registry. Its handle is closed and it must never open the
+	// per-webhook registry. Its handle is closed and it must
-	// file again: nothing holds it any more, so a reopen would
+	// never open the file again: nothing holds it any more, so a
-	// leak the handle for the process lifetime.
+	// reopen would leak the handle for the process lifetime.
 	evicted bool
 
-	// webhookID is the webhook the archive's target belongs to,
-	// so deleting the webhook can find its writers. It is set
-	// when the writer is created and never changes.
-	webhookID string
-
 	// sweepOwned marks a registry entry that the idle sweep
-	// created because no writer was cached for the target. The
+	// created because no writer was cached for the webhook. The
 	// sweep removes such an entry again when it is done, so a
 	// sweep can never leave — or resurrect — a registry entry
-	// for a target that has been deleted. A delivery that adopts
+	// for a webhook that has been deleted. A delivery that adopts
 	// the writer clears the flag, handing the entry to the
 	// registry proper.
 	//
@@ -232,7 +215,6 @@ func newArchiveWriter(
 		path:     path,
 		log:      log,
 		debounce: archiveReopenDebounce,
-		now:      time.Now,
 	}
 }
 
@@ -268,7 +250,7 @@ func (w *archiveWriter) write(
 		)
 	}
 
-	if w.now().Sub(w.lastReopen) >= w.debounce {
+	if time.Since(w.lastReopen) >= w.debounce {
 		return w.reopen(expiry)
 	}
 
@@ -328,7 +310,7 @@ func (w *archiveWriter) openMode(
 	}
 
 	w.db = gdb
-	w.lastReopen = w.now()
+	w.lastReopen = time.Now()
 	w.reopens++
 
 	if expiry > 0 {
@@ -403,78 +385,11 @@ func (w *archiveWriter) sweepExpired(expiry time.Duration) error {
 	return nil
 }
 
-// rename gives the archive file a new name in the same directory,
-// and the writer uses the file under that name from now on. The
-// handle is closed first, which folds the -wal into the .db; any
-// -wal or -shm still beside the file (left by a crash) is moved with
-// it, because SQLite finds them by name. A missing file is not an
-// error: the operator may have moved it away, and the next write
-// creates it under the new name.
-//
-// If a file already has the new name, nothing is moved and the
-// error is ErrArchiveNameTaken. If one file fails to move, those
-// already moved are moved back before the error is returned, so the
-// archive is never split across two names.
-func (w *archiveWriter) rename(name string) error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-
-	if w.evicted {
-		return fmt.Errorf(
-			"%w: %s", errArchiveWriterEvicted, w.path,
-		)
-	}
-
-	path := filepath.Join(filepath.Dir(w.path), name)
-	if path == w.path {
-		return nil
-	}
-
-	suffixes := []string{"", "-wal", "-shm"}
-
-	for _, suffix := range suffixes {
-		if fileExists(path + suffix) {
-			return fmt.Errorf(
-				"%w: %s", ErrArchiveNameTaken, name+suffix,
-			)
-		}
-	}
-
-	w.close()
-
-	for i, suffix := range suffixes {
-		err := os.Rename(w.path+suffix, path+suffix)
-		if err == nil || errors.Is(err, fs.ErrNotExist) {
-			continue
-		}
-
-		for _, moved := range suffixes[:i] {
-			backErr := os.Rename(path+moved, w.path+moved)
-			if backErr != nil && !errors.Is(backErr, fs.ErrNotExist) {
-				w.log.Error(
-					"failed to move archive file back",
-					"from", path+moved,
-					"to", w.path+moved,
-					"error", backErr,
-				)
-			}
-		}
-
-		return fmt.Errorf(
-			"renaming archive %s to %s: %w", w.path+suffix, path+suffix, err,
-		)
-	}
-
-	w.path = path
-
-	return nil
-}
-
 // evict closes the writer's handle and marks it unusable. It is
-// called when the writer leaves the registry, because its target
+// called when the writer leaves the registry, either because the
-// or its webhook was deleted, or at shutdown. The archive FILE is
+// webhook was deleted or because its last database target was
-// deliberately left on disk: it is long-term storage an operator
+// removed. The archive FILE is deliberately left on disk: it is
-// may still want.
+// long-term storage an operator may still want.
 func (w *archiveWriter) evict() {
 	w.mu.Lock()
 	defer w.mu.Unlock()

internal/delivery/target_database_evict_test.go

@@ -17,109 +17,85 @@ import (
 	"sneak.berlin/go/webhooker/internal/delivery"
 )
 
-// deliverTo archives one event to a database target, leaving the
+// evictTestEngine builds an engine backed by a temporary data
-// target's writer cached with its handle open.
+// directory and returns it along with that directory.
-func deliverTo(
+func evictTestEngine(t *testing.T) (*delivery.Engine, string) {
-	t *testing.T, env *archiveEnv, tgt *database.Target,
-) {
 	t.Helper()
 
-	webhookDB := testWebhookDB(t)
+	dataDir := t.TempDir()
-	event := seedEvent(t, webhookDB, `{"archived":true}`)
 
-	env.eng.ExportDeliverDatabase(
+	eng := delivery.NewTestEngineWithDB(
-		webhookDB, seedDatabaseTargetDelivery(t, webhookDB, event, tgt),
+		nil,
+		database.NewTestWebhookDBManager(dataDir),
+		archiveTestLogger(),
+		&http.Client{Timeout: 5 * time.Second},
+		1,
 	)
+
+	return eng, dataDir
 }
 
 // TestEvictWebhook_ClosesAndRemovesWriter proves that evicting
-// a webhook drops the archive writers of its database targets
+// a webhook drops its archive writer from the registry and
-// from the registry and closes their open handles, rather than
+// closes the open archive handle, rather than leaving both
-// leaving them alive for the process lifetime, and leaves another
+// alive for the process lifetime.
-// webhook's writer alone.
 func TestEvictWebhook_ClosesAndRemovesWriter(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	eng, dataDir := evictTestEngine(t)
-	first := env.seedDatabaseTarget(t, "")
-	second := env.addDatabaseTarget(t, first.WebhookID, "")
-	other := env.seedDatabaseTarget(t, "")
 
-	for _, tgt := range []*database.Target{first, second, other} {
+	webhookDB := testWebhookDB(t)
-		deliverTo(t, env, tgt)
+	event := seedEvent(t, webhookDB, `{"archived":true}`)
+	d := seedDatabaseTargetDelivery(t, webhookDB, event, "")
 
-		require.True(
+	eng.ExportDeliverDatabase(webhookDB, d)
-			t, env.eng.ExportArchiveHandleOpen(tgt.ID),
-			"the writer should hold an open handle after a write",
-		)
-	}
 
-	env.eng.EvictWebhook(first.WebhookID)
+	webhookID := event.WebhookID
 
-	for _, tgt := range []*database.Target{first, second} {
+	require.True(
-		assert.False(
+		t, eng.ExportHasArchiveWriter(webhookID),
-			t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		"a delivery should have cached an archive writer",
-			"eviction should remove the registry entry",
+	)
-		)
+	require.True(
-		assert.False(
+		t, eng.ExportArchiveHandleOpen(webhookID),
-			t, env.eng.ExportArchiveHandleOpen(tgt.ID),
+		"the writer should hold an open handle after a write",
-			"eviction should close the archive handle",
-		)
-		assert.FileExists(
-			t, env.archivePath(tgt),
-			"eviction must not delete the archive file",
-		)
-	}
-
-	assert.True(
-		t, env.eng.ExportArchiveHandleOpen(other.ID),
-		"another webhook's writer must be left alone",
 	)
-}
 
-// TestEvictTarget_LeavesOtherTargets proves that evicting one
+	eng.EvictWebhook(webhookID)
-// database target leaves the writer of another target of the same
-// webhook in place.
-func TestEvictTarget_LeavesOtherTargets(t *testing.T) {
-	t.Parallel()
 
-	env := setupArchiveTest(t)
+	assert.False(
-	doomed := env.seedDatabaseTarget(t, "")
+		t, eng.ExportHasArchiveWriter(webhookID),
-	kept := env.addDatabaseTarget(t, doomed.WebhookID, "")
+		"eviction should remove the registry entry",
+	)
+	assert.False(
+		t, eng.ExportArchiveHandleOpen(webhookID),
+		"eviction should close the archive handle",
+	)
 
-	deliverTo(t, env, doomed)
+	archivePath := filepath.Join(
-	deliverTo(t, env, kept)
+		dataDir, fmt.Sprintf("archive-%s.db", webhookID),
-
+	)
-	env.eng.EvictTarget(doomed.ID)
-
-	assert.False(t, env.eng.ExportHasArchiveWriter(doomed.ID))
 	assert.FileExists(
-		t, env.archivePath(doomed),
+		t, archivePath,
 		"eviction must not delete the archive file",
 	)
-	assert.True(
-		t, env.eng.ExportArchiveHandleOpen(kept.ID),
-		"the other target's writer must be left alone",
-	)
 }
 
 // TestEvictWebhook_UnknownWebhookIsNoOp proves eviction is safe
-// for the common case of a webhook or target that never had an
+// for the common case of a webhook that never had a database
-// archive writer, and that repeating it does not panic.
+// target, and that repeating it does not panic.
 func TestEvictWebhook_UnknownWebhookIsNoOp(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	eng, _ := evictTestEngine(t)
 
 	assert.NotPanics(t, func() {
-		env.eng.EvictWebhook("no-such-webhook")
+		eng.EvictWebhook("no-such-webhook")
-		env.eng.EvictWebhook("no-such-webhook")
+		eng.EvictWebhook("no-such-webhook")
-		env.eng.EvictTarget("no-such-target")
-		env.eng.EvictTarget("no-such-target")
 	})
 
 	assert.False(
-		t, env.eng.ExportHasArchiveWriter("no-such-target"),
+		t, eng.ExportHasArchiveWriter("no-such-webhook"),
 		"eviction must not create a writer",
 	)
 }
@@ -313,14 +289,17 @@ func TestEvictWebhook_RacingWriteDoesNotReopenHandle(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	eng, _ := evictTestEngine(t)
-	tgt := env.seedDatabaseTarget(t, "")
+
+	webhookDB := testWebhookDB(t)
+	event := seedEvent(t, webhookDB, `{"archived":true}`)
+	d := seedDatabaseTargetDelivery(t, webhookDB, event, "")
 
 	// Prime the registry so the test can hold the very writer the
 	// eviction is about to detach.
-	deliverTo(t, env, tgt)
+	eng.ExportDeliverDatabase(webhookDB, d)
 
-	w := env.eng.ExportArchiveWriterFor(tgt.ID)
+	w := eng.ExportArchiveWriterFor(event.WebhookID)
 	require.NotNil(t, w)
 	require.True(t, w.HandleOpen())
 
@@ -330,7 +309,7 @@ func TestEvictWebhook_RacingWriteDoesNotReopenHandle(
 	// eviction has to contend for the writer's mutex.
 	race.awaitFirstWrite()
 
-	env.eng.EvictWebhook(tgt.WebhookID)
+	eng.EvictWebhook(event.WebhookID)
 
 	sawEvicted, otherErr := race.wait()
 
@@ -345,33 +324,41 @@ func TestEvictWebhook_RacingWriteDoesNotReopenHandle(
 			"been evicted",
 	)
 	assert.False(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, eng.ExportHasArchiveWriter(event.WebhookID),
 		"the registry entry must stay gone",
 	)
 }
 
 // TestEvictWebhook_LaterDeliveryRecreatesWriter proves eviction
-// does not break archiving for a target that is still alive: a
+// does not break archiving for a webhook that is still alive: a
 // subsequent delivery gets a brand new writer from the registry.
 // It says nothing about the evicted writer itself — that is what
 // TestEvictedWriter_WriteDoesNotReopenFile covers.
 func TestEvictWebhook_LaterDeliveryRecreatesWriter(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	eng, _ := evictTestEngine(t)
-	tgt := env.seedDatabaseTarget(t, "")
 
-	deliverTo(t, env, tgt)
+	webhookDB := testWebhookDB(t)
-	require.True(t, env.eng.ExportHasArchiveWriter(tgt.ID))
+	event := seedEvent(t, webhookDB, `{"archived":true}`)
+	d := seedDatabaseTargetDelivery(t, webhookDB, event, "")
 
-	env.eng.EvictWebhook(tgt.WebhookID)
+	eng.ExportDeliverDatabase(webhookDB, d)
+	require.True(
+		t, eng.ExportHasArchiveWriter(event.WebhookID),
+	)
 
-	// A fresh delivery for the same target gets a brand new
+	eng.EvictWebhook(event.WebhookID)
+
+	// A fresh delivery for the same webhook gets a brand new
 	// writer from the registry, so archiving keeps working.
-	deliverTo(t, env, tgt)
+	second := seedDatabaseTargetDelivery(
+		t, webhookDB, event, "",
+	)
+	eng.ExportDeliverDatabase(webhookDB, second)
 
 	assert.True(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, eng.ExportHasArchiveWriter(event.WebhookID),
 		"a later delivery should recreate the writer",
 	)
 }
@@ -383,16 +370,19 @@ func TestEvictWebhook_LaterDeliveryRecreatesWriter(t *testing.T) {
 func TestEngineStop_WriteAfterStopIsRefused(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	eng, _ := evictTestEngine(t)
-	tgt := env.seedDatabaseTarget(t, "")
 
-	deliverTo(t, env, tgt)
+	webhookDB := testWebhookDB(t)
+	event := seedEvent(t, webhookDB, `{"archived":true}`)
+	d := seedDatabaseTargetDelivery(t, webhookDB, event, "")
 
-	w := env.eng.ExportArchiveWriterFor(tgt.ID)
+	eng.ExportDeliverDatabase(webhookDB, d)
+
+	w := eng.ExportArchiveWriterFor(event.WebhookID)
 	require.NotNil(t, w)
 	require.True(t, w.HandleOpen())
 
-	require.NoError(t, env.eng.ExportStop(context.Background()))
+	require.NoError(t, eng.ExportStop(context.Background()))
 
 	err := w.Write(evictTestRow("ev-after-stop"), 0)
 
@@ -405,7 +395,7 @@ func TestEngineStop_WriteAfterStopIsRefused(t *testing.T) {
 		"a refused write must not reopen the archive",
 	)
 	assert.False(
-		t, env.eng.ExportHasArchiveWriter(tgt.ID),
+		t, eng.ExportHasArchiveWriter(event.WebhookID),
 		"the stop should empty the registry",
 	)
 

internal/delivery/target_database_export.go

@@ -1,275 +0,0 @@
-package delivery
-
-import (
-	"compress/gzip"
-	"context"
-	"database/sql"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"log/slog"
-	"path/filepath"
-	"time"
-	"unicode/utf8"
-
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/gormlog"
-)
-
-// archiveTableQuery counts the archive's table: 0 when the archive
-// writer has created the file but not yet the table in it.
-const archiveTableQuery = "SELECT count(*) FROM sqlite_master " +
-	"WHERE type = 'table' AND name = 'archived_events'"
-
-// ArchivePath returns where a database target's archive file is: in
-// the data directory, beside the webhook's event database, under the
-// name ArchiveFileName gives it.
-func ArchivePath(
-	dbMgr *database.WebhookDBManager,
-	webhook *database.Webhook,
-	target *database.Target,
-) string {
-	return filepath.Join(
-		filepath.Dir(dbMgr.DBPath(webhook.ID)),
-		ArchiveFileName(webhook.Name, target.Name, target.ID),
-	)
-}
-
-// ArchiveExportFileName returns the name a database target's archive
-// downloads under:
-// archive-WEBHOOKNAME-TARGETNAME-YYYYMMDDTHHMMSSZ.json.gz, the names
-// made safe as in ArchiveFileName and the time in UTC.
-func ArchiveExportFileName(
-	webhookName, targetName string, at time.Time,
-) string {
-	return "archive-" + archiveNamePart(webhookName) + "-" +
-		archiveNamePart(targetName) + "-" +
-		at.UTC().Format("20060102T150405Z") + ".json.gz"
-}
-
-// ArchiveExport is a database target's archive opened for download.
-// It reads the file on its own connection, inside one read-only
-// transaction, so it writes out the archive as it stood when
-// OpenArchiveExport returned.
-//
-// Archives are in WAL mode, where a reader works from a snapshot and
-// never blocks a writer: archive writes go on while an export is open,
-// and the export does not see them. SQLite cannot checkpoint the -wal
-// past an open snapshot, so the -wal grows until the export is closed.
-type ArchiveExport struct {
-	db *sql.DB
-	tx *gorm.DB
-
-	// empty is true when there is nothing to read: no file, or a file
-	// without the archive's table yet.
-	empty bool
-}
-
-// exportedName is how an export names its webhook and its target.
-type exportedName struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
-}
-
-// OpenArchiveExport opens the archive file at path for export and
-// takes the snapshot the export reads. It never creates the file: with
-// no file at path, the export has no rows.
-//
-// Once it has returned, the file is open, so a rename or a move of it
-// does not affect the export, which reads the same file under its new
-// name.
-//
-// The transaction lasts as long as ctx does, so ctx must last for the
-// whole export.
-func OpenArchiveExport(
-	ctx context.Context, path string, log *slog.Logger,
-) (*ArchiveExport, error) {
-	if !fileExists(path) {
-		return &ArchiveExport{empty: true}, nil
-	}
-
-	db, err := database.OpenSQLite(path, archiveModeExisting)
-	if err != nil {
-		return nil, fmt.Errorf("opening archive %s: %w", path, err)
-	}
-
-	gdb, err := gorm.Open(
-		sqlite.Dialector{Conn: db}, &gorm.Config{
-			// Never leave this at GORM's default. See
-			// internal/gormlog.
-			Logger: gormlog.New(log),
-		},
-	)
-	if err != nil {
-		_ = db.Close()
-
-		return nil, fmt.Errorf("opening archive %s: %w", path, err)
-	}
-
-	// ReadOnly makes the driver begin a deferred transaction in place
-	// of the BEGIN IMMEDIATE the connection string asks for, so the
-	// export never takes the archive's write lock.
-	tx := gdb.WithContext(ctx).Begin(&sql.TxOptions{ReadOnly: true})
-	if tx.Error != nil {
-		_ = db.Close()
-
-		return nil, fmt.Errorf("reading archive %s: %w", path, tx.Error)
-	}
-
-	// The transaction's first read is what takes the snapshot.
-	var tables int
-
-	err = tx.Raw(archiveTableQuery).Row().Scan(&tables)
-	if err != nil {
-		_ = tx.Rollback()
-		_ = db.Close()
-
-		return nil, fmt.Errorf("reading archive %s: %w", path, err)
-	}
-
-	return &ArchiveExport{db: db, tx: tx, empty: tables == 0}, nil
-}
-
-// WriteGzipJSON writes the export to w as one gzipped JSON object:
-// webhook and target, each an id and a name; exported_at; and
-// archived_events, one object per archived row, keyed by column name.
-// A body that is not valid UTF-8 cannot be a JSON string, so it is
-// written in base64, with "body_encoding": "base64" beside it.
-//
-// Each row is written out before the next is read, so neither the
-// archive nor its JSON is ever held in memory whole. After an error
-// the gzip stream is left unfinished, so what was written does not
-// decompress as a whole file.
-func (x *ArchiveExport) WriteGzipJSON(
-	ctx context.Context,
-	w io.Writer,
-	webhook *database.Webhook,
-	target *database.Target,
-	exportedAt time.Time,
-) error {
-	head, err := json.Marshal(map[string]any{
-		"webhook":     exportedName{ID: webhook.ID, Name: webhook.Name},
-		"target":      exportedName{ID: target.ID, Name: target.Name},
-		"exported_at": exportedAt.UTC(),
-	})
-	if err != nil {
-		return fmt.Errorf("encoding archive export: %w", err)
-	}
-
-	zw := gzip.NewWriter(w)
-
-	err = x.writeJSON(ctx, zw, head)
-	if err != nil {
-		return fmt.Errorf("writing archive export: %w", err)
-	}
-
-	return zw.Close()
-}
-
-// Close ends the export's transaction and closes its connection.
-func (x *ArchiveExport) Close() error {
-	if x.db == nil {
-		return nil
-	}
-
-	_ = x.tx.Rollback()
-
-	return x.db.Close()
-}
-
-// writeJSON writes head with archived_events added as its last key,
-// the rows going into it one at a time.
-func (x *ArchiveExport) writeJSON(
-	ctx context.Context, w io.Writer, head []byte,
-) error {
-	// head goes out without its closing brace, so that
-	// archived_events can follow it.
-	_, err := w.Write(head[:len(head)-1])
-	if err != nil {
-		return err
-	}
-
-	_, err = io.WriteString(w, `,"archived_events":[`)
-	if err != nil {
-		return err
-	}
-
-	err = x.writeRows(ctx, w)
-	if err != nil {
-		return err
-	}
-
-	_, err = io.WriteString(w, "\n]}\n")
-
-	return err
-}
-
-// writeRows writes each archived row to w, oldest first, one per line,
-// separated by commas.
-func (x *ArchiveExport) writeRows(ctx context.Context, w io.Writer) error {
-	if x.empty {
-		return nil
-	}
-
-	rows, err := x.tx.WithContext(ctx).
-		Model(&archivedEvent{}).Order("id").Rows()
-	if err != nil {
-		return err
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	for sep := "\n"; rows.Next(); sep = ",\n" {
-		var ev archivedEvent
-
-		err = x.tx.ScanRows(rows, &ev)
-		if err != nil {
-			return err
-		}
-
-		_, err = io.WriteString(w, sep)
-		if err != nil {
-			return err
-		}
-
-		err = writeRow(w, &ev)
-		if err != nil {
-			return err
-		}
-	}
-
-	return rows.Err()
-}
-
-// writeRow writes an archived row to w as a JSON object keyed by
-// column name, its body in base64 when it is not valid UTF-8.
-func writeRow(w io.Writer, ev *archivedEvent) error {
-	row := map[string]any{
-		"id":            ev.ID,
-		"event_id":      ev.EventID,
-		"webhook_id":    ev.WebhookID,
-		"entrypoint_id": ev.EntrypointID,
-		"method":        ev.Method,
-		"headers":       ev.Headers,
-		"body":          ev.Body,
-		"content_type":  ev.ContentType,
-		"archived_at":   ev.ArchivedAt.UTC(),
-	}
-
-	if !utf8.ValidString(ev.Body) {
-		row["body"] = base64.StdEncoding.EncodeToString([]byte(ev.Body))
-		row["body_encoding"] = "base64"
-	}
-
-	line, err := json.Marshal(row)
-	if err != nil {
-		return err
-	}
-
-	_, err = w.Write(line)
-
-	return err
-}

internal/delivery/target_database_export_test.go

@@ -1,412 +0,0 @@
-package delivery_test
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"crypto/rand"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
-)
-
-// The webhook and the target the export tests' archives belong to.
-const (
-	exportWebhookID   = "wh-export"
-	exportWebhookName = "Orders (EU)"
-	exportTargetID    = "tgt-export"
-	exportTargetName  = "Long-term archive"
-)
-
-const (
-	// binaryBody is a body that is not valid UTF-8.
-	binaryBody = "\xff\xfe\x00\x01binary\x80"
-
-	// openedEventID is the event the snapshot tests archive before
-	// they open the export.
-	openedEventID = "opened"
-)
-
-// writeExportTo writes export to w as the archive of the export tests'
-// webhook and target, exported at 2026-10-02T12:03:04Z.
-func writeExportTo(
-	t *testing.T, export *delivery.ArchiveExport, w io.Writer,
-) error {
-	t.Helper()
-
-	return export.WriteGzipJSON(
-		t.Context(), w,
-		&database.Webhook{
-			BaseModel: database.BaseModel{ID: exportWebhookID},
-			Name:      exportWebhookName,
-		},
-		&database.Target{
-			BaseModel: database.BaseModel{ID: exportTargetID},
-			Name:      exportTargetName,
-		},
-		time.Date(2026, 10, 2, 12, 3, 4, 0, time.UTC),
-	)
-}
-
-// exportArchive runs a whole export of the archive at path and returns
-// its JSON, decompressed and parsed.
-func exportArchive(t *testing.T, path string) map[string]any {
-	t.Helper()
-
-	export, err := delivery.OpenArchiveExport(
-		t.Context(), path, archiveTestLogger(),
-	)
-	require.NoError(t, err)
-
-	defer func() { require.NoError(t, export.Close()) }()
-
-	return writeExport(t, export)
-}
-
-// writeExport writes an opened export and returns its JSON,
-// decompressed and parsed. Reading to the end makes the gzip reader
-// check that the stream was finished.
-func writeExport(
-	t *testing.T, export *delivery.ArchiveExport,
-) map[string]any {
-	t.Helper()
-
-	var buf bytes.Buffer
-
-	require.NoError(t, writeExportTo(t, export, &buf))
-
-	zr, err := gzip.NewReader(&buf)
-	require.NoError(t, err)
-
-	raw, err := io.ReadAll(zr)
-	require.NoError(t, err)
-
-	var got map[string]any
-
-	require.NoError(t, json.Unmarshal(raw, &got))
-
-	return got
-}
-
-// exportedEvents returns an export's archived_events.
-func exportedEvents(t *testing.T, got map[string]any) []map[string]any {
-	t.Helper()
-
-	list, ok := got["archived_events"].([]any)
-	require.True(t, ok, "archived_events must be an array: %v", got)
-
-	events := make([]map[string]any, len(list))
-
-	for i, v := range list {
-		events[i], ok = v.(map[string]any)
-		require.True(t, ok, "an archived event must be an object: %v", v)
-	}
-
-	return events
-}
-
-// exportedEventIDs returns the event_id of each of an export's
-// archived_events.
-func exportedEventIDs(t *testing.T, got map[string]any) []string {
-	t.Helper()
-
-	events := exportedEvents(t, got)
-	ids := make([]string, 0, len(events))
-
-	for _, ev := range events {
-		ids = append(ids, fmt.Sprint(ev["event_id"]))
-	}
-
-	return ids
-}
-
-// TestArchiveExport_MatchesStoredRows proves an export holds the
-// webhook, the target, the time, and every column of every stored
-// row: a body that is valid UTF-8 as a string, and one that is not in
-// base64, marked as such.
-func TestArchiveExport_MatchesStoredRows(t *testing.T) {
-	t.Parallel()
-
-	path := filepath.Join(t.TempDir(), "archive.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-	bodies := []string{`{"order":1}`, "plain text", "", binaryBody}
-
-	for i, body := range bodies {
-		require.NoError(t, w.Write(delivery.ExportArchivedEvent{
-			EventID:      fmt.Sprintf("ev-%d", i),
-			WebhookID:    exportWebhookID,
-			EntrypointID: "ep-1",
-			Method:       "POST",
-			Headers:      `{"X-Test":["yes"]}`,
-			Body:         body,
-			ContentType:  testContentType,
-		}, 0))
-	}
-
-	var stored []delivery.ExportArchivedEvent
-
-	require.NoError(t, openArchiveDBForRead(t, path).
-		Order("id").Find(&stored).Error)
-
-	got := exportArchive(t, path)
-
-	assert.Equal(t,
-		map[string]any{"id": exportWebhookID, "name": exportWebhookName},
-		got["webhook"],
-	)
-	assert.Equal(t,
-		map[string]any{"id": exportTargetID, "name": exportTargetName},
-		got["target"],
-	)
-	assert.Equal(t, "2026-10-02T12:03:04Z", got["exported_at"])
-
-	events := exportedEvents(t, got)
-	require.Len(t, events, len(bodies))
-
-	for i, row := range stored {
-		assertExportedRow(t, row, events[i])
-	}
-}
-
-// assertExportedRow checks that ev, from an export, holds every column
-// of the stored row.
-func assertExportedRow(
-	t *testing.T, row delivery.ExportArchivedEvent, ev map[string]any,
-) {
-	t.Helper()
-
-	archivedAt, err := time.Parse(
-		time.RFC3339Nano, fmt.Sprint(ev["archived_at"]),
-	)
-	require.NoError(t, err)
-	assert.True(t, archivedAt.Equal(row.ArchivedAt))
-
-	assert.EqualValues(t, row.ID, ev["id"])
-	assert.Equal(t, row.EventID, ev["event_id"])
-	assert.Equal(t, row.WebhookID, ev["webhook_id"])
-	assert.Equal(t, row.EntrypointID, ev["entrypoint_id"])
-	assert.Equal(t, row.Method, ev["method"])
-	assert.Equal(t, row.Headers, ev["headers"])
-	assert.Equal(t, row.ContentType, ev["content_type"])
-
-	if row.Body != binaryBody {
-		assert.Equal(t, row.Body, ev["body"])
-		assert.Len(t, ev, 9, "the nine columns and nothing else: %v", ev)
-
-		return
-	}
-
-	body, err := base64.StdEncoding.DecodeString(fmt.Sprint(ev["body"]))
-	require.NoError(t, err)
-	assert.Equal(t, binaryBody, string(body))
-	assert.Equal(t, "base64", ev["body_encoding"])
-	assert.Len(t, ev, 10, "the nine columns and body_encoding: %v", ev)
-}
-
-// TestArchiveExport_Empty proves an archive with nothing in it exports
-// as an empty archived_events: no file, which the export must not
-// create; a file the archive writer has not yet put its table in; and
-// a table with no rows.
-func TestArchiveExport_Empty(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	missing := filepath.Join(dir, "missing.db")
-	noTable := filepath.Join(dir, "no-table.db")
-	noRows := filepath.Join(dir, "no-rows.db")
-
-	require.NoError(t, os.WriteFile(noTable, nil, 0o600))
-	require.NoError(t,
-		delivery.NewExportArchiveWriter(noRows, archiveTestLogger(), 0).
-			Open(0),
-	)
-
-	for _, path := range []string{missing, noTable, noRows} {
-		assert.Empty(t, exportedEvents(t, exportArchive(t, path)), path)
-	}
-
-	for _, suffix := range archiveFileSuffixes() {
-		assert.NoFileExists(t, missing+suffix)
-	}
-}
-
-// TestArchiveExport_ReadsOneSnapshot proves an export writes the
-// archive as it was when it was opened, and holds up no archive
-// write: a row written while the export is open is stored, and is not
-// in the export. A write held up for the whole busy timeout would
-// fail.
-func TestArchiveExport_ReadsOneSnapshot(t *testing.T) {
-	t.Parallel()
-
-	path := filepath.Join(t.TempDir(), "archive.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-
-	require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: openedEventID}, 0))
-
-	export, err := delivery.OpenArchiveExport(
-		t.Context(), path, archiveTestLogger(),
-	)
-	require.NoError(t, err)
-
-	defer func() { require.NoError(t, export.Close()) }()
-
-	require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: "during"}, 0))
-
-	assert.Equal(t,
-		[]string{openedEventID}, exportedEventIDs(t, writeExport(t, export)),
-	)
-
-	var stored int64
-
-	require.NoError(t, openArchiveDBForRead(t, path).
-		Model(&delivery.ExportArchivedEvent{}).Count(&stored).Error)
-	assert.Equal(t, int64(2), stored)
-}
-
-// TestArchiveExport_SurvivesRename proves that renaming the archive
-// while an export of it is open, as renaming its webhook or target
-// does, leaves the export reading the same file.
-func TestArchiveExport_SurvivesRename(t *testing.T) {
-	t.Parallel()
-
-	path := filepath.Join(t.TempDir(), "archive-old.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-
-	require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: openedEventID}, 0))
-
-	export, err := delivery.OpenArchiveExport(
-		t.Context(), path, archiveTestLogger(),
-	)
-	require.NoError(t, err)
-
-	defer func() { require.NoError(t, export.Close()) }()
-
-	require.NoError(t, w.Rename("archive-new.db"))
-	require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: "after"}, 0))
-	require.NoFileExists(t, path)
-
-	assert.Equal(t,
-		[]string{openedEventID}, exportedEventIDs(t, writeExport(t, export)),
-	)
-}
-
-// heapPeak is an io.Writer that discards what it is given and records
-// the largest heap it saw at a write. It collects garbage before each
-// reading, so the heap it reads is what is still held.
-type heapPeak struct {
-	max uint64
-}
-
-func (p *heapPeak) Write(b []byte) (int, error) {
-	var m runtime.MemStats
-
-	runtime.GC()
-	runtime.ReadMemStats(&m)
-	p.max = max(p.max, m.HeapAlloc)
-
-	return len(b), nil
-}
-
-// exportHeapGrowth exports an archive of rows random bodies, each
-// bodySize bytes of base64, and returns how far the heap rose above
-// where it stood when the export began, at its highest.
-func exportHeapGrowth(t *testing.T, rows, bodySize int) uint64 {
-	t.Helper()
-
-	path := filepath.Join(t.TempDir(), "archive.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-
-	// Base64 makes four characters of every three bytes.
-	random := make([]byte, bodySize/4*3)
-
-	for range rows {
-		_, _ = rand.Read(random)
-
-		require.NoError(t, w.Write(delivery.ExportArchivedEvent{
-			Body: base64.StdEncoding.EncodeToString(random),
-		}, 0))
-	}
-
-	export, err := delivery.OpenArchiveExport(
-		t.Context(), path, archiveTestLogger(),
-	)
-	require.NoError(t, err)
-
-	defer func() { require.NoError(t, export.Close()) }()
-
-	runtime.GC()
-
-	var start runtime.MemStats
-
-	runtime.ReadMemStats(&start)
-
-	// Through a buffer, the heap is read once per 8 KiB of output
-	// rather than at each of gzip's small writes, which takes far
-	// longer.
-	peak := &heapPeak{max: start.HeapAlloc}
-	buffered := bufio.NewWriterSize(peak, 8<<10)
-
-	require.NoError(t, writeExportTo(t, export, buffered))
-	require.NoError(t, buffered.Flush())
-
-	return peak.max - start.HeapAlloc
-}
-
-// TestArchiveExport_Streams proves an export holds neither the archive
-// nor its output in memory whole: exporting 384 KiB more of archive
-// raises the heap's peak by less than half of that. The export's own
-// memory, mostly gzip's compressor, is the same for both archives, so
-// it cancels out. The bodies are random bytes in base64, which gzip
-// shrinks by only a quarter, so an export that read every row before
-// writing, or built the JSON or the gzipped file before writing it,
-// would raise the peak by at least three quarters of the difference.
-//
-// The smaller archive has two rows so that its export, too, writes
-// out more than the 8 KiB buffer in exportHeapGrowth before it ends:
-// the heap must be read while the export's own memory is held.
-//
-//nolint:paralleltest // It measures the heap, which tests share.
-func TestArchiveExport_Streams(t *testing.T) {
-	const (
-		bodySize  = 16 << 10
-		smallRows = 2
-		largeRows = smallRows + 24
-		limit     = (largeRows - smallRows) * bodySize / 2
-	)
-
-	small := exportHeapGrowth(t, smallRows, bodySize)
-	large := exportHeapGrowth(t, largeRows, bodySize)
-
-	assert.Less(t, large, small+limit,
-		"the heap rose by %d for %d rows and by %d for %d rows",
-		small, smallRows, large, largeRows,
-	)
-}
-
-// TestArchiveExportFileName proves the download is named for the
-// webhook and the target, with the names made safe as for the archive
-// file, and the export time in UTC.
-func TestArchiveExportFileName(t *testing.T) {
-	t.Parallel()
-
-	cest := time.FixedZone("CEST", int((2 * time.Hour).Seconds()))
-
-	assert.Equal(t,
-		"archive-orders-eu-long-term-archive-20261002T120304Z.json.gz",
-		delivery.ArchiveExportFileName(
-			exportWebhookName, exportTargetName,
-			time.Date(2026, 10, 2, 14, 3, 4, 0, cest),
-		),
-	)
-}

internal/delivery/target_database_test.go

@@ -4,12 +4,13 @@ import (
 	"database/sql"
 	"fmt"
 	"log/slog"
+	"net/http"
 	"os"
 	"path/filepath"
-	"strings"
 	"testing"
 	"time"
 
+	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gorm.io/driver/sqlite"
@@ -17,7 +18,6 @@ import (
 	_ "modernc.org/sqlite" // Pure Go SQLite driver.
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
-	"sneak.berlin/go/webhooker/internal/gormlog"
 )
 
 func archiveTestLogger() *slog.Logger {
@@ -43,8 +43,7 @@ func openArchiveDBForRead(
 	t.Cleanup(func() { _ = sqlDB.Close() })
 
 	gdb, err := gorm.Open(
-		sqlite.Dialector{Conn: sqlDB},
+		sqlite.Dialector{Conn: sqlDB}, &gorm.Config{},
-		&gorm.Config{Logger: gormlog.New(slog.New(slog.DiscardHandler))},
 	)
 	require.NoError(t, err)
 
@@ -75,18 +74,25 @@ func removeArchiveFiles(t *testing.T, path string) {
 
 // TestDeliverDatabase_ArchivesEvent verifies that delivering to
 // a database target marks the delivery delivered and archives
-// the full event into the target's own archive file.
+// the full event into a separate per-webhook archive file.
 func TestDeliverDatabase_ArchivesEvent(t *testing.T) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	dataDir := t.TempDir()
-	tgt := env.seedDatabaseTarget(t, "")
+	dbMgr := database.NewTestWebhookDBManager(dataDir)
+
+	e := delivery.NewTestEngineWithDB(
+		nil, dbMgr,
+		archiveTestLogger(),
+		&http.Client{Timeout: 5 * time.Second},
+		1,
+	)
 
 	webhookDB := testWebhookDB(t)
 	event := seedEvent(t, webhookDB, `{"archived":true}`)
-	d := seedDatabaseTargetDelivery(t, webhookDB, event, tgt)
+	d := seedDatabaseTargetDelivery(t, webhookDB, event, "")
 
-	env.eng.ExportDeliverDatabase(webhookDB, d)
+	e.ExportDeliverDatabase(webhookDB, d)
 
 	var updated database.Delivery
 
@@ -99,7 +105,8 @@ func TestDeliverDatabase_ArchivesEvent(t *testing.T) {
 	)
 
 	archivePath := filepath.Join(
-		env.dataDir, "archive-sweep-test-archive-"+tgt.ID+".db",
+		dataDir,
+		fmt.Sprintf("archive-%s.db", event.WebhookID),
 	)
 	assert.FileExists(t, archivePath)
 
@@ -186,20 +193,13 @@ func TestArchiveWriter_RecreatesAfterRemoval(
 func TestArchiveWriter_ReopenDebounce(t *testing.T) {
 	t.Parallel()
 
-	const debounce = 2 * time.Second
+	// A generous debounce keeps the two rapid writes inside
-
+	// the window even on a heavily loaded test machine.
 	path := filepath.Join(t.TempDir(), "archive-wh.db")
 	w := delivery.NewExportArchiveWriter(
-		path, archiveTestLogger(), debounce,
+		path, archiveTestLogger(), 2*time.Second,
 	)
 
-	// The writer measures its reopen debounce on this clock, which
-	// only the test moves, so how long the host takes between
-	// writes cannot change the result.
-	now := time.Now()
-
-	w.SetNow(func() time.Time { return now })
-
 	require.NoError(t, w.Write(
 		delivery.ExportArchivedEvent{EventID: "a"}, 0,
 	))
@@ -211,7 +211,7 @@ func TestArchiveWriter_ReopenDebounce(t *testing.T) {
 	// initial open — no extra close/reopen.
 	assert.Equal(t, 1, w.Reopens())
 
-	now = now.Add(debounce)
+	time.Sleep(2100 * time.Millisecond)
 
 	require.NoError(t, w.Write(
 		delivery.ExportArchivedEvent{EventID: "c"}, 0,
@@ -288,31 +288,31 @@ func TestParseArchiveExpiry(t *testing.T) {
 	}
 }
 
-// seedDatabaseTargetDelivery seeds a pending delivery of an event
+// seedDatabaseTargetDelivery seeds a pending delivery for a
-// to a database target and returns the in-memory delivery the
+// database target with the given config JSON and returns the
-// target handler is invoked with.
+// in-memory delivery the target handler is invoked with.
 func seedDatabaseTargetDelivery(
 	t *testing.T,
 	webhookDB *gorm.DB,
 	event database.Event,
-	tgt *database.Target,
+	config string,
 ) *database.Delivery {
 	t.Helper()
 
 	dlv := seedDelivery(
-		t, webhookDB, event.ID, tgt.ID,
+		t, webhookDB, event.ID, uuid.New().String(),
 		database.DeliveryStatusPending,
 	)
 
 	d := &database.Delivery{
 		EventID:  event.ID,
-		TargetID: tgt.ID,
+		TargetID: dlv.TargetID,
 		Status:   database.DeliveryStatusPending,
 		Event:    event,
 		Target: database.Target{
-			Name:   tgt.Name,
+			Name:   "test-db",
 			Type:   database.TargetTypeDatabase,
-			Config: tgt.Config,
+			Config: config,
 		},
 	}
 	d.ID = dlv.ID
@@ -330,14 +330,22 @@ func TestDeliverDatabase_ArchiveFailureFailsDelivery(
 ) {
 	t.Parallel()
 
-	env := setupArchiveTest(t)
+	dataDir := t.TempDir()
-	tgt := env.seedDatabaseTarget(t, `{"expiry":"nonsense"}`)
+
+	e := delivery.NewTestEngineWithDB(
+		nil, database.NewTestWebhookDBManager(dataDir),
+		archiveTestLogger(),
+		&http.Client{Timeout: 5 * time.Second},
+		1,
+	)
 
 	webhookDB := testWebhookDB(t)
 	event := seedEvent(t, webhookDB, `{"archived":false}`)
-	d := seedDatabaseTargetDelivery(t, webhookDB, event, tgt)
+	d := seedDatabaseTargetDelivery(
+		t, webhookDB, event, `{"expiry":"nonsense"}`,
+	)
 
-	env.eng.ExportDeliverDatabase(webhookDB, d)
+	e.ExportDeliverDatabase(webhookDB, d)
 
 	var updated database.Delivery
 
@@ -365,7 +373,10 @@ func TestDeliverDatabase_ArchiveFailureFailsDelivery(
 	)
 
 	assert.NoFileExists(t,
-		env.archivePath(tgt),
+		filepath.Join(
+			dataDir,
+			fmt.Sprintf("archive-%s.db", event.WebhookID),
+		),
 		"no archive file should exist for a failed config",
 	)
 }
@@ -389,290 +400,3 @@ func TestValidateArchiveExpiry(t *testing.T) {
 		)
 	}
 }
-
-// TestArchiveFileName pins the archive file name and the rules
-// that make a webhook or target name safe to put in it.
-func TestArchiveFileName(t *testing.T) {
-	t.Parallel()
-
-	const id = "3f2a1c9e-8d4b-4c1a-9e2f-0a1b2c3d4e5f"
-
-	cases := []struct {
-		name    string
-		webhook string
-		target  string
-		want    string
-	}{
-		{
-			"plain names", "orders", "archive",
-			"archive-orders-archive-" + id + ".db",
-		},
-		{
-			"lowercased", "Orders", "Main Archive",
-			"archive-orders-main-archive-" + id + ".db",
-		},
-		{
-			"a run of other characters is one dash",
-			`a  /\..b`, "c__--d",
-			"archive-a-b-c-d-" + id + ".db",
-		},
-		{
-			"no dash at either end", "  --orders!! ", "(archive)",
-			"archive-orders-archive-" + id + ".db",
-		},
-		{
-			"path separators", "../../etc/passwd", "a/b",
-			"archive-etc-passwd-a-b-" + id + ".db",
-		},
-		{
-			"letters outside ASCII are dropped",
-			"Bestellungen Größe", "café",
-			"archive-bestellungen-gr-e-caf-" + id + ".db",
-		},
-		{
-			"nothing left is unnamed", "", "!!!",
-			"archive-unnamed-unnamed-" + id + ".db",
-		},
-		{
-			"cut to 40 characters", strings.Repeat("a", 50), "x",
-			"archive-" + strings.Repeat("a", 40) + "-x-" + id + ".db",
-		},
-		{
-			"no dash left by the cut",
-			strings.Repeat("a", 39) + " b", "x",
-			"archive-" + strings.Repeat("a", 39) + "-x-" + id + ".db",
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			assert.Equal(
-				t, tc.want,
-				delivery.ArchiveFileName(tc.webhook, tc.target, id),
-			)
-		})
-	}
-}
-
-// TestDeliverDatabase_EachTargetHasItsOwnArchive proves two
-// database targets of one webhook archive into separate files.
-func TestDeliverDatabase_EachTargetHasItsOwnArchive(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	first := env.seedDatabaseTarget(t, "")
-	second := env.addDatabaseTarget(t, first.WebhookID, "")
-
-	webhookDB := testWebhookDB(t)
-	event := seedEvent(t, webhookDB, `{"n":1}`)
-
-	for _, tgt := range []*database.Target{first, second} {
-		env.eng.ExportDeliverDatabase(
-			webhookDB,
-			seedDatabaseTargetDelivery(t, webhookDB, event, tgt),
-		)
-	}
-
-	require.NotEqual(
-		t, env.archivePath(first), env.archivePath(second),
-	)
-	assert.Equal(
-		t, []string{event.ID},
-		archivedEventIDs(t, env.archivePath(first)),
-	)
-	assert.Equal(
-		t, []string{event.ID},
-		archivedEventIDs(t, env.archivePath(second)),
-	)
-}
-
-// TestRename_MovesTheFile proves a rename moves the archive, rows
-// and all, and that later writes go to the new name.
-func TestRename_MovesTheFile(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(t, "")
-	oldPath := env.archivePath(tgt)
-
-	webhookDB := testWebhookDB(t)
-	first := seedEvent(t, webhookDB, `{"n":1}`)
-	env.eng.ExportDeliverDatabase(
-		webhookDB, seedDatabaseTargetDelivery(t, webhookDB, first, tgt),
-	)
-	require.FileExists(t, oldPath)
-
-	require.NoError(
-		t, env.eng.Rename(tgt.ID, "Orders", "Long Term"),
-	)
-
-	newPath := filepath.Join(
-		env.dataDir, "archive-orders-long-term-"+tgt.ID+".db",
-	)
-
-	assert.NoFileExists(t, oldPath)
-	assert.Equal(t, []string{first.ID}, archivedEventIDs(t, newPath))
-
-	second := seedEvent(t, webhookDB, `{"n":2}`)
-	env.eng.ExportDeliverDatabase(
-		webhookDB,
-		seedDatabaseTargetDelivery(t, webhookDB, second, tgt),
-	)
-
-	assert.ElementsMatch(
-		t, []string{first.ID, second.ID},
-		archivedEventIDs(t, newPath),
-	)
-	assert.NoFileExists(
-		t, oldPath, "a write after the rename must use the new name",
-	)
-}
-
-// TestRename_NeverReplacesAFile plants a file at the new name, once
-// the .db alone, once a lone -wal and once a lone -shm, and proves
-// each time that the rename is refused, the planted file survives,
-// and the archive keeps its name and its rows.
-func TestRename_NeverReplacesAFile(t *testing.T) {
-	t.Parallel()
-
-	for _, suffix := range archiveFileSuffixes() {
-		t.Run("planted .db"+suffix, func(t *testing.T) {
-			t.Parallel()
-
-			env := setupArchiveTest(t)
-			tgt := env.seedDatabaseTarget(t, "")
-			oldPath := env.archivePath(tgt)
-
-			webhookDB := testWebhookDB(t)
-			first := seedEvent(t, webhookDB, `{"n":1}`)
-			env.eng.ExportDeliverDatabase(
-				webhookDB,
-				seedDatabaseTargetDelivery(t, webhookDB, first, tgt),
-			)
-
-			newPath := filepath.Join(
-				env.dataDir, "archive-orders-long-term-"+tgt.ID+".db",
-			)
-			plantedPath := newPath + suffix
-			require.NoError(
-				t, os.WriteFile(plantedPath, []byte("planted"), 0o600),
-			)
-
-			require.ErrorIs(
-				t, env.eng.Rename(tgt.ID, "Orders", "Long Term"),
-				delivery.ErrArchiveNameTaken,
-			)
-
-			//nolint:gosec // reads the file the test planted under t.TempDir()
-			planted, err := os.ReadFile(plantedPath)
-			require.NoError(t, err)
-			assert.Equal(t, "planted", string(planted))
-
-			second := seedEvent(t, webhookDB, `{"n":2}`)
-			env.eng.ExportDeliverDatabase(
-				webhookDB,
-				seedDatabaseTargetDelivery(t, webhookDB, second, tgt),
-			)
-
-			assert.ElementsMatch(
-				t, []string{first.ID, second.ID},
-				archivedEventIDs(t, oldPath),
-			)
-		})
-	}
-}
-
-// TestRename_BeforeTheNameIsSaved covers the order the handlers
-// use: they rename before they save the new name, so a delivery in
-// between must write under the new name although the main database
-// still has the old one. It also shows that renaming an archive that
-// does not exist yet is not an error.
-func TestRename_BeforeTheNameIsSaved(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(t, "")
-
-	require.NoError(
-		t, env.eng.Rename(tgt.ID, "Orders", "Archive"),
-	)
-
-	webhookDB := testWebhookDB(t)
-	event := seedEvent(t, webhookDB, `{"n":1}`)
-	env.eng.ExportDeliverDatabase(
-		webhookDB, seedDatabaseTargetDelivery(t, webhookDB, event, tgt),
-	)
-
-	assert.FileExists(
-		t,
-		filepath.Join(
-			env.dataDir, "archive-orders-archive-"+tgt.ID+".db",
-		),
-	)
-	assert.NoFileExists(t, env.archivePath(tgt))
-}
-
-// TestArchiveWriter_RenameMovesSidecars proves a rename carries
-// the -wal and -shm a crash can leave beside an archive no handle
-// has opened since. SQLite finds them by name, so a -wal left
-// behind would lose the transactions it holds.
-func TestArchiveWriter_RenameMovesSidecars(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	oldPath := filepath.Join(dir, "archive-old.db")
-	newPath := filepath.Join(dir, "archive-new.db")
-
-	for _, suffix := range archiveFileSuffixes() {
-		require.NoError(
-			t, os.WriteFile(oldPath+suffix, []byte(suffix), 0o600),
-		)
-	}
-
-	w := delivery.NewExportArchiveWriter(
-		oldPath, archiveTestLogger(), 0,
-	)
-
-	require.NoError(t, w.Rename("archive-new.db"))
-
-	for _, suffix := range archiveFileSuffixes() {
-		assert.NoFileExists(t, oldPath+suffix)
-		assert.FileExists(t, newPath+suffix)
-	}
-
-	assert.Equal(t, newPath, w.Path())
-}
-
-// TestArchiveWriter_RenameMovesBackOnFailure makes the -wal fail to
-// move after the .db has moved, and proves the .db is moved back, so
-// the archive is never split across two names. The new name is 255
-// bytes, the longest a file name may be, so the .db can take it but
-// the -wal, four bytes longer, cannot.
-func TestArchiveWriter_RenameMovesBackOnFailure(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	oldPath := filepath.Join(dir, "archive-old.db")
-	newName := strings.Repeat("a", 252) + ".db"
-
-	for _, suffix := range archiveFileSuffixes() {
-		require.NoError(
-			t, os.WriteFile(oldPath+suffix, []byte(suffix), 0o600),
-		)
-	}
-
-	w := delivery.NewExportArchiveWriter(
-		oldPath, archiveTestLogger(), 0,
-	)
-
-	require.Error(t, w.Rename(newName))
-
-	for _, suffix := range archiveFileSuffixes() {
-		assert.FileExists(t, oldPath+suffix)
-	}
-
-	assert.NoFileExists(t, filepath.Join(dir, newName))
-	assert.Equal(t, oldPath, w.Path())
-}

internal/delivery/url_mask_test.go

@@ -179,27 +179,6 @@ func TestDoHTTPRequest_TransportErrorMasksURL(t *testing.T) {
 	)
 }
 
-// TestDoHTTPRequest_UnparsableURLIsMasked is the same for an HTTP
-// target URL that no request can be built from.
-func TestDoHTTPRequest_UnparsableURLIsMasked(t *testing.T) {
-	t.Parallel()
-
-	e := testEngine(t, 1)
-
-	statusCode, _, _, reqErr := e.ExportDoHTTPRequest(
-		context.TODO(),
-		&delivery.HTTPTargetConfig{
-			URL: "https://hooks.example.com" + maskSecretPath + "\n",
-		},
-		&database.Event{},
-	)
-	require.Error(t, reqErr)
-	assert.Zero(t, statusCode)
-
-	assertNoCredential(t, reqErr.Error())
-	assert.Contains(t, reqErr.Error(), "invalid control character")
-}
-
 // TestValidateTargetURL_UnparsableURLIsMasked proves the SSRF
 // validator's error does not carry the submitted URL, which
 // the handler both logs and shows.

internal/gormlog/firstboot_test.go

@@ -117,8 +117,8 @@ func readFirstBootSecrets(
 }
 
 // bootAtDebug starts and stops the real application graph against
-// dataDir with DEBUG=true and nothing else set, and returns everything
+// dataDir with DEBUG=true, and returns everything it wrote to standard
-// it wrote to standard output.
+// output.
 //
 // config.New reads DEBUG from the environment exactly as the binary
 // does, internal/logger builds the handler it builds in production,
@@ -128,7 +128,6 @@ func readFirstBootSecrets(
 func bootAtDebug(t *testing.T, dataDir string) string {
 	t.Helper()
 
-	config.ClearEnvForTest(t)
 	t.Setenv("DEBUG", "true")
 	t.Setenv("DATA_DIR", dataDir)
 
@@ -138,10 +137,6 @@ func bootAtDebug(t *testing.T, dataDir string) string {
 
 	app := fxtest.New(
 		t,
-		// fx's own log is discarded, not sent to t.Logf: a hook still
-		// running after a start or stop timeout would write there after
-		// the test has returned.
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,

internal/gormlog/gormlog.go

@@ -111,9 +111,9 @@ func (l *Logger) LogMode(gormlogger.LogLevel) gormlogger.Interface {
 //
 // One GORM path does not consult this: (*gorm.DB).Scan records the
 // statement through gorm's own traceRecorder, which does not implement
-// this interface. No production code path calls it; only tests do, and
+// this interface. No production code path calls it; its one caller is
-// what a test binds is fixture data. scan_guard_test.go fails if a
+// internal/database/database_test.go:91, whose SELECT 1 binds nothing.
-// non-test file calls it.
+// scan_guard_test.go fails if a non-test file calls it.
 // (*gorm.DB).Pluck, Row and Raw all run through the normal callback
 // processor and are filtered.
 func (l *Logger) ParamsFilter(

internal/gormlog/scan_guard_test.go

@@ -14,16 +14,18 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-// isRowProducer reports whether name is GORM's Row or database/sql's
+// minNonTestFiles guards the walk below against passing because it
-// QueryRow or QueryRowContext, which return a *sql.Row whose Scan is
+// found nothing to look at. The tree held 60 non-test .go files when
-// database/sql's and not (*gorm.DB).Scan. GORM's Rows is not listed:
+// this was written.
-// it also returns an error, so Scan is never called on its result
+const minNonTestFiles = 40
-// directly. It matches the method name only and resolves no types, so
+
-// a repo-local method with one of these names that returns *gorm.DB
+// isRowProducer reports whether name is a method that returns a
-// gets past it: Scan on that method's result is not reported.
+// database/sql row handle. GORM's Row and Rows return *sql.Row and
+// *sql.Rows, so Scan on the result of one of them is database/sql's
+// Scan and never (*gorm.DB).Scan.
 func isRowProducer(name string) bool {
 	switch name {
-	case "Row", "QueryRow", "QueryRowContext":
+	case "Row", "Rows", "QueryRow", "QueryRowContext":
 		return true
 	default:
 		return false
@@ -48,14 +50,9 @@ func receiverIsRowHandle(x ast.Expr) bool {
 }
 
 // unguardedScans returns the position of every Scan call in file whose
-// receiver is not a call to a row producer. It fails closed: any other
+// receiver is not a row handle. It fails closed: a receiver it cannot
-// receiver — a local variable, a struct field, a call to any other
+// resolve syntactically — a local variable, a struct field — is
-// method — is reported rather than assumed safe.
+// reported rather than assumed safe.
-//
-// It sees only calls written x.Scan(...). A method value, f := db.Scan
-// followed by f(&v), is out of scope: Scan is never the called
-// expression there, and nobody writes a query that way by accident,
-// which is the mistake this check exists to catch.
 func unguardedScans(
 	fset *token.FileSet, file *ast.File,
 ) []token.Position {
@@ -114,15 +111,15 @@ func skipDir(name string) bool {
 	}
 }
 
-// walkNonTestGo parses every non-test .go file under root. It returns
+// walkNonTestGo parses every non-test .go file under root and returns
-// the directories, relative to root, it parsed a file in, along with
+// how many it parsed along with every unguarded Scan it found.
-// every unguarded Scan it found.
+func walkNonTestGo(t *testing.T, root string) (int, []string) {
-func walkNonTestGo(t *testing.T, root string) (map[string]bool, []string) {
 	t.Helper()
 
-	walked := map[string]bool{}
+	var (
-
+		parsed int
-	var hits []string
+		hits   []string
+	)
 
 	fset := token.NewFileSet()
 
@@ -150,12 +147,7 @@ func walkNonTestGo(t *testing.T, root string) (map[string]bool, []string) {
 				return err
 			}
 
-			dir, err := filepath.Rel(root, filepath.Dir(path))
+			parsed++
-			if err != nil {
-				return err
-			}
-
-			walked[dir] = true
 
 			for _, pos := range unguardedScans(fset, file) {
 				hits = append(hits, relPosition(root, pos))
@@ -165,7 +157,7 @@ func walkNonTestGo(t *testing.T, root string) (map[string]bool, []string) {
 		},
 	))
 
-	return walked, hits
+	return parsed, hits
 }
 
 // isNonTestGo reports whether a file name is Go source this check
@@ -197,39 +189,19 @@ func relPosition(root string, pos token.Position) string {
 // logged with its values interpolated. The package comment states the
 // limit; this fails when someone adds a call site anyway.
 //
-// Test files are not governed: what a test binds is fixture data.
+// The current tree has one caller, internal/database/database_test.go,
+// which this check does not govern: it is test-only and its SELECT 1
+// binds nothing.
 func TestGormScanIsNeverCalledOutsideTests(t *testing.T) {
 	t.Parallel()
 
-	root := moduleRoot(t)
+	parsed, offenders := walkNonTestGo(t, moduleRoot(t))
-	walked, offenders := walkNonTestGo(t, root)
-
-	// The module's packages are static, templates, and every directory
-	// directly under cmd and internal. Each holds non-test code, so one
-	// the walk parsed nothing in was skipped, and a Scan there would
-	// pass unseen.
-	packages := []string{"static", "templates"}
-
-	for _, parent := range []string{"cmd", "internal"} {
-		entries, err := os.ReadDir(filepath.Join(root, parent))
-		require.NoError(t, err)
-
-		for _, entry := range entries {
-			if !entry.IsDir() {
-				continue
-			}
-
-			packages = append(packages, filepath.Join(parent, entry.Name()))
-		}
-	}
-
-	for _, dir := range packages {
-		require.True(
-			t, walked[dir],
-			"the walk parsed no non-test .go file in %s", dir,
-		)
-	}
 
+	require.GreaterOrEqual(
+		t, parsed, minNonTestFiles,
+		"parsed %d non-test .go files, so this check found "+
+			"nothing to look at", parsed,
+	)
 	require.Empty(
 		t, offenders,
 		"Scan called on a receiver this check cannot show is a "+
@@ -250,51 +222,18 @@ type scanGuardCase struct {
 	want int
 }
 
-// scanGuardCases covers each receiver form unguardedScans names, plus
-// each row producer isRowProducer lets through. Each body is valid Go
-// inside plantedFile.
 func scanGuardCases() []scanGuardCase {
 	return []scanGuardCase{
-		{"local variable", "q := gdb.Raw(\"SELECT 1\")\n\tq.Scan(&v)", 1},
+		{"gorm chain", `db.DB().Raw("SELECT 1").Scan(&v)`, 1},
-		{"struct field", `s.db.Scan(&v)`, 1},
+		{"gorm receiver", `gdb.Scan(&v)`, 1},
-		{"gorm chain", `gdb.Raw("SELECT 1").Scan(&v)`, 1},
+		{"gorm via variable", "q := gdb.Raw(\"x\")\nq.Scan(&v)", 1},
-		{
+		{"gorm model chain", `gdb.Model(&x).Scan(&v)`, 1},
-			"sql rows in a variable",
+		{"sql row", `gdb.Raw("SELECT 1").Row().Scan(&v)`, 0},
-			"rows, _ := gdb.Raw(\"SELECT 1\").Rows()\n\trows.Scan(&v)",
+		{"sql rows", `gdb.Raw("SELECT 1").Rows().Scan(&v)`, 0},
-			1,
-		},
-		{"gorm Row", `gdb.Raw("SELECT 1").Row().Scan(&v)`, 0},
-		{"sql QueryRow", `sqlDB.QueryRow("SELECT 1").Scan(&v)`, 0},
-		{
-			"sql QueryRowContext",
-			`sqlDB.QueryRowContext(ctx, "SELECT 1").Scan(&v)`,
-			0,
-		},
 		{"unrelated call", `gdb.Find(&v)`, 0},
 	}
 }
 
-// plantedFile wraps one case body in a function that declares every
-// name the bodies use, so each body is the Go it stands for. The result
-// is parsed, never compiled.
-const plantedFile = `package p
-
-import (
-	"context"
-	"database/sql"
-
-	"gorm.io/gorm"
-)
-
-type store struct{ db *gorm.DB }
-
-func f(ctx context.Context, gdb *gorm.DB, sqlDB *sql.DB, s store) {
-	var v int
-
-	%s
-}
-`
-
 // TestScanGuard_ReportsPlantedCalls proves the check fires. Without it
 // a detector that matched nothing would satisfy the walk above no
 // matter what the tree contained.
@@ -306,7 +245,9 @@ func TestScanGuard_ReportsPlantedCalls(t *testing.T) {
 			t.Parallel()
 
 			fset := token.NewFileSet()
-			src := fmt.Sprintf(plantedFile, tc.body)
+			src := fmt.Sprintf(
+				"package p\n\nfunc f() {\n\t%s\n}\n", tc.body,
+			)
 
 			file, err := parser.ParseFile(
 				fset, tc.name+".go", src, 0,

internal/handlers/auth.go

@@ -139,7 +139,8 @@ func (h *Handlers) renderLoginError(
 		),
 	}
 
-	h.renderTemplateStatus(w, r, "login.html", data, status)
+	w.WriteHeader(status)
+	h.renderTemplate(w, r, "login.html", data)
 }
 
 // authenticateUser looks up and verifies a user's credentials.

internal/handlers/auth_test.go

@@ -3,7 +3,6 @@ package handlers_test
 import (
 	"context"
 	"fmt"
-	"html/template"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
@@ -405,60 +404,6 @@ func TestLogin_MissingCredentialsRejectedBeforeAnyHash(t *testing.T) {
 	)
 }
 
-// TestLogin_FormErrorAnswersItsStatusWithThePage proves that the login
-// form shown again with an error still answers 400 with the whole page.
-func TestLogin_FormErrorAnswersItsStatusWithThePage(t *testing.T) {
-	t.Parallel()
-
-	var h *handlers.Handlers
-
-	app := newTestApp(t, &h)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	w := submitLogin(h, sharedProxyPeer, "", "")
-
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-	assert.Contains(
-		t, w.Body.String(), "Username and password are required",
-	)
-	assert.Contains(
-		t, w.Body.String(), "</html>",
-		"the page must render to completion",
-	)
-}
-
-// TestLogin_FormErrorRenderFailureAnswers500 proves that a login form
-// error page whose template fails answers 500 with the error page and
-// none of the form page, rather than the 400 it meant to send.
-func TestLogin_FormErrorRenderFailureAnswers500(t *testing.T) {
-	t.Parallel()
-
-	var h *handlers.Handlers
-
-	app := newTestApp(t, &h)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	// The page prints its error message and then fails.
-	h.AddTemplateForTest("login.html", template.Must(
-		template.New("login").Funcs(template.FuncMap{
-			"fail": func() (string, error) { return "", errMidRender },
-		}).Parse(`{{.Error}}{{fail}}`),
-	))
-
-	w := submitLogin(h, sharedProxyPeer, "", "")
-
-	assert.Equal(t, http.StatusInternalServerError, w.Code)
-	assert.NotContains(
-		t, w.Body.String(), "Username and password are required",
-		"the response must carry no part of the aborted page",
-	)
-	assert.Contains(t, w.Body.String(), "500 Internal Server Error")
-}
-
 // TestLogin_SuccessCreatesSession is the control for the tests above:
 // the success path they assert on really does authenticate.
 func TestLogin_SuccessCreatesSession(t *testing.T) {

internal/handlers/event_body.go

@@ -15,12 +15,10 @@ import (
 // eventBodyQuery reads one event's stored body as bytes. The cast
 // to blob is what makes the driver hand back the stored bytes
 // rather than a string conversion, so Content-Length taken from
-// the result matches what goes on the wire. The retention reaper
+// the result matches what goes on the wire. The soft-delete
-// deletes event rows outright, so a reaped event is simply gone
+// predicate is spelled out because Raw bypasses GORM's default
-// and the query finds no row. The deleted_at predicate repeats
+// scope, and it is what stops a reaped event still being
-// the soft-delete scope GORM adds to its own queries, which Raw
+// downloadable.
-// bypasses; nothing soft-deletes an event, so today it excludes
-// nothing.
 const eventBodyQuery = "SELECT cast(body as blob) " +
 	"FROM events WHERE id = ? AND webhook_id = ? AND deleted_at IS NULL"
 

internal/handlers/event_body_test.go

@@ -405,11 +405,10 @@ func TestHandleEventBodyDownload_UnknownEvent404s(t *testing.T) {
 // route. The body is read in one query before any header is
 // written, so a reaped event cannot produce a partial download:
 // it is a clean 404 with no Content-Length and no
-// Content-Disposition. The reaper deletes event rows outright,
+// Content-Disposition. Both removals the codebase performs are
-// which is the "hard deleted" case. The "soft deleted" case
+// covered — the reaper hard-deletes, and a soft-deleted row is
-// covers a row no code produces today: it only pins the query's
+// excluded by the query's own deleted_at predicate rather than
-// own deleted_at predicate, the soft-delete condition Raw would
+// by GORM's default scope, which Raw bypasses.
-// otherwise skip.
 func TestHandleEventBodyDownload_ReapedEvent404s(t *testing.T) {
 	t.Parallel()
 

internal/handlers/event_resubmit.go

@@ -145,9 +145,8 @@ func (h *Handlers) resubmitEvent(
 // per-webhook database files — a sibling webhook's event is not in the
 // database being queried at all — and is there so the scoping survives
 // any future change that puts more than one webhook's events in one
-// file. A reaped event is not found because the retention reaper
+// file. Going through Model applies GORM's soft-delete scope, which is
-// deletes its row outright rather than marking it deleted; see
+// what stops a reaped event being resubmitted.
-// deleteEvents in internal/database/retention.go.
 func loadResubmitSource(
 	webhookDB *gorm.DB,
 	webhookID, eventID string,

internal/handlers/export_test.go

@@ -36,15 +36,6 @@ const MaxRenderedAttemptsForTest = maxRenderedAttempts
 // the handlers enforce rather than a number copied beside it.
 const MaxTargetRetriesForTest = maxTargetRetries
 
-// EventDBLeftMsgForTest and SidecarLeftMsgForTest expose the two
-// messages the webhook delete handler logs when a file of the event
-// database is left on disk, so a test checking that one is absent
-// checks for the handler's own wording.
-const (
-	EventDBLeftMsgForTest = eventDBLeftMsg
-	SidecarLeftMsgForTest = sidecarLeftMsg
-)
-
 // PageOrFirstForTest exposes pageOrFirst for use in the handlers_test
 // package.
 func PageOrFirstForTest(s string) int {

internal/handlers/handlers.go

@@ -10,12 +10,10 @@ import (
 	"html/template"
 	"log/slog"
 	"net/http"
-	"sync"
 	"sync/atomic"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"go.uber.org/fx"
-	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
 	"sneak.berlin/go/webhooker/internal/globals"
@@ -59,14 +57,13 @@ type HandlersParams struct {
 
 	Logger       *logger.Logger
 	Globals      *globals.Globals
-	Config       *config.Config
 	Database     *database.Database
 	WebhookDBMgr *database.WebhookDBManager
 	Healthcheck  *healthcheck.Healthcheck
 	Session      *session.Session
 	Middleware   *middleware.Middleware
 	Notifier     delivery.Notifier
-	Archives     delivery.Archives
+	Evictor      delivery.WebhookEvictor
 	SSRFGuard    *delivery.Guard
 	Metrics      *metrics.Set
 	Registry     *prometheus.Registry
@@ -83,7 +80,7 @@ type Handlers struct {
 	session   *session.Session
 	mw        *middleware.Middleware
 	notifier  delivery.Notifier
-	archives  delivery.Archives
+	evictor   delivery.WebhookEvictor
 	mtr       *metrics.Set
 	templates map[string]*template.Template
 
@@ -92,15 +89,6 @@ type Handlers struct {
 	// is one delivery will actually attempt.
 	ssrf *delivery.Guard
 
-	// renameMu makes the webhook edit, the target edit and target
-	// creation run one at a time, each held from loading the stored
-	// names through the archive rename, the save and any move back.
-	// Interleaved, one could rename an archive between another's
-	// rename and save, leaving the file named for one edit and the
-	// stored names from the other. An archive download holds it while
-	// it reads the stored names and opens the file they give.
-	renameMu sync.Mutex
-
 	// dummyVerifications counts the equivalent-cost verifications
 	// charged for usernames that do not exist. It exists so a test
 	// can prove that path runs without measuring wall-clock time.
@@ -144,7 +132,7 @@ func New(
 	s.session = params.Session
 	s.mw = params.Middleware
 	s.notifier = params.Notifier
-	s.archives = params.Archives
+	s.evictor = params.Evictor
 	s.mtr = params.Metrics
 	s.ssrf = params.SSRFGuard
 
@@ -152,7 +140,6 @@ func New(
 	s.templates = map[string]*template.Template{
 		"login.html":         parsePageTemplate("login.html"),
 		"profile.html":       parsePageTemplate("profile.html"),
-		"settings.html":      parsePageTemplate("settings.html"),
 		"sources_list.html":  parsePageTemplate("sources_list.html"),
 		"sources_new.html":   parsePageTemplate("sources_new.html"),
 		"source_detail.html": parsePageTemplate("source_detail.html", "webhook_stats.html"),
@@ -310,26 +297,12 @@ func (s *Handlers) getUserInfo(
 }
 
 // renderTemplate renders a pre-parsed template with common
-// data and answers 200.
+// data
 func (s *Handlers) renderTemplate(
 	w http.ResponseWriter,
 	r *http.Request,
 	pageTemplate string,
 	data any,
-) {
-	s.renderTemplateStatus(w, r, pageTemplate, data, http.StatusOK)
-}
-
-// renderTemplateStatus is renderTemplate answering with status, for a
-// form shown again with an error. Call it instead of WriteHeader
-// followed by renderTemplate: the status is written only once the page
-// has rendered, so a failed render can still answer 500.
-func (s *Handlers) renderTemplateStatus(
-	w http.ResponseWriter,
-	r *http.Request,
-	pageTemplate string,
-	data any,
-	status int,
 ) {
 	tmpl, ok := s.templates[pageTemplate]
 	if !ok {
@@ -342,9 +315,7 @@ func (s *Handlers) renderTemplateStatus(
 		return
 	}
 
-	s.executeTemplate(
+	s.executeTemplate(w, r, tmpl, s.pageData(r, data, noticeFor(r)))
-		w, r, tmpl, s.pageData(r, data, noticeFor(r)), status,
-	)
 }
 
 // pageData adds the fields the shared layout renders to a page's own
@@ -380,20 +351,19 @@ func (s *Handlers) pageData(
 	}
 }
 
-// executeTemplate renders the template into a buffer and writes status
+// executeTemplate renders the template into a buffer and writes to
-// and the page to the response only once rendering has fully
+// the response only once rendering has fully succeeded. Executing
-// succeeded. Executing straight into the ResponseWriter commits a
+// straight into the ResponseWriter commits a partial body and a 200
-// partial body and the status before a mid-render error can be
+// status before a mid-render error can be reported, leaving no way
-// reported, leaving no way to serve a 500. Buffering makes a page's
+// to serve a 500. Buffering makes a page's rendered size resident
-// rendered size resident memory per concurrent viewer, so every page
+// memory per concurrent viewer, so every page owes it a bound: the
-// owes it a bound: the event log caps each stored body at
+// event log caps each stored body at maxRenderedBodyBytes for exactly
-// maxRenderedBodyBytes for exactly this reason.
+// this reason.
 func (s *Handlers) executeTemplate(
 	w http.ResponseWriter,
 	r *http.Request,
 	tmpl *template.Template,
 	data any,
-	status int,
 ) {
 	var buf bytes.Buffer
 
@@ -408,7 +378,6 @@ func (s *Handlers) executeTemplate(
 	}
 
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
-	w.WriteHeader(status)
 
 	_, err = buf.WriteTo(w)
 	if err != nil {

internal/handlers/handlers_test.go

@@ -3,7 +3,6 @@ package handlers_test
 import (
 	"context"
 	"errors"
-	"fmt"
 	"html/template"
 	"net/http"
 	"net/http/httptest"
@@ -53,103 +52,23 @@ func (n *recordingNotifier) Tasks() []delivery.Task {
 	return out
 }
 
-// recordingArchives is a delivery.Archives that records what it
+// recordingEvictor is a delivery.WebhookEvictor that records
-// was asked to do, so a test can prove that a deletion or rename
+// the webhook ids it was asked to evict, so a test can prove
-// path reached the delivery engine. After FailRenames, every
+// that a deletion path reached the delivery engine.
-// rename of that target fails with the given error. After
+type recordingEvictor struct {
-// BlockNextRename, the next rename is recorded and then waits.
+	mu      sync.Mutex
-type recordingArchives struct {
+	evicted []string
-	mu             sync.Mutex
-	evicted        []string
-	evictedTargets []string
-	renames        []archiveRename
-	renameErrs     map[string]error
-	entered        chan struct{}
-	release        chan struct{}
 }
 
-// errInjectedRename is the failure a test hands FailRenames.
+func (r *recordingEvictor) EvictWebhook(webhookID string) {
-var errInjectedRename = errors.New("injected rename failure")
-
-// errNameTaken is what the delivery engine returns when a file
-// already has an archive's new name, here archive-taken.db.
-var errNameTaken = fmt.Errorf(
-	"%w: archive-taken.db", delivery.ErrArchiveNameTaken,
-)
-
-// archiveRename is one recorded Rename call.
-type archiveRename struct {
-	TargetID    string
-	WebhookName string
-	TargetName  string
-}
-
-func (r *recordingArchives) EvictWebhook(webhookID string) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
 	r.evicted = append(r.evicted, webhookID)
 }
 
-func (r *recordingArchives) EvictTarget(targetID string) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	r.evictedTargets = append(r.evictedTargets, targetID)
-}
-
-func (r *recordingArchives) Rename(
-	targetID, webhookName, targetName string,
-) error {
-	r.mu.Lock()
-
-	r.renames = append(r.renames, archiveRename{
-		TargetID:    targetID,
-		WebhookName: webhookName,
-		TargetName:  targetName,
-	})
-	err := r.renameErrs[targetID]
-	entered, release := r.entered, r.release
-	r.entered, r.release = nil, nil
-
-	r.mu.Unlock()
-
-	if entered != nil {
-		close(entered)
-		<-release
-	}
-
-	return err
-}
-
-// BlockNextRename makes the next rename, once recorded, wait until
-// the returned release is called. The returned channel is closed
-// when that rename starts waiting.
-func (r *recordingArchives) BlockNextRename() (<-chan struct{}, func()) {
-	entered := make(chan struct{})
-	release := make(chan struct{})
-
-	r.mu.Lock()
-	r.entered, r.release = entered, release
-	r.mu.Unlock()
-
-	return entered, func() { close(release) }
-}
-
-// FailRenames makes every later rename of targetID fail with err.
-func (r *recordingArchives) FailRenames(targetID string, err error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if r.renameErrs == nil {
-		r.renameErrs = map[string]error{}
-	}
-
-	r.renameErrs[targetID] = err
-}
-
 // Evicted returns a copy of the recorded webhook ids.
-func (r *recordingArchives) Evicted() []string {
+func (r *recordingEvictor) Evicted() []string {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
@@ -159,62 +78,22 @@ func (r *recordingArchives) Evicted() []string {
 	return out
 }
 
-// EvictedTargets returns a copy of the recorded target ids.
-func (r *recordingArchives) EvictedTargets() []string {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	out := make([]string, len(r.evictedTargets))
-	copy(out, r.evictedTargets)
-
-	return out
-}
-
-// Renames returns a copy of the recorded renames.
-func (r *recordingArchives) Renames() []archiveRename {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	out := make([]archiveRename, len(r.renames))
-	copy(out, r.renames)
-
-	return out
-}
-
-// newTestApp returns an app whose RequireStart fails the test when
-// starting takes longer than fx's default start timeout of 15s. That
-// limit catches a start that hangs, not a busy host: measured with make
-// test on 2026-10-02 at host load 58-69 on 48 cores, the slowest of this
-// package's starts took 0.49s.
 func newTestApp(
 	t *testing.T,
 	targets ...any,
 ) *fxtest.App {
 	t.Helper()
 
-	return newTestAppWithConfig(
-		t, &config.Config{DataDir: t.TempDir()}, targets...,
-	)
-}
-
-// newTestAppWithConfig is newTestApp over a caller-supplied Config.
-func newTestAppWithConfig(
-	t *testing.T,
-	cfg *config.Config,
-	targets ...any,
-) *fxtest.App {
-	t.Helper()
-
 	return fxtest.New(
 		t,
-		// fx's own log is discarded, not sent to t.Logf: a hook still
-		// running after a start or stop timeout would write there after
-		// the test has returned.
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
-			func() *config.Config { return cfg },
+			func() *config.Config {
+				return &config.Config{
+					DataDir: t.TempDir(),
+				}
+			},
 			database.New,
 			database.NewWebhookDBManager,
 			healthcheck.New,
@@ -225,10 +104,10 @@ func newTestAppWithConfig(
 			func(n *recordingNotifier) delivery.Notifier {
 				return n
 			},
-			func() *recordingArchives {
+			func() *recordingEvictor {
-				return &recordingArchives{}
+				return &recordingEvictor{}
 			},
-			func(r *recordingArchives) delivery.Archives {
+			func(r *recordingEvictor) delivery.WebhookEvictor {
 				return r
 			},
 			metrics.NewRegistry,

internal/handlers/settings.go

@@ -1,129 +0,0 @@
-package handlers
-
-import (
-	"net/http"
-	"net/netip"
-	"strconv"
-	"strings"
-
-	"sneak.berlin/go/webhooker/internal/config"
-)
-
-// notSet is what the Settings page shows for a value that is empty.
-const notSet = "not set"
-
-// settingRow is one line of the Settings page: an environment
-// variable, what it controls, and the value the server loaded for it.
-type settingRow struct {
-	Name        string
-	Description string
-	Value       string
-}
-
-// HandleSettings returns a handler for the read-only Settings page,
-// which lists the configuration the server started with.
-func (h *Handlers) HandleSettings() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		h.renderTemplate(w, r, "settings.html", map[string]any{
-			"Settings": settingRows(h.params.Config),
-		})
-	}
-}
-
-// settingRows lists every field of cfg under the environment variable
-// it is read from, with the description the README's configuration
-// table gives it (less its pointers to other README sections), in the
-// table's order. METRICS_PASSWORD and SENTRY_DSN are credentials, so
-// their values never reach the page: only whether they are set.
-func settingRows(cfg *config.Config) []settingRow {
-	metricsUsername := cfg.MetricsUsername
-	if metricsUsername == "" {
-		metricsUsername = notSet
-	}
-
-	return []settingRow{
-		{"WEBHOOKER_ENVIRONMENT", "dev or prod", cfg.Environment},
-		{"PORT", "HTTP listen port", strconv.Itoa(cfg.Port)},
-		{
-			"BIND_ADDRESS",
-			"IP address the HTTP listener binds. Loopback by default, " +
-				"so the cleartext listener is not published on every " +
-				"interface. The Docker image ships 0.0.0.0 instead",
-			cfg.BindAddress,
-		},
-		{"DATA_DIR", "Directory for all SQLite databases", cfg.DataDir},
-		{"DEBUG", "Enable debug logging", strconv.FormatBool(cfg.Debug)},
-		{
-			"METRICS_USERNAME",
-			"Basic auth username for /metrics. Must be set together " +
-				"with METRICS_PASSWORD; one without the other fails " +
-				"startup",
-			metricsUsername,
-		},
-		{
-			"METRICS_PASSWORD",
-			"Basic auth password for /metrics. Must be set together " +
-				"with METRICS_USERNAME; one without the other fails " +
-				"startup",
-			setOrNotSet(cfg.MetricsPassword),
-		},
-		{
-			"SENTRY_DSN",
-			"Sentry error reporting DSN. Unset leaves error reporting " +
-				"off; a value the Sentry SDK cannot parse fails startup " +
-				"rather than serving with reporting silently off",
-			setOrNotSet(cfg.SentryDSN),
-		},
-		{
-			"RETENTION_SWEEP_INTERVAL",
-			"How often the retention reaper and archive sweeper run " +
-				"(Go duration, must be positive). A value that does " +
-				"not parse, or is zero or negative, fails startup",
-			cfg.RetentionSweepInterval.String(),
-		},
-		{
-			"SESSION_IDLE_TIMEOUT",
-			"Idle session timeout (Go duration)",
-			cfg.SessionIdleTimeout.String(),
-		},
-		{
-			"RECEIVER_RATE_LIMIT",
-			"Receiver requests/minute per IP per entrypoint " +
-				"(10x that per IP across the route)",
-			strconv.Itoa(cfg.ReceiverRateLimit),
-		},
-		{
-			"TRUSTED_PROXIES",
-			"CIDRs whose forwarded headers are trusted. A set value " +
-				"replaces the default. If any client can reach webhooker, " +
-				"or the proxy in front of it, from an RFC 1918 source " +
-				"address, set it to the proxy's address alone",
-			cidrList(cfg.TrustedProxies),
-		},
-		{
-			"ALLOWED_EGRESS_CIDRS",
-			"CIDRs that delivery targets may reach despite the " +
-				"SSRF blocklist",
-			cidrList(cfg.AllowedEgressCIDRs),
-		},
-	}
-}
-
-// setOrNotSet is how the Settings page shows a credential: whether it
-// has a value, never the value itself.
-func setOrNotSet(value string) string {
-	if value == "" {
-		return notSet
-	}
-
-	return "set"
-}
-
-// cidrList renders a CIDR list setting for the Settings page.
-func cidrList(prefixes []netip.Prefix) string {
-	if len(prefixes) == 0 {
-		return "none"
-	}
-
-	return strings.Join(config.PrefixStrings(prefixes), ", ")
-}

internal/handlers/settings_test.go

@@ -1,148 +0,0 @@
-package handlers_test
-
-import (
-	"context"
-	"html"
-	"net/http"
-	"net/http/httptest"
-	"net/netip"
-	"regexp"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/config"
-	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/session"
-)
-
-// settingsShown renders the Settings page over cfg as a logged-in user
-// and returns the value it shows for each variable name, plus the
-// whole page.
-func settingsShown(
-	t *testing.T, cfg *config.Config,
-) (map[string]string, string) {
-	t.Helper()
-
-	var h *handlers.Handlers
-
-	var sess *session.Session
-
-	app := newTestAppWithConfig(t, cfg, &h, &sess)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	req := httptest.NewRequestWithContext(
-		context.Background(), http.MethodGet, "/settings", nil,
-	)
-	for _, c := range authenticatedCookies(t, sess, "id", "admin") {
-		req.AddCookie(c)
-	}
-
-	w := httptest.NewRecorder()
-	h.HandleSettings().ServeHTTP(w, req)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	body := w.Body.String()
-
-	row := regexp.MustCompile(
-		`<code[^>]*>([A-Z_]+)</code>\s*<code[^>]*>([^<]*)</code>`,
-	)
-
-	shown := map[string]string{}
-	for _, match := range row.FindAllStringSubmatch(body, -1) {
-		shown[match[1]] = html.UnescapeString(match[2])
-	}
-
-	return shown, body
-}
-
-func TestSettingsPageShowsLoadedConfiguration(t *testing.T) {
-	t.Parallel()
-
-	// Each of METRICS_USERNAME, METRICS_PASSWORD and SENTRY_DSN is the
-	// only one of the three set in one of the content tests, so each
-	// row is checked against its own field.
-	cfg := &config.Config{
-		DataDir:                t.TempDir(),
-		Debug:                  true,
-		Environment:            config.EnvironmentDev,
-		MetricsUsername:        "scraper",
-		MetricsPassword:        "",
-		Port:                   9123,
-		SentryDSN:              "",
-		BindAddress:            "192.0.2.10",
-		RetentionSweepInterval: 17 * time.Minute,
-		SessionIdleTimeout:     3 * time.Hour,
-		ReceiverRateLimit:      77,
-		TrustedProxies: []netip.Prefix{
-			netip.MustParsePrefix("10.1.0.0/16"),
-		},
-		AllowedEgressCIDRs: []netip.Prefix{
-			netip.MustParsePrefix("192.168.5.0/24"),
-			netip.MustParsePrefix("fd00::/8"),
-		},
-	}
-
-	shown, body := settingsShown(t, cfg)
-
-	assert.Equal(t, map[string]string{
-		"WEBHOOKER_ENVIRONMENT":    "dev",
-		"PORT":                     "9123",
-		"BIND_ADDRESS":             "192.0.2.10",
-		"DATA_DIR":                 cfg.DataDir,
-		"DEBUG":                    "true",
-		"METRICS_USERNAME":         "scraper",
-		"METRICS_PASSWORD":         "not set",
-		"SENTRY_DSN":               "not set",
-		"RETENTION_SWEEP_INTERVAL": "17m0s",
-		"SESSION_IDLE_TIMEOUT":     "3h0m0s",
-		"RECEIVER_RATE_LIMIT":      "77",
-		"TRUSTED_PROXIES":          "10.1.0.0/16",
-		"ALLOWED_EGRESS_CIDRS":     "192.168.5.0/24, fd00::/8",
-	}, shown)
-
-	assert.Contains(
-		t, body, `href="/settings"`,
-		"the navigation bar links to the page",
-	)
-}
-
-func TestSettingsPageShowsUnsetValues(t *testing.T) {
-	t.Parallel()
-
-	const metricsPassword = "metrics-password-1f9a"
-
-	shown, body := settingsShown(t, &config.Config{
-		DataDir:         t.TempDir(),
-		MetricsPassword: metricsPassword,
-	})
-
-	assert.Equal(t, "not set", shown["METRICS_USERNAME"])
-	assert.Equal(t, "set", shown["METRICS_PASSWORD"])
-	assert.Equal(t, "not set", shown["SENTRY_DSN"])
-	assert.NotContains(t, body, metricsPassword)
-	assert.Equal(t, "none", shown["TRUSTED_PROXIES"])
-	assert.Equal(t, "none", shown["ALLOWED_EGRESS_CIDRS"])
-}
-
-func TestSettingsPageShowsSentryDSNOnlyAsSet(t *testing.T) {
-	t.Parallel()
-
-	const (
-		sentryKey = "dsnkey7c2e"
-		sentryDSN = "https://" + sentryKey + "@errors.example.com/42"
-	)
-
-	shown, body := settingsShown(t, &config.Config{
-		DataDir:   t.TempDir(),
-		SentryDSN: sentryDSN,
-	})
-
-	assert.Equal(t, "not set", shown["METRICS_USERNAME"])
-	assert.Equal(t, "not set", shown["METRICS_PASSWORD"])
-	assert.Equal(t, "set", shown["SENTRY_DSN"])
-	assert.NotContains(t, body, sentryKey)
-}

internal/handlers/source_delete_test.go

@@ -1,10 +1,8 @@
 package handlers_test
 
 import (
-	"bytes"
 	"context"
 	"errors"
-	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -17,7 +15,6 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
 	"sneak.berlin/go/webhooker/internal/handlers"
 	"sneak.berlin/go/webhooker/internal/session"
 )
@@ -82,10 +79,6 @@ func seedTarget(
 // from a delete statement.
 var errInjectedDelete = errors.New("injected delete failure")
 
-// errInjectedSave is the failure failSaveOnTable reports from a
-// save of an existing row.
-var errInjectedSave = errors.New("injected save failure")
-
 // seedEntrypoint inserts an entrypoint for a webhook.
 func seedEntrypoint(
 	t *testing.T,
@@ -153,42 +146,19 @@ func failDeleteOnTable(
 	)
 }
 
-// failSaveOnTable is failDeleteOnTable for saves: every update of
-// an existing row in the named table fails.
-func failSaveOnTable(
-	t *testing.T,
-	db *database.Database,
-	table string,
-) {
-	t.Helper()
-
-	require.NoError(t, db.DB().Callback().Update().
-		Before("gorm:update").
-		Register(
-			"test:fail_save_"+table,
-			func(tx *gorm.DB) {
-				if tx.Statement.Table == table {
-					_ = tx.AddError(errInjectedSave)
-				}
-			},
-		),
-	)
-}
-
 // archivePathFor returns the archive database path the
-// delivery engine would use for a database target: beside the
+// delivery engine would use for a webhook: beside the webhook's
-// webhook's event database in the data directory.
+// event database in the data directory.
 func archivePathFor(
 	t *testing.T,
 	mgr *database.WebhookDBManager,
-	wh *database.Webhook,
+	webhookID string,
-	tgt *database.Target,
 ) string {
 	t.Helper()
 
 	return filepath.Join(
-		filepath.Dir(mgr.DBPath(wh.ID)),
+		filepath.Dir(mgr.DBPath(webhookID)),
-		delivery.ArchiveFileName(wh.Name, tgt.Name, tgt.ID),
+		"archive-"+webhookID+".db",
 	)
 }
 
@@ -225,8 +195,8 @@ func postRequest(
 
 // TestHandleSourceDelete_EvictsArchiveWriter proves that
 // deleting a webhook reaches the delivery engine and releases
-// the webhook's archive writers, exercised through the real
+// the webhook's archive writer, exercised through the real
-// deletion handler rather than by calling the engine directly.
+// deletion handler rather than by calling the evictor directly.
 func TestHandleSourceDelete_EvictsArchiveWriter(t *testing.T) {
 	t.Parallel()
 
@@ -234,7 +204,7 @@ func TestHandleSourceDelete_EvictsArchiveWriter(t *testing.T) {
 		h    *handlers.Handlers
 		sess *session.Session
 		db   *database.Database
-		ev   *recordingArchives
+		ev   *recordingEvictor
 	)
 
 	app := newTestApp(t, &h, &sess, &db, &ev)
@@ -284,10 +254,9 @@ func TestHandleSourceDelete_KeepsArchiveFile(t *testing.T) {
 	t.Cleanup(app.RequireStop)
 
 	wh := seedWebhook(t, db)
-	tgt := seedTarget(t, db, wh.ID, database.TargetTypeDatabase)
 
 	// Place an archive file where the delivery engine would.
-	archivePath := archivePathFor(t, mgr, wh, tgt)
+	archivePath := archivePathFor(t, mgr, wh.ID)
 	require.NoError(
 		t,
 		writeArchivePlaceholder(archivePath),
@@ -468,132 +437,68 @@ func TestHandleSourceDelete_RemovesConfigAndEventDatabase(
 	)
 }
 
-// TestHandleSourceDelete_LeftoverSidecar proves that when the event
+// TestHandleTargetDelete_EvictsWhenLastDatabaseTargetGone
-// database file is removed but a sidecar beside it is not, the
+// proves that removing the last database target releases the
-// operator is told the events are gone, never that the event
+// archive writer.
-// database file is still there.
+func TestHandleTargetDelete_EvictsWhenLastDatabaseTargetGone(
-func TestHandleSourceDelete_LeftoverSidecar(t *testing.T) {
+	t *testing.T,
+) {
 	t.Parallel()
 
 	var (
 		h    *handlers.Handlers
 		sess *session.Session
 		db   *database.Database
-		mgr  *database.WebhookDBManager
+		ev   *recordingEvictor
 	)
 
-	app := newTestApp(t, &h, &sess, &db, &mgr)
+	app := newTestApp(t, &h, &sess, &db, &ev)
 	app.RequireStart()
 
 	t.Cleanup(app.RequireStop)
 
-	logs := new(bytes.Buffer)
-	h.SetLogForTest(slog.New(slog.NewTextHandler(logs, nil)))
-
 	wh := seedWebhook(t, db)
-
+	tgt := seedTarget(
-	require.NoError(t, mgr.CreateDB(wh.ID))
+		t, db, wh.ID, database.TargetTypeDatabase,
-	// Closing removes the sidecars, so the -wal below is the only
+	)
-	// one there.
-	require.NoError(t, mgr.CloseAll())
-
-	// A non-empty directory in the -wal file's place, which
-	// os.Remove cannot remove whoever runs the test.
-	eventDBPath := mgr.DBPath(wh.ID)
-	require.NoError(t, os.MkdirAll(
-		filepath.Join(eventDBPath+"-wal", "keep"), 0o700,
-	))
 
 	cookies := authenticatedCookies(
 		t, sess, deleteTestUserID, deleteTestUsername,
 	)
 
 	req := postRequest(
-		"/hook/"+wh.ID+"/delete",
+		"/hook/"+wh.ID+"/targets/"+tgt.ID+"/delete",
 		cookies,
-		map[string]string{paramSourceID: wh.ID},
+		map[string]string{
+			paramSourceID: wh.ID,
+			paramTargetID: tgt.ID,
+		},
 	)
 	w := httptest.NewRecorder()
 
-	h.HandleSourceDelete().ServeHTTP(w, req)
+	h.HandleTargetDelete().ServeHTTP(w, req)
 
-	assert.Equal(t, http.StatusInternalServerError, w.Code)
+	require.Equal(t, http.StatusSeeOther, w.Code)
-	assert.NoFileExists(t, eventDBPath)
+	assert.Equal(
-	assert.Contains(t, logs.String(), "its events are gone")
+		t, []string{wh.ID}, ev.Evicted(),
-	assert.Contains(t, logs.String(), eventDBPath+"-wal")
+		"removing the last database target should evict",
-	assert.NotContains(
-		t, logs.String(), handlers.EventDBLeftMsgForTest,
-		"the events are gone, so the operator must not be told "+
-			"the event database file survived",
 	)
 }
 
-// TestHandleSourceDelete_LeftoverDatabaseFile proves that when the
+// TestHandleTargetDelete_KeepsWriterWhenDatabaseTargetRemains
-// event database file itself cannot be removed, the operator is told
+// proves that deleting one of several database targets leaves
-// it is still on disk, never that its events are gone.
+// the still-needed archive writer alone: the surviving target
-func TestHandleSourceDelete_LeftoverDatabaseFile(t *testing.T) {
+// keeps archiving to the same file, so the writer must stay.
+func TestHandleTargetDelete_KeepsWriterWhenDatabaseTargetRemains(
+	t *testing.T,
+) {
 	t.Parallel()
 
 	var (
 		h    *handlers.Handlers
 		sess *session.Session
 		db   *database.Database
-		mgr  *database.WebhookDBManager
+		ev   *recordingEvictor
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &mgr)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	logs := new(bytes.Buffer)
-	h.SetLogForTest(slog.New(slog.NewTextHandler(logs, nil)))
-
-	wh := seedWebhook(t, db)
-
-	// A non-empty directory in the database file's place, which
-	// os.Remove cannot remove whoever runs the test.
-	eventDBPath := mgr.DBPath(wh.ID)
-	require.NoError(t, os.MkdirAll(
-		filepath.Join(eventDBPath, "keep"), 0o700,
-	))
-
-	cookies := authenticatedCookies(
-		t, sess, deleteTestUserID, deleteTestUsername,
-	)
-
-	req := postRequest(
-		"/hook/"+wh.ID+"/delete",
-		cookies,
-		map[string]string{paramSourceID: wh.ID},
-	)
-	w := httptest.NewRecorder()
-
-	h.HandleSourceDelete().ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusInternalServerError, w.Code)
-	assert.Contains(
-		t, logs.String(), "event database file is still on disk",
-	)
-	assert.Contains(t, logs.String(), eventDBPath)
-	assert.NotContains(
-		t, logs.String(), handlers.SidecarLeftMsgForTest,
-		"the database file is still on disk, so the operator must "+
-			"not be told its events are gone",
-	)
-}
-
-// TestHandleTargetDelete_EvictsThatTarget proves that deleting a
-// database target releases that target's archive writer and no
-// other: the webhook's other database target keeps its own.
-func TestHandleTargetDelete_EvictsThatTarget(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h    *handlers.Handlers
-		sess *session.Session
-		db   *database.Database
-		ev   *recordingArchives
 	)
 
 	app := newTestApp(t, &h, &sess, &db, &ev)
@@ -624,17 +529,17 @@ func TestHandleTargetDelete_EvictsThatTarget(t *testing.T) {
 	h.HandleTargetDelete().ServeHTTP(w, req)
 
 	require.Equal(t, http.StatusSeeOther, w.Code)
-	assert.Equal(
+	assert.Empty(
-		t, []string{doomed.ID}, ev.EvictedTargets(),
+		t, ev.Evicted(),
-		"deleting a database target should evict its writer",
+		"a second database target still needs the writer",
 	)
-	assert.Empty(t, ev.Evicted(), "the webhook is not deleted")
 }
 
-// TestHandleTargetDelete_IgnoresAnotherWebhooksTarget proves that
+// TestHandleTargetDelete_KeepsWriterWhenOtherTypeDeleted proves
-// a target id from the URL that is not a target of the webhook
+// that deleting a target of an unrelated type leaves a
-// deletes nothing and so evicts nothing.
+// still-needed archive writer alone: the webhook's database
-func TestHandleTargetDelete_IgnoresAnotherWebhooksTarget(
+// target is untouched, so its writer must stay.
+func TestHandleTargetDelete_KeepsWriterWhenOtherTypeDeleted(
 	t *testing.T,
 ) {
 	t.Parallel()
@@ -643,7 +548,7 @@ func TestHandleTargetDelete_IgnoresAnotherWebhooksTarget(
 		h    *handlers.Handlers
 		sess *session.Session
 		db   *database.Database
-		ev   *recordingArchives
+		ev   *recordingEvictor
 	)
 
 	app := newTestApp(t, &h, &sess, &db, &ev)
@@ -652,20 +557,19 @@ func TestHandleTargetDelete_IgnoresAnotherWebhooksTarget(
 	t.Cleanup(app.RequireStop)
 
 	wh := seedWebhook(t, db)
-	elsewhere := seedTarget(
+	seedTarget(t, db, wh.ID, database.TargetTypeDatabase)
-		t, db, seedWebhook(t, db).ID, database.TargetTypeDatabase,
+	other := seedTarget(t, db, wh.ID, database.TargetTypeLog)
-	)
 
 	cookies := authenticatedCookies(
 		t, sess, deleteTestUserID, deleteTestUsername,
 	)
 
 	req := postRequest(
-		"/hook/"+wh.ID+"/targets/"+elsewhere.ID+"/delete",
+		"/hook/"+wh.ID+"/targets/"+other.ID+"/delete",
 		cookies,
 		map[string]string{
 			paramSourceID: wh.ID,
-			paramTargetID: elsewhere.ID,
+			paramTargetID: other.ID,
 		},
 	)
 	w := httptest.NewRecorder()
@@ -674,7 +578,7 @@ func TestHandleTargetDelete_IgnoresAnotherWebhooksTarget(
 
 	require.Equal(t, http.StatusSeeOther, w.Code)
 	assert.Empty(
-		t, ev.EvictedTargets(),
+		t, ev.Evicted(),
-		"another webhook's target must not be evicted",
+		"a surviving database target must keep its writer",
 	)
 }

internal/handlers/source_list_test.go

@@ -1,467 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/logger"
-	"sneak.berlin/go/webhooker/internal/session"
-)
-
-// failedHighlight is how the list marks a number of failed deliveries
-// that is not zero.
-const failedHighlight = `class="font-medium text-red-600"`
-
-// listWebhook adds a webhook with the given name, owned by the test
-// user.
-func listWebhook(
-	t *testing.T, db *database.Database, name string,
-) *database.Webhook {
-	t.Helper()
-
-	wh := &database.Webhook{UserID: deleteTestUserID, Name: name}
-	require.NoError(t, db.DB().Omit(clause.Associations).Create(wh).Error)
-
-	return wh
-}
-
-// addEntrypoints adds the given number of entrypoints, all active or
-// all inactive, to a webhook and returns their paths.
-func addEntrypoints(
-	t *testing.T, db *database.Database, webhookID string,
-	count int, active bool,
-) []string {
-	t.Helper()
-
-	paths := make([]string, count)
-	for i := range paths {
-		paths[i] = statsEntrypoint(t, db, webhookID, active)
-	}
-
-	return paths
-}
-
-// addTargets adds the given number of targets, all active or all
-// inactive, to a webhook and returns them.
-func addTargets(
-	t *testing.T, db *database.Database, webhookID string,
-	count int, active bool,
-) []*database.Target {
-	t.Helper()
-
-	targets := make([]*database.Target, count)
-	for i := range targets {
-		targets[i] = seedTarget(t, db, webhookID, database.TargetTypeLog)
-		require.NoError(t, db.DB().Model(targets[i]).
-			Update("active", active).Error)
-	}
-
-	return targets
-}
-
-// renderWebhookList runs the real webhook list handler as the test user
-// and returns the rendered page.
-func renderWebhookList(
-	t *testing.T, h *handlers.Handlers, sess *session.Session,
-) string {
-	t.Helper()
-
-	cookies := authenticatedCookies(
-		t, sess, deleteTestUserID, deleteTestUsername,
-	)
-
-	w := httptest.NewRecorder()
-	h.HandleSourceList().ServeHTTP(
-		w, getRequest(t, "/hooks", cookies, nil),
-	)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	return w.Body.String()
-}
-
-// listCard returns one webhook's entry in a rendered webhook list, its
-// markup as rendered and its text with the markup taken out and each
-// run of space made one space.
-func listCard(t *testing.T, page, webhookID string) (string, string) {
-	t.Helper()
-
-	_, card, found := strings.Cut(page, `href="/hook/`+webhookID+`"`)
-	require.True(t, found, "the list has no entry for %s", webhookID)
-
-	card, _, _ = strings.Cut(card, "</a>")
-	text := regexp.MustCompile(`<[^>]*>`).ReplaceAllString(card, " ")
-
-	return card, strings.Join(strings.Fields(text), " ")
-}
-
-// receiveEvents posts the given number of events to an entrypoint
-// through the real receiver, and returns the webhook's event database
-// and its events, oldest first.
-func receiveEvents(
-	t *testing.T,
-	h *handlers.Handlers,
-	dbMgr *database.WebhookDBManager,
-	webhookID, path string,
-	count int,
-) (*gorm.DB, []database.Event) {
-	t.Helper()
-
-	router := receiverRouter(h)
-
-	for range count {
-		require.Equal(t, http.StatusOK, postReceiver(t, router, path))
-	}
-
-	webhookDB, err := dbMgr.GetDB(webhookID)
-	require.NoError(t, err)
-
-	events := listEvents(t, webhookDB)
-	require.Len(t, events, count)
-
-	return webhookDB, events
-}
-
-// seedFailingWebhook adds a webhook with six entrypoints, two of them
-// inactive, and seven targets, five of them inactive. Four events reach
-// its two active targets, arriving 31, 5, 4 and 3 hours ago, and its
-// event totals row records the last one. Three deliveries failed in the
-// last 24 hours, two to the first target and one to the second, one
-// failed 30 hours ago, two were delivered, and two are still pending.
-// It returns the webhook and when its last event arrived.
-func seedFailingWebhook(
-	t *testing.T,
-	h *handlers.Handlers,
-	db *database.Database,
-	dbMgr *database.WebhookDBManager,
-) (*database.Webhook, time.Time) {
-	t.Helper()
-
-	wh := listWebhook(t, db, "failing")
-	paths := addEntrypoints(t, db, wh.ID, 4, true)
-	addEntrypoints(t, db, wh.ID, 2, false)
-
-	active := addTargets(t, db, wh.ID, 2, true)
-	first, second := active[0], active[1]
-
-	addTargets(t, db, wh.ID, 5, false)
-
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, paths[0], 4)
-	now := time.Now()
-	lastEventAt := now.Add(-3 * time.Hour)
-
-	statsAge(t, webhookDB, events[0].ID, now.Add(-31*time.Hour))
-	statsAge(t, webhookDB, events[1].ID, now.Add(-5*time.Hour))
-	statsAge(t, webhookDB, events[2].ID, now.Add(-4*time.Hour))
-	statsAge(t, webhookDB, events[3].ID, lastEventAt)
-	require.NoError(t, database.AddEventTotals(webhookDB,
-		database.EventTotals{LastEventAt: &lastEventAt}))
-
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[0].ID, first.ID),
-		database.DeliveryStatusFailed, now.Add(-30*time.Hour))
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[0].ID, second.ID),
-		database.DeliveryStatusDelivered, now.Add(-30*time.Hour))
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[1].ID, first.ID),
-		database.DeliveryStatusFailed, now.Add(-time.Hour))
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[2].ID, first.ID),
-		database.DeliveryStatusFailed, now.Add(-time.Minute))
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[2].ID, second.ID),
-		database.DeliveryStatusFailed, now.Add(-time.Minute))
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[3].ID, second.ID),
-		database.DeliveryStatusDelivered, now.Add(-time.Minute))
-
-	return wh, lastEventAt
-}
-
-// seedHealthyWebhook adds a webhook with four entrypoints and two
-// targets, all active, and three events, arriving 8, 7 and 6 hours ago
-// and each delivered to both targets. Its event totals row records the
-// last event. It returns the webhook and when its last event arrived.
-func seedHealthyWebhook(
-	t *testing.T,
-	h *handlers.Handlers,
-	db *database.Database,
-	dbMgr *database.WebhookDBManager,
-) (*database.Webhook, time.Time) {
-	t.Helper()
-
-	wh := listWebhook(t, db, "healthy")
-	paths := addEntrypoints(t, db, wh.ID, 4, true)
-	targets := addTargets(t, db, wh.ID, 2, true)
-
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, paths[0], 3)
-	now := time.Now()
-	lastEventAt := now.Add(-6 * time.Hour)
-
-	statsAge(t, webhookDB, events[0].ID, now.Add(-8*time.Hour))
-	statsAge(t, webhookDB, events[1].ID, now.Add(-7*time.Hour))
-	statsAge(t, webhookDB, events[2].ID, lastEventAt)
-	require.NoError(t, database.AddEventTotals(webhookDB,
-		database.EventTotals{LastEventAt: &lastEventAt}))
-
-	for _, ev := range events {
-		for _, target := range targets {
-			statsFinish(t, webhookDB,
-				statsDelivery(t, webhookDB, ev.ID, target.ID),
-				database.DeliveryStatusDelivered, now)
-		}
-	}
-
-	return wh, lastEventAt
-}
-
-// lastEventText is how the list shows when the last event arrived.
-func lastEventText(at time.Time) string {
-	return at.UTC().Format("2006-01-02 15:04:05 UTC")
-}
-
-// TestSourceList_ShowsActivityOfEachWebhook checks the figures the list
-// shows for a webhook with recent failures, a healthy one, a new one
-// that has received no event, and one without an event database.
-func TestSourceList_ShowsActivityOfEachWebhook(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h     *handlers.Handlers
-		sess  *session.Session
-		db    *database.Database
-		dbMgr *database.WebhookDBManager
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	failing, failingLastEvent := seedFailingWebhook(t, h, db, dbMgr)
-	healthy, healthyLastEvent := seedHealthyWebhook(t, h, db, dbMgr)
-
-	// Creating a webhook creates its event database.
-	fresh := listWebhook(t, db, "fresh")
-	require.NoError(t, dbMgr.CreateDB(fresh.ID))
-	addEntrypoints(t, db, fresh.ID, 2, true)
-	addTargets(t, db, fresh.ID, 3, true)
-
-	quiet := listWebhook(t, db, "quiet")
-	addEntrypoints(t, db, quiet.ID, 2, true)
-	addTargets(t, db, quiet.ID, 3, true)
-
-	page := renderWebhookList(t, h, sess)
-
-	card, text := listCard(t, page, failing.ID)
-	assert.Contains(t, text, "6 entrypoints, 2 inactive")
-	assert.Contains(t, text, "7 targets, 5 inactive")
-	assert.Contains(t, text, "4 events within retention")
-	assert.Contains(t, text, "Last event "+lastEventText(failingLastEvent))
-	assert.Contains(t, card,
-		failedHighlight+">3 failed deliveries in the last 24 hours<")
-
-	card, text = listCard(t, page, healthy.ID)
-	assert.Contains(t, text, "4 entrypoints")
-	assert.Contains(t, text, "2 targets")
-	assert.Contains(t, text, "3 events within retention")
-	assert.Contains(t, text, "Last event "+lastEventText(healthyLastEvent))
-	assert.Contains(t, text, "0 failed deliveries in the last 24 hours")
-	assert.NotContains(t, text, "inactive")
-	assert.NotContains(t, card, failedHighlight)
-
-	card, text = listCard(t, page, fresh.ID)
-	assert.Contains(t, text, "2 entrypoints")
-	assert.Contains(t, text, "3 targets")
-	assert.Contains(t, text, "0 events within retention")
-	assert.Contains(t, text, "No events yet")
-	assert.Contains(t, text, "0 failed deliveries in the last 24 hours")
-	assert.NotContains(t, card, failedHighlight)
-
-	card, text = listCard(t, page, quiet.ID)
-	assert.Contains(t, text, "2 entrypoints")
-	assert.Contains(t, text, "3 targets")
-	assert.Contains(t, text, "0 events within retention")
-	assert.Contains(t, text, "No events yet")
-	assert.Contains(t, text, "0 failed deliveries in the last 24 hours")
-	assert.NotContains(t, card, failedHighlight)
-	assert.False(t, dbMgr.DBExists(quiet.ID),
-		"showing the list must not create an event database")
-}
-
-// TestSourceList_CountsOnlyEventsWithinRetention checks that once
-// retention has removed one of a webhook's three events, the list
-// counts the two still stored.
-func TestSourceList_CountsOnlyEventsWithinRetention(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h     *handlers.Handlers
-		sess  *session.Session
-		db    *database.Database
-		dbMgr *database.WebhookDBManager
-		log   *logger.Logger
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr, &log)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	wh := &database.Webhook{
-		UserID: deleteTestUserID, Name: "pruned", RetentionDays: 14,
-	}
-	require.NoError(t, db.DB().Omit(clause.Associations).Create(wh).Error)
-
-	paths := addEntrypoints(t, db, wh.ID, 3, true)
-	addTargets(t, db, wh.ID, 4, true)
-
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, paths[0], 3)
-
-	statsAge(t, webhookDB, events[0].ID, time.Now().Add(-15*24*time.Hour))
-	statsPrune(t, db, dbMgr, log, webhookDB)
-	require.Len(t, listEvents(t, webhookDB), 2)
-
-	_, text := listCard(t, renderWebhookList(t, h, sess), wh.ID)
-	assert.Contains(t, text, "3 entrypoints")
-	assert.Contains(t, text, "4 targets")
-	assert.Contains(t, text, "2 events within retention")
-}
-
-// TestSourceList_LastEventSurvivesPruningEveryEvent checks that once
-// retention has removed every event of a webhook, the list still shows
-// when the last one arrived rather than "No events yet".
-func TestSourceList_LastEventSurvivesPruningEveryEvent(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h     *handlers.Handlers
-		sess  *session.Session
-		db    *database.Database
-		dbMgr *database.WebhookDBManager
-		log   *logger.Logger
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr, &log)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	wh := &database.Webhook{
-		UserID: deleteTestUserID, Name: "emptied", RetentionDays: 1,
-	}
-	require.NoError(t, db.DB().Omit(clause.Associations).Create(wh).Error)
-
-	paths := addEntrypoints(t, db, wh.ID, 2, true)
-	addTargets(t, db, wh.ID, 3, true)
-
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, paths[0], 1)
-	lastEventAt := time.Now().Add(-50 * time.Hour)
-
-	statsAge(t, webhookDB, events[0].ID, lastEventAt)
-	require.NoError(t, database.AddEventTotals(webhookDB,
-		database.EventTotals{LastEventAt: &lastEventAt}))
-	statsPrune(t, db, dbMgr, log, webhookDB)
-	require.Empty(t, listEvents(t, webhookDB))
-
-	_, text := listCard(t, renderWebhookList(t, h, sess), wh.ID)
-	assert.Contains(t, text, "0 events within retention")
-	assert.Contains(t, text, "Last event "+lastEventText(lastEventAt))
-	assert.NotContains(t, text, "No events yet")
-}
-
-// TestSourceList_CountsOfOneInSingular checks that a webhook with one
-// entrypoint, one target, one event within retention and one failed
-// delivery in the last 24 hours has each written in the singular.
-func TestSourceList_CountsOfOneInSingular(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h     *handlers.Handlers
-		sess  *session.Session
-		db    *database.Database
-		dbMgr *database.WebhookDBManager
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	wh := listWebhook(t, db, "single")
-	paths := addEntrypoints(t, db, wh.ID, 1, true)
-	targets := addTargets(t, db, wh.ID, 1, true)
-
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, paths[0], 1)
-	now := time.Now()
-	lastEventAt := now.Add(-9 * time.Hour)
-
-	statsAge(t, webhookDB, events[0].ID, lastEventAt)
-	require.NoError(t, database.AddEventTotals(webhookDB,
-		database.EventTotals{LastEventAt: &lastEventAt}))
-	statsFinish(t, webhookDB,
-		statsDelivery(t, webhookDB, events[0].ID, targets[0].ID),
-		database.DeliveryStatusFailed, now.Add(-time.Hour))
-
-	card, text := listCard(t, renderWebhookList(t, h, sess), wh.ID)
-	assert.Contains(t, card, ">1 entrypoint<")
-	assert.Contains(t, card, ">1 target<")
-	assert.Contains(t, card, ">1 event within retention<")
-	assert.Contains(t, text, "Last event "+lastEventText(lastEventAt))
-	assert.Contains(t, card,
-		failedHighlight+">1 failed delivery in the last 24 hours<")
-}
-
-// TestSourceList_UnreadableEventDatabase checks that a webhook whose
-// event database cannot be read says so in its entry instead of
-// showing zeros, and that the rest of the list is still shown.
-func TestSourceList_UnreadableEventDatabase(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h     *handlers.Handlers
-		sess  *session.Session
-		db    *database.Database
-		dbMgr *database.WebhookDBManager
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	broken := listWebhook(t, db, "broken")
-	addEntrypoints(t, db, broken.ID, 2, true)
-	addTargets(t, db, broken.ID, 3, true)
-
-	brokenDB, err := dbMgr.GetDB(broken.ID)
-	require.NoError(t, err)
-	require.NoError(t,
-		brokenDB.Migrator().DropTable(&database.EventTotals{}))
-
-	quiet := listWebhook(t, db, "quiet")
-	addEntrypoints(t, db, quiet.ID, 2, true)
-	addTargets(t, db, quiet.ID, 3, true)
-
-	page := renderWebhookList(t, h, sess)
-
-	_, text := listCard(t, page, broken.ID)
-	assert.Contains(t, text, "2 entrypoints")
-	assert.Contains(t, text, "3 targets")
-	assert.Contains(t, text, "The event figures could not be read.")
-	assert.NotContains(t, text, "events")
-	assert.NotContains(t, text, "failed")
-
-	_, text = listCard(t, page, quiet.ID)
-	assert.Contains(t, text, "No events yet")
-}

internal/handlers/source_management.go

@@ -3,12 +3,10 @@ package handlers
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
 	"net/http"
 	"slices"
 	"strconv"
 	"strings"
-	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/google/uuid"
@@ -22,70 +20,79 @@ import (
 type WebhookListItem struct {
 	database.Webhook
 
-	EntrypointCount         int
+	EntrypointCount int64
-	InactiveEntrypointCount int
+	TargetCount     int64
-	TargetCount             int
+	EventCount      int64
-	InactiveTargetCount     int
-
-	// EventCount is how many events the webhook holds, LastEventAt
-	// when the newest arrived (nil before the first), and
-	// FailedLast24Hours how many of its deliveries failed in the last
-	// 24 hours. When the webhook's event database could not be read,
-	// EventsUnreadable is set and these three are not known.
-	EventCount        int64
-	LastEventAt       *time.Time
-	FailedLast24Hours int64
-	EventsUnreadable  bool
 }
 
 // errMissingURL signals that a required URL was not provided.
 var errMissingURL = errors.New("missing URL")
 
-// parseRetentionDays interprets a retention_days form value. It
+// errInvalidRetention signals a retention_days form value that is not
-// returns the number of days, or, for a value it refuses, the message
+// a non-negative whole number.
-// the create and edit forms show; the message is empty when the value
+var errInvalidRetention = errors.New("invalid retention days")
-// is accepted.
+
+// errRetentionTooLarge signals a retention_days form value that is a
+// whole number but larger than the reaper's cutoff arithmetic can
+// represent. It is distinguished from errInvalidRetention so the form
+// can tell the user the actual ceiling instead of implying their input
+// was not a number.
+var errRetentionTooLarge = errors.New("retention days out of range")
+
+// retentionErrorMessage returns the message the create and edit forms
+// show the user for a rejected retention_days value. Any error other
+// than errRetentionTooLarge falls back to the generic wording, so an
+// unrecognised parse failure still produces a sensible 400 rather than
+// an empty alert.
+func retentionErrorMessage(err error) string {
+	if errors.Is(err, errRetentionTooLarge) {
+		return "Retention must be at most " +
+			strconv.Itoa(database.MaxFiniteRetentionDays) +
+			" days, or 0 to retain events forever."
+	}
+
+	return "Retention must be a whole number of days, or 0 to " +
+		"retain events forever."
+}
+
+// parseRetentionDays interprets a retention_days form value.
 //
 // An empty value yields fallback, which lets the create path apply the
 // default and the edit path leave the stored value unchanged. A value
 // of 0 is returned as 0 and is rewritten to the retain-forever
 // sentinel by database.Webhook's BeforeSave hook. Anything unparseable
-// or negative is refused rather than silently given a default.
+// or negative is an error rather than a silently substituted default.
 //
 // The upper bound is not cosmetic. The reaper computes its cutoff as a
 // time.Duration, an int64 nanosecond count, so a day count above
 // database.MaxFiniteRetentionDays overflows, puts the cutoff in the
 // future, and deletes every event the webhook has. A finite value
-// above that ceiling is therefore refused, and the message names the
+// above that ceiling is therefore a 400.
-// ceiling rather than implying the input was not a number.
 //
 // A value at or above the retain-forever sentinel is not out of range:
 // it is what the edit form pre-fills for a retain-forever webhook, so
 // submitting the form back unchanged has to keep meaning "forever"
 // rather than being rejected.
-func parseRetentionDays(raw string, fallback int) (int, string) {
+func parseRetentionDays(raw string, fallback int) (int, error) {
 	raw = strings.TrimSpace(raw)
 	if raw == "" {
-		return fallback, ""
+		return fallback, nil
 	}
 
 	v, err := strconv.Atoi(raw)
 	if err != nil || v < 0 {
-		return 0, "Retention must be a whole number of days, or 0 to " +
+		return 0, errInvalidRetention
-			"retain events forever."
 	}
 
 	if v >= database.RetentionForeverDays {
-		return database.RetentionForeverDays, ""
+		return database.RetentionForeverDays, nil
 	}
 
 	if v > database.MaxFiniteRetentionDays {
-		return 0, "Retention must be at most " +
+		return 0, errRetentionTooLarge
-			strconv.Itoa(database.MaxFiniteRetentionDays) +
-			" days, or 0 to retain events forever."
 	}
 
-	return v, ""
+	return v, nil
 }
 
 // DeliveryView is the display-safe projection of a delivery
@@ -147,12 +154,7 @@ func (h *Handlers) HandleSourceList() http.HandlerFunc {
 			return
 		}
 
-		items, err := h.buildWebhookListItems(webhooks)
+		items := h.buildWebhookListItems(webhooks)
-		if err != nil {
-			h.serverError(w, r, "failed to list webhooks", err)
-
-			return
-		}
 
 		data := map[string]any{
 			"Webhooks": items,
@@ -162,115 +164,36 @@ func (h *Handlers) HandleSourceList() http.HandlerFunc {
 	}
 }
 
-// buildWebhookListItems builds the list's entry for each webhook. It
+// buildWebhookListItems builds list items with counts.
-// fails when the main database cannot be read. A webhook whose event
-// database cannot be read is marked on its own entry, and the error is
-// logged.
 func (h *Handlers) buildWebhookListItems(
 	webhooks []database.Webhook,
-) ([]WebhookListItem, error) {
+) []WebhookListItem {
 	items := make([]WebhookListItem, len(webhooks))
-	since := time.Now().Add(-longWindow)
 
 	for i := range webhooks {
-		item := &items[i]
+		items[i].Webhook = webhooks[i]
-		item.Webhook = webhooks[i]
 
-		var err error
+		h.db.DB().Model(&database.Entrypoint{}).Where(
+			"webhook_id = ?", webhooks[i].ID,
+		).Count(&items[i].EntrypointCount)
 
-		item.EntrypointCount, item.InactiveEntrypointCount, err =
+		h.db.DB().Model(&database.Target{}).Where(
-			h.countWithInactive(&database.Entrypoint{}, item.ID)
+			"webhook_id = ?", webhooks[i].ID,
-		if err != nil {
+		).Count(&items[i].TargetCount)
-			return nil, err
-		}
 
-		item.TargetCount, item.InactiveTargetCount, err =
+		if h.dbMgr.DBExists(webhooks[i].ID) {
-			h.countWithInactive(&database.Target{}, item.ID)
+			webhookDB, err := h.dbMgr.GetDB(
-		if err != nil {
+				webhooks[i].ID,
-			return nil, err
-		}
-
-		// Opening an event database that does not exist would create
-		// it, and it would hold nothing to count.
-		if !h.dbMgr.DBExists(item.ID) {
-			continue
-		}
-
-		err = h.readListEventFigures(item, since)
-		if err != nil {
-			h.log.Error(
-				"failed to read webhook list figures",
-				"webhook_id", item.ID,
-				"error", err,
 			)
-
+			if err == nil {
-			item.EventsUnreadable = true
+				webhookDB.Model(
+					&database.Event{},
+				).Count(&items[i].EventCount)
+			}
 		}
 	}
 
-	return items, nil
+	return items
-}
-
-// countWithInactive returns how many entrypoints or targets, as model
-// says, a webhook has, and how many of them are inactive.
-func (h *Handlers) countWithInactive(
-	model any, webhookID string,
-) (int, int, error) {
-	var active []bool
-
-	err := h.db.DB().Model(model).
-		Where("webhook_id = ?", webhookID).
-		Pluck("active", &active).Error
-	if err != nil {
-		return 0, 0, fmt.Errorf(
-			"reading active flags of webhook %s: %w", webhookID, err,
-		)
-	}
-
-	inactive := 0
-
-	for _, a := range active {
-		if !a {
-			inactive++
-		}
-	}
-
-	return len(active), inactive, nil
-}
-
-// readListEventFigures fills in the figures the list shows from the
-// webhook's event database, with the statistics pane's own queries:
-// the event count and last arrival from the event totals row, and the
-// deliveries that failed since the given time from the deliveries'
-// status index.
-func (h *Handlers) readListEventFigures(
-	item *WebhookListItem, since time.Time,
-) error {
-	webhookDB, err := h.dbMgr.GetDB(item.ID)
-	if err != nil {
-		return err
-	}
-
-	var totals database.EventTotals
-
-	err = webhookDB.Take(&totals).Error
-	if err != nil {
-		return fmt.Errorf("reading event totals: %w", err)
-	}
-
-	item.EventCount = totals.Events - totals.EventsRemoved
-	item.LastEventAt = totals.LastEventAt
-
-	byTarget, err := finishedByTarget(webhookDB, since)
-	if err != nil {
-		return err
-	}
-
-	for _, f := range byTarget {
-		item.FailedLast24Hours += f.Failed
-	}
-
-	return nil
 }
 
 // HandleSourceCreate shows the form to create a new webhook.
@@ -330,25 +253,28 @@ func (h *Handlers) HandleSourceCreateSubmit() http.HandlerFunc {
 		retentionStr := r.PostFormValue("retention_days")
 
 		if name == "" {
-			h.renderTemplateStatus(
+			w.WriteHeader(http.StatusBadRequest)
+			h.renderTemplate(
 				w, r, "sources_new.html",
 				newSourceFormData(
 					"Name is required", name, description,
 				),
-				http.StatusBadRequest,
 			)
 
 			return
 		}
 
-		retentionDays, errMsg := parseRetentionDays(
+		retentionDays, retErr := parseRetentionDays(
 			retentionStr, database.DefaultRetentionDays,
 		)
-		if errMsg != "" {
+		if retErr != nil {
-			h.renderTemplateStatus(
+			w.WriteHeader(http.StatusBadRequest)
+			h.renderTemplate(
 				w, r, "sources_new.html",
-				newSourceFormData(errMsg, name, description),
+				newSourceFormData(
-				http.StatusBadRequest,
+					retentionErrorMessage(retErr),
+					name, description,
+				),
 			)
 
 			return
@@ -579,9 +505,6 @@ func (h *Handlers) HandleSourceEditSubmit() http.HandlerFunc {
 
 		sourceID := chi.URLParam(r, "sourceID")
 
-		h.renameMu.Lock()
-		defer h.renameMu.Unlock()
-
 		var webhook database.Webhook
 
 		err := h.db.DB().Where(
@@ -621,68 +544,36 @@ func (h *Handlers) applyWebhookEdit(
 			tmplKeyError:   "Name is required",
 		}
 
-		h.renderTemplateStatus(w, r, "source_edit.html", data, http.StatusBadRequest)
+		w.WriteHeader(http.StatusBadRequest)
+		h.renderTemplate(w, r, "source_edit.html", data)
 
 		return
 	}
 
-	oldName := webhook.Name
 	webhook.Name = name
 	webhook.Description = r.PostFormValue("description")
 
 	// An empty field falls back to the stored value, so submitting the
 	// form without touching retention leaves the policy alone.
-	retentionDays, errMsg := parseRetentionDays(
+	retentionDays, retErr := parseRetentionDays(
 		r.PostFormValue("retention_days"), webhook.RetentionDays,
 	)
-	if errMsg != "" {
+	if retErr != nil {
 		data := map[string]any{
 			tmplKeyWebhook: webhook,
-			tmplKeyError:   errMsg,
+			tmplKeyError:   retentionErrorMessage(retErr),
 		}
 
-		h.renderTemplateStatus(w, r, "source_edit.html", data, http.StatusBadRequest)
+		w.WriteHeader(http.StatusBadRequest)
+		h.renderTemplate(w, r, "source_edit.html", data)
 
 		return
 	}
 
 	webhook.RetentionDays = retentionDays
 
-	// A new name renames the archive files before it is saved (see
+	err := h.db.DB().Save(webhook).Error
-	// delivery.Engine.Rename). If either step fails, the same targets'
-	// archives go back to the name that is still stored, without
-	// reading the main database again.
-	targets, err := h.renameWebhookArchives(
-		webhook.ID, oldName, webhook.Name,
-	)
-	if err == nil {
-		err = h.db.DB().Save(webhook).Error
-	}
-
 	if err != nil {
-		restoreErr := h.renameArchives(targets, oldName)
-		if restoreErr != nil {
-			h.log.Error(
-				"failed to rename archives back",
-				"webhook_id", webhook.ID,
-				"error", restoreErr,
-			)
-		}
-
-		if errors.Is(err, delivery.ErrArchiveNameTaken) {
-			data := map[string]any{
-				tmplKeyWebhook: webhook,
-				tmplKeyError: "Not saved: " + err.Error() +
-					". Move that archive out of the data directory, " +
-					"its .db together with any -wal and -shm beside " +
-					"it, then save again.",
-			}
-
-			h.renderTemplateStatus(w, r, "source_edit.html", data, http.StatusConflict)
-
-			return
-		}
-
 		h.serverError(w, r, "failed to update webhook", err)
 
 		return
@@ -723,17 +614,6 @@ func (h *Handlers) HandleSourceDelete() http.HandlerFunc {
 	}
 }
 
-// The messages deleteWebhookResources logs when a file of the event
-// database cannot be removed: the database file itself, or only a
-// sidecar once the database file is gone.
-const (
-	eventDBLeftMsg = "webhook deleted, but its event database file is " +
-		"still on disk; remove it by hand"
-	sidecarLeftMsg = "webhook deleted and its events are gone, but a " +
-		"-wal or -shm sidecar of its event database is " +
-		"still on disk; remove it by hand"
-)
-
 // deleteWebhookResources soft-deletes config and hard-deletes
 // the per-webhook event database.
 func (h *Handlers) deleteWebhookResources(
@@ -773,18 +653,13 @@ func (h *Handlers) deleteWebhookResources(
 	err = h.dbMgr.DeleteDB(webhook.ID)
 	if err != nil {
 		// The configuration is committed, so the webhook is gone,
-		// but a file of its event database is still on disk with
+		// but its event database file is still on disk with
 		// nothing referencing it. Report the failure rather than
 		// redirecting as though everything succeeded: the file
 		// needs removing by hand, and the logged error names it.
-		// When only a sidecar is left, the events are already
+		h.serverError(
-		// gone, and the message must not suggest they survive.
+			w, r, "failed to delete webhook event database", err,
-		msg := eventDBLeftMsg
+		)
-		if errors.Is(err, database.ErrSidecarNotRemoved) {
-			msg = sidecarLeftMsg
-		}
-
-		h.serverError(w, r, msg, err)
 
 		return
 	}
@@ -836,11 +711,11 @@ func (h *Handlers) commitWebhookDeletion(
 	return tx.Commit().Error
 }
 
-// evictArchiveWriter asks the delivery engine to drop the cached
+// evictArchiveWriter asks the delivery engine to drop its
-// archive writers of a webhook's database targets, closing their
+// cached archive writer for a webhook, closing the archive file
-// archive file handles.
+// handle.
 //
-// The archive database files are NOT deleted. Unlike the event
+// The archive database file is NOT deleted. Unlike the event
 // database — which is per-webhook working storage and is
 // hard-deleted with the webhook — an archive is explicitly
 // long-term storage that an operator may want to keep or move
@@ -848,72 +723,50 @@ func (h *Handlers) commitWebhookDeletion(
 // deleting a webhook would be a surprising and unrecoverable
 // data loss, so the file is left for the operator to handle.
 func (h *Handlers) evictArchiveWriter(webhookID string) {
-	if h.archives == nil {
+	if h.evictor == nil {
 		return
 	}
 
-	h.archives.EvictWebhook(webhookID)
+	h.evictor.EvictWebhook(webhookID)
 }
 
-// evictTargetArchiveWriter is evictArchiveWriter for one deleted
+// evictArchiveWriterIfUnused releases a webhook's archive
-// target, and leaves its archive file on disk for the same reason.
+// writer once the webhook has no database target left to feed
-// A target that is not a database target has no writer, and
+// it.
-// evicting it does nothing.
+//
-func (h *Handlers) evictTargetArchiveWriter(targetID string) {
+// It is called after any child resource of a webhook is
-	if h.archives == nil {
+// deleted, and is correct without knowing which kind was: it
-		return
+// evicts only when no database target remains, so deleting one
-	}
+// of several database targets — or deleting an unrelated
-
+// target type — leaves a still-needed writer alone. When no
-	h.archives.EvictTarget(targetID)
+// database target ever existed there is no writer and eviction
-}
+// is a no-op. Soft-deleted targets are excluded by GORM's
-
+// default scope, so the row just deleted is not counted.
-// renameWebhookArchives renames the archive file of every database
+func (h *Handlers) evictArchiveWriterIfUnused(webhookID string) {
-// target of a webhook from the webhook name oldName to newName,
+	var remaining int64
-// keeping each target's own name. It does nothing when the name is
-// unchanged. It returns the targets it read, so that a failed edit can
-// move those same archives back with renameArchives.
-func (h *Handlers) renameWebhookArchives(
-	webhookID, oldName, newName string,
-) ([]database.Target, error) {
-	if h.archives == nil || oldName == newName {
-		return nil, nil
-	}
-
-	var targets []database.Target
 
 	err := h.db.DB().
+		Model(&database.Target{}).
 		Where(
 			"webhook_id = ? AND type = ?",
 			webhookID, database.TargetTypeDatabase,
 		).
-		Find(&targets).Error
+		Count(&remaining).Error
 	if err != nil {
-		return nil, err
+		h.log.Error(
-	}
+			"failed to count remaining database targets",
-
+			"webhook_id", webhookID,
-	return targets, h.renameArchives(targets, newName)
+			"error", err,
-}
-
-// renameArchives renames the archive file of each of the given
-// database targets to the webhook name webhookName, keeping each
-// target's own name. It tries every target even after one fails, so
-// that moving the archives back after a failed edit leaves none under
-// the new name, and returns every failure joined.
-func (h *Handlers) renameArchives(
-	targets []database.Target, webhookName string,
-) error {
-	var errs []error
-
-	for i := range targets {
-		err := h.archives.Rename(
-			targets[i].ID, webhookName, targets[i].Name,
 		)
-		if err != nil {
+
-			errs = append(errs, err)
+		return
-		}
 	}
 
-	return errors.Join(errs...)
+	if remaining > 0 {
+		return
+	}
+
+	h.evictArchiveWriter(webhookID)
 }
 
 // ownedWebhook resolves the request's sourceID parameter to a
@@ -1410,9 +1263,6 @@ func (h *Handlers) HandleTargetCreate() http.HandlerFunc {
 
 		sourceID := chi.URLParam(r, "sourceID")
 
-		h.renameMu.Lock()
-		defer h.renameMu.Unlock()
-
 		var webhook database.Webhook
 
 		err := h.db.DB().Where(
@@ -1710,11 +1560,10 @@ func (h *Handlers) validateTargetURL(
 		msg := "Invalid target URL: " + err.Error()
 
 		// Only a private or reserved address's refusal says how
-		// to allow it. Other refusals never do: link-local, the
+		// to allow it. Metadata refusals never do: link-local and
-		// unspecified addresses and the unconditional metadata
+		// the other unconditional metadata addresses cannot be
-		// addresses cannot be opened, and the default
+		// opened, and the default blocklist's public addresses,
-		// blocklist's public addresses, which listing does open,
+		// which listing does open, hand out credentials.
-		// hand out credentials.
 		if errors.Is(err, delivery.ErrBlockedPrivateOrReservedIP) {
 			msg += ". Private and reserved addresses are refused " +
 				"by default; the server's ALLOWED_EGRESS_CIDRS " +
@@ -1789,28 +1638,29 @@ func (h *Handlers) HandleEntrypointDelete() http.HandlerFunc {
 	)
 }
 
-// HandleTargetDelete handles deleting a target. A deleted
+// HandleTargetDelete handles deleting a target. Deleting the
-// database target's archive writer is evicted and its handle
+// last database target of a webhook leaves its archive writer
-// closed; the archive file is left on disk.
+// with nothing to write, so the writer is evicted and its
+// handle closed; the archive file is left on disk.
 func (h *Handlers) HandleTargetDelete() http.HandlerFunc {
 	return h.deleteChildResource(
 		"targetID", &database.Target{},
 		"failed to delete target",
-		h.evictTargetArchiveWriter,
+		h.evictArchiveWriterIfUnused,
 		targetDeleted,
 	)
 }
 
 // deleteChildResource returns a handler that deletes a child
 // resource (entrypoint or target) belonging to a webhook. The
-// optional afterDelete hook runs with the child's id once the
+// optional afterDelete hook runs with the webhook's id once the
-// delete has removed it, before the redirect, which carries done as
+// delete has succeeded, before the redirect, which carries done as
 // its notice.
 func (h *Handlers) deleteChildResource(
 	idParam string,
 	model any,
 	errMsg string,
-	afterDelete func(childID string),
+	afterDelete func(webhookID string),
 	done noticeCode,
 ) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
@@ -1847,10 +1697,8 @@ func (h *Handlers) deleteChildResource(
 			return
 		}
 
-		// Only for a row this webhook really had: the id came from
+		if afterDelete != nil {
-		// the URL and may name another webhook's child.
+			afterDelete(webhook.ID)
-		if afterDelete != nil && result.RowsAffected > 0 {
-			afterDelete(childID)
 		}
 
 		http.Redirect(
@@ -1901,13 +1749,9 @@ func (h *Handlers) HandleTargetToggle() http.HandlerFunc {
 				return false, err
 			}
 
-			// Only the active column: saving the whole row would
+			tgt.Active = !tgt.Active
-			// write back the name and settings read above over an
-			// edit saved since.
-			active := !tgt.Active
 
-			return active, h.db.DB().Model(&tgt).
+			return tgt.Active, h.db.DB().Save(&tgt).Error
-				Update("active", active).Error
 		},
 		"failed to toggle target",
 		targetActivated, targetDeactivated,

internal/handlers/source_management_test.go

@@ -2,20 +2,16 @@ package handlers_test
 
 import (
 	"context"
-	"errors"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"strconv"
 	"strings"
-	"sync/atomic"
 	"testing"
-	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/handlers"
@@ -191,8 +187,6 @@ func storedRetentionDays(
 type sourceTestEnv struct {
 	handlers *handlers.Handlers
 	db       *database.Database
-	dbMgr    *database.WebhookDBManager
-	archives *recordingArchives
 	cookies  []*http.Cookie
 }
 
@@ -205,11 +199,7 @@ func setupSourceTest(t *testing.T) *sourceTestEnv {
 
 	var db *database.Database
 
-	var dbMgr *database.WebhookDBManager
+	app := newTestApp(t, &h, &sess, &db)
-
-	var archives *recordingArchives
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr, &archives)
 	app.RequireStart()
 
 	t.Cleanup(app.RequireStop)
@@ -217,8 +207,6 @@ func setupSourceTest(t *testing.T) *sourceTestEnv {
 	return &sourceTestEnv{
 		handlers: h,
 		db:       db,
-		dbMgr:    dbMgr,
-		archives: archives,
 		cookies: authenticatedCookies(
 			t, sess, sourceTestUserID, "sourceuser",
 		),
@@ -372,42 +360,31 @@ func TestHandleSourceCreateSubmit_OverflowingRetentionIsRejected(
 // boundary between "too large to represent" and "retain forever": the
 // sentinel is above MaxFiniteRetentionDays, but it is the value the
 // edit form pre-fills, so it must be accepted rather than rejected as
-// out of range. A value above the sentinel is stored as the sentinel.
+// out of range.
 func TestHandleSourceCreateSubmit_SentinelIsAcceptedAsForever(
 	t *testing.T,
 ) {
 	t.Parallel()
 
-	for _, days := range []int{
+	env := setupSourceTest(t)
+	sentinel := strconv.Itoa(database.RetentionForeverDays)
+
+	w := submitCreate(t, env.handlers, env.cookies, "forever", &sentinel)
+	require.Equal(t, http.StatusSeeOther, w.Code)
+
+	wh := onlyWebhook(t, env.db)
+	assert.Equal(
+		t,
 		database.RetentionForeverDays,
-		database.RetentionForeverDays + 1,
+		storedRetentionDays(t, env.db, wh.ID),
-	} {
+	)
-		raw := strconv.Itoa(days)
-
-		t.Run(raw, func(t *testing.T) {
-			t.Parallel()
-
-			env := setupSourceTest(t)
-
-			w := submitCreate(t, env.handlers, env.cookies, "forever", &raw)
-			require.Equal(t, http.StatusSeeOther, w.Code)
-
-			wh := onlyWebhook(t, env.db)
-			assert.Equal(
-				t,
-				database.RetentionForeverDays,
-				storedRetentionDays(t, env.db, wh.ID),
-			)
-		})
-	}
 }
 
 // TestHandleSourceCreateSubmit_RejectedFormKeepsUserInput checks that a
 // validation failure hands the user's typing back, matching what the
 // edit form already does. Losing a long description to a mistyped
 // retention value is the kind of thing that makes people give up on a
-// form. Both values carry HTML-special characters, which must come
+// form.
-// back escaped rather than as markup.
 func TestHandleSourceCreateSubmit_RejectedFormKeepsUserInput(
 	t *testing.T,
 ) {
@@ -416,8 +393,8 @@ func TestHandleSourceCreateSubmit_RejectedFormKeepsUserInput(
 	env := setupSourceTest(t)
 
 	const (
-		name        = `kept"><b>name`
+		name        = "kept-name"
-		description = `a </textarea> worth not losing`
+		description = "a description worth not losing"
 	)
 
 	form := url.Values{}
@@ -434,10 +411,8 @@ func TestHandleSourceCreateSubmit_RejectedFormKeepsUserInput(
 
 	body := w.Body.String()
 
-	assert.Contains(t, body, `value="kept&#34;&gt;&lt;b&gt;name"`)
+	assert.Contains(t, body, `value="`+name+`"`)
-	assert.Contains(t, body, `a &lt;/textarea&gt; worth not losing`)
+	assert.Contains(t, body, description)
-	assert.NotContains(t, body, name)
-	assert.NotContains(t, body, description)
 }
 
 // submitEdit posts the webhook edit form for the given webhook.
@@ -523,301 +498,6 @@ func TestHandleSourceEditSubmit_EmptyRetentionLeavesValueUnchanged(
 	assert.Equal(t, 7, storedRetentionDays(t, env.db, wh.ID))
 }
 
-// renamedWebhookName is the name the rename tests give a webhook.
-const renamedWebhookName = "Renamed"
-
-// TestHandleSourceEditSubmit_RenamesArchives proves that a save
-// that keeps the webhook's name renames nothing, and that renaming a
-// webhook renames the archive of each of its database targets and
-// asks nothing of its other targets.
-func TestHandleSourceEditSubmit_RenamesArchives(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	first := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	second := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	seedTarget(t, env.db, wh.ID, database.TargetTypeLog)
-
-	w := submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusSeeOther, w.Code)
-	assert.Empty(t, env.archives.Renames())
-
-	wh.Name = renamedWebhookName
-
-	w = submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusSeeOther, w.Code)
-
-	assert.ElementsMatch(
-		t,
-		[]archiveRename{
-			{first.ID, renamedWebhookName, first.Name},
-			{second.ID, renamedWebhookName, second.Name},
-		},
-		env.archives.Renames(),
-	)
-}
-
-// TestHandleSourceEditSubmit_FailedRenameKeepsTheName proves that a
-// webhook whose archive cannot be renamed keeps its stored name, so
-// the name on disk and the name in the UI do not part, and that the
-// handler puts back what it may already have moved.
-func TestHandleSourceEditSubmit_FailedRenameKeepsTheName(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	tgt := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	env.archives.FailRenames(tgt.ID, errInjectedRename)
-
-	oldName := wh.Name
-	wh.Name = renamedWebhookName
-
-	w := submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusInternalServerError, w.Code)
-
-	var stored database.Webhook
-
-	require.NoError(
-		t, env.db.DB().First(&stored, "id = ?", wh.ID).Error,
-	)
-	assert.Equal(t, oldName, stored.Name)
-
-	assert.Equal(
-		t,
-		[]archiveRename{
-			{tgt.ID, renamedWebhookName, tgt.Name},
-			{tgt.ID, oldName, tgt.Name},
-		},
-		env.archives.Renames(),
-	)
-}
-
-// TestHandleSourceEditSubmit_FailedSaveRenamesBack proves that when
-// the archive is renamed but the new name cannot be saved, the
-// archive is renamed back to the stored name and the stored name
-// stays.
-func TestHandleSourceEditSubmit_FailedSaveRenamesBack(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	tgt := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	failSaveOnTable(t, env.db, "webhooks")
-
-	oldName := wh.Name
-	wh.Name = renamedWebhookName
-
-	w := submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusInternalServerError, w.Code)
-
-	var stored database.Webhook
-
-	require.NoError(
-		t, env.db.DB().First(&stored, "id = ?", wh.ID).Error,
-	)
-	assert.Equal(t, oldName, stored.Name)
-
-	assert.Equal(
-		t,
-		[]archiveRename{
-			{tgt.ID, renamedWebhookName, tgt.Name},
-			{tgt.ID, oldName, tgt.Name},
-		},
-		env.archives.Renames(),
-	)
-}
-
-// errInjectedRead is the failure a test makes reads of the main
-// database report.
-var errInjectedRead = errors.New("injected read failure")
-
-// TestHandleSourceEditSubmit_FailedSaveRenamesBackWithoutReading
-// proves that when the save fails and every later read of the main
-// database fails too, each archive the rename moved is still renamed
-// back: the move back needs no second read of the webhook's targets.
-func TestHandleSourceEditSubmit_FailedSaveRenamesBackWithoutReading(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	first := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	second := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	var saveFailed atomic.Bool
-
-	require.NoError(t, env.db.DB().Callback().Update().
-		Before("gorm:update").
-		Register("test:fail_save", func(tx *gorm.DB) {
-			saveFailed.Store(true)
-
-			_ = tx.AddError(errInjectedSave)
-		}),
-	)
-	require.NoError(t, env.db.DB().Callback().Query().
-		Before("gorm:query").
-		Register("test:fail_reads_after_save", func(tx *gorm.DB) {
-			if saveFailed.Load() {
-				_ = tx.AddError(errInjectedRead)
-			}
-		}),
-	)
-
-	oldName := wh.Name
-	wh.Name = renamedWebhookName
-
-	w := submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusInternalServerError, w.Code)
-
-	assert.Equal(
-		t,
-		[]archiveRename{
-			{first.ID, renamedWebhookName, first.Name},
-			{second.ID, renamedWebhookName, second.Name},
-			{first.ID, oldName, first.Name},
-			{second.ID, oldName, second.Name},
-		},
-		env.archives.Renames(),
-	)
-}
-
-// TestHandleSourceEditSubmit_EditsDoNotInterleave proves that a second
-// webhook edit submitted while the first is inside its archive rename
-// does not run until the first is saved, so afterwards the stored
-// names are the ones the archive was last renamed to. The stand-in's
-// last rename is the name the file has on disk.
-func TestHandleSourceEditSubmit_EditsDoNotInterleave(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	tgt := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	entered, release := env.archives.BlockNextRename()
-
-	firstEdit, secondEdit := wh, wh
-	firstEdit.Name = "First"
-	secondEdit.Name = "Second"
-
-	firstCode := make(chan int, 1)
-
-	go func() { firstCode <- submitEdit(t, env, firstEdit, "").Code }()
-
-	<-entered
-
-	secondCode := make(chan int, 1)
-
-	go func() { secondCode <- submitEdit(t, env, secondEdit, "").Code }()
-
-	// Were the edits not ordered, the second would run to its end in
-	// this time, while the first is still inside its rename.
-	time.Sleep(200 * time.Millisecond)
-	release()
-
-	assert.Equal(t, http.StatusSeeOther, <-firstCode)
-	assert.Equal(t, http.StatusSeeOther, <-secondCode)
-
-	var (
-		storedWebhook database.Webhook
-		storedTarget  database.Target
-	)
-
-	require.NoError(
-		t, env.db.DB().First(&storedWebhook, "id = ?", wh.ID).Error,
-	)
-	require.NoError(
-		t, env.db.DB().First(&storedTarget, "id = ?", tgt.ID).Error,
-	)
-
-	renames := env.archives.Renames()
-	require.NotEmpty(t, renames)
-	assert.Equal(
-		t,
-		archiveRename{tgt.ID, storedWebhook.Name, storedTarget.Name},
-		renames[len(renames)-1],
-	)
-}
-
-// TestHandleSourceEditSubmit_FailedRenameRenamesTheOthersBack proves
-// that when a webhook has three database targets and only the middle
-// one's archive cannot be renamed, the stored name stays and both
-// others are renamed back, the last one included: the move back does
-// not stop at the target it cannot rename. The handler reaches the
-// targets in the order they were created, which the exact sequence
-// below pins, so the refused target always comes before the last.
-func TestHandleSourceEditSubmit_FailedRenameRenamesTheOthersBack(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	first := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	middle := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	last := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	env.archives.FailRenames(middle.ID, errNameTaken)
-
-	oldName := wh.Name
-	wh.Name = renamedWebhookName
-
-	w := submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusConflict, w.Code)
-
-	var stored database.Webhook
-
-	require.NoError(
-		t, env.db.DB().First(&stored, "id = ?", wh.ID).Error,
-	)
-	assert.Equal(t, oldName, stored.Name)
-
-	assert.Equal(
-		t,
-		[]archiveRename{
-			{first.ID, renamedWebhookName, first.Name},
-			{middle.ID, renamedWebhookName, middle.Name},
-			{last.ID, renamedWebhookName, last.Name},
-			{first.ID, oldName, first.Name},
-			{middle.ID, oldName, middle.Name},
-			{last.ID, oldName, last.Name},
-		},
-		env.archives.Renames(),
-	)
-}
-
-// TestHandleSourceEditSubmit_ArchiveNameTaken proves that when a file
-// already has an archive's new name, the edit is refused with an
-// error naming that file, and the webhook keeps its stored name.
-func TestHandleSourceEditSubmit_ArchiveNameTaken(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	tgt := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	env.archives.FailRenames(tgt.ID, errNameTaken)
-
-	oldName := wh.Name
-	wh.Name = renamedWebhookName
-
-	w := submitEdit(t, env, wh, "")
-	require.Equal(t, http.StatusConflict, w.Code)
-	assert.Contains(t, w.Body.String(), "archive-taken.db")
-
-	var stored database.Webhook
-
-	require.NoError(
-		t, env.db.DB().First(&stored, "id = ?", wh.ID).Error,
-	)
-	assert.Equal(t, oldName, stored.Name)
-}
-
 // TestSourceEditForm_ForeverWebhookRoundTrips walks the exact path that
 // the removed max="365" cap used to break: render the edit form for a
 // retain-forever webhook, confirm the pre-filled sentinel is not capped

internal/handlers/target_download.go

@@ -1,121 +0,0 @@
-package handlers
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"time"
-
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
-)
-
-// downloadWriteTimeout is how long one write of a download may wait
-// for a client that has stopped reading.
-const downloadWriteTimeout = 60 * time.Second
-
-// HandleTargetDownload serves a database target's archive as one
-// gzipped JSON file, named for the webhook, the target and the time;
-// see delivery.ArchiveExport.WriteGzipJSON for what it holds. Other
-// target types have no archive and are a 404.
-//
-// A download runs for as long as the client keeps reading: it reads
-// under a context the request limit does not cancel, and gives each
-// write its own deadline in place of the server's write timeout. It
-// stops when a write fails.
-func (h *Handlers) HandleTargetDownload() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		ctx := context.WithoutCancel(r.Context())
-
-		webhook, target, export, ok := h.openTargetArchive(ctx, w, r)
-		if !ok {
-			return
-		}
-
-		defer func() { _ = export.Close() }()
-
-		now := time.Now()
-
-		w.Header().Set("Content-Type", "application/gzip")
-		w.Header().Set(
-			"Content-Disposition",
-			`attachment; filename="`+delivery.ArchiveExportFileName(
-				webhook.Name, target.Name, now,
-			)+`"`,
-		)
-
-		err := export.WriteGzipJSON(
-			ctx,
-			downloadWriter{w: w, rc: http.NewResponseController(w)},
-			&webhook, target, now,
-		)
-		if err != nil {
-			h.log.Error(
-				"failed to export archive",
-				"target_id", target.ID,
-				"error", err,
-			)
-
-			// The 200 has gone out. Aborting the connection is what
-			// tells the client the file is incomplete.
-			panic(http.ErrAbortHandler)
-		}
-	}
-}
-
-// downloadWriter writes a download to the client, giving each write
-// downloadWriteTimeout to finish.
-type downloadWriter struct {
-	w  http.ResponseWriter
-	rc *http.ResponseController
-}
-
-func (d downloadWriter) Write(b []byte) (int, error) {
-	// A writer that has no write deadline, such as a test's recorder,
-	// answers http.ErrNotSupported and needs none extended.
-	err := d.rc.SetWriteDeadline(time.Now().Add(downloadWriteTimeout))
-	if err != nil && !errors.Is(err, http.ErrNotSupported) {
-		return 0, err
-	}
-
-	return d.w.Write(b)
-}
-
-// openTargetArchive opens the archive of the request's database target
-// for export, with its reads under ctx. It reports false once it has
-// written the response.
-//
-// It holds renameMu, which every archive rename runs under, while it
-// reads the stored names and opens the file, so the file it opens is
-// the one those names give. It lets go before the export is streamed:
-// once the file is open, a rename does not affect the export.
-func (h *Handlers) openTargetArchive(
-	ctx context.Context,
-	w http.ResponseWriter,
-	r *http.Request,
-) (database.Webhook, *database.Target, *delivery.ArchiveExport, bool) {
-	h.renameMu.Lock()
-	defer h.renameMu.Unlock()
-
-	webhook, target, ok := h.ownedTarget(w, r)
-	if !ok {
-		return database.Webhook{}, nil, nil, false
-	}
-
-	if target.Type != database.TargetTypeDatabase {
-		h.renderError(w, r, http.StatusNotFound)
-
-		return database.Webhook{}, nil, nil, false
-	}
-
-	export, err := delivery.OpenArchiveExport(
-		ctx, delivery.ArchivePath(h.dbMgr, &webhook, target), h.log,
-	)
-	if err != nil {
-		h.serverError(w, r, "failed to open archive for export", err)
-
-		return database.Webhook{}, nil, nil, false
-	}
-
-	return webhook, target, export, true
-}

internal/handlers/target_download_test.go

@@ -1,379 +0,0 @@
-package handlers_test
-
-import (
-	"bytes"
-	"compress/gzip"
-	"context"
-	"crypto/rand"
-	"encoding/json"
-	"errors"
-	"io"
-	"log/slog"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/config"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
-	"sneak.berlin/go/webhooker/internal/middleware"
-)
-
-// errClientGone is the write failure of a client that has gone away.
-var errClientGone = errors.New("client gone")
-
-// downloadPath is the archive download route of a target.
-func downloadPath(webhookID, targetID string) string {
-	return "/hook/" + webhookID + "/targets/" + targetID + "/download"
-}
-
-// renameTarget submits the edit form renaming a target to Renamed.
-func renameTarget(
-	env *sourceTestEnv, webhookID, targetID string,
-) *httptest.ResponseRecorder {
-	form := url.Values{}
-	form.Set("name", "Renamed")
-
-	return submitTargetEdit(env, webhookID, targetID, form)
-}
-
-// TestHandleTargetDownload proves a database target's archive
-// downloads as a gzipped JSON attachment named for the webhook, the
-// target and the time, here with no archive file yet, so with no
-// rows; and that a target of another type has no download.
-func TestHandleTargetDownload(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	logTarget := seedTarget(t, env.db, wh.ID, database.TargetTypeLog)
-
-	w := serveTarget(
-		env, http.MethodGet, downloadPath(wh.ID, archive.ID), nil,
-	)
-	require.Equal(t, http.StatusOK, w.Code, w.Body.String())
-	assert.Equal(t, "application/gzip", w.Header().Get("Content-Type"))
-	assert.Regexp(t,
-		`^attachment; filename="archive-seeded-t-database-`+
-			`\d{8}T\d{6}Z\.json\.gz"$`,
-		w.Header().Get("Content-Disposition"),
-	)
-
-	zr, err := gzip.NewReader(w.Body)
-	require.NoError(t, err)
-
-	var got map[string]json.RawMessage
-
-	require.NoError(t, json.NewDecoder(zr).Decode(&got))
-	assert.JSONEq(t,
-		`{"id":"`+archive.ID+`","name":"t-database"}`,
-		string(got["target"]),
-	)
-	assert.JSONEq(t, `[]`, string(got["archived_events"]))
-
-	w = serveTarget(
-		env, http.MethodGet, downloadPath(wh.ID, logTarget.ID), nil,
-	)
-	assert.Equal(t, http.StatusNotFound, w.Code)
-}
-
-// TestHandleTargetDownload_WaitsForRename proves a download reads the
-// target's names and opens its archive under the lock a rename holds:
-// started while an edit is renaming the archive, it waits, and is
-// named for the target's new name.
-func TestHandleTargetDownload_WaitsForRename(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	renaming, release := env.archives.BlockNextRename()
-	edited := make(chan *httptest.ResponseRecorder, 1)
-
-	go func() {
-		edited <- renameTarget(env, wh.ID, archive.ID)
-	}()
-
-	<-renaming
-
-	downloaded := make(chan *httptest.ResponseRecorder, 1)
-
-	go func() {
-		downloaded <- serveTarget(
-			env, http.MethodGet, downloadPath(wh.ID, archive.ID), nil,
-		)
-	}()
-
-	select {
-	case <-downloaded:
-		release()
-		t.Fatal("the download did not wait for the rename")
-	case <-time.After(100 * time.Millisecond):
-	}
-
-	release()
-	require.Equal(t, http.StatusSeeOther, (<-edited).Code)
-
-	w := <-downloaded
-	require.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(t,
-		w.Header().Get("Content-Disposition"), "archive-seeded-renamed-",
-	)
-}
-
-// stalledWriter is a response writer whose first write waits until
-// resume is closed, closing writing when it starts to wait.
-type stalledWriter struct {
-	*httptest.ResponseRecorder
-
-	once    sync.Once
-	writing chan struct{}
-	resume  chan struct{}
-}
-
-func (s *stalledWriter) Write(b []byte) (int, error) {
-	s.once.Do(func() {
-		close(s.writing)
-		<-s.resume
-	})
-
-	return s.ResponseRecorder.Write(b)
-}
-
-// TestHandleTargetDownload_StreamsWithoutTheLock proves a download
-// lets go of the rename lock once its archive is open: while the
-// download is stalled writing, an edit can still rename the target.
-func TestHandleTargetDownload_StreamsWithoutTheLock(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	req := httptest.NewRequestWithContext(
-		t.Context(), http.MethodGet, downloadPath(wh.ID, archive.ID), nil,
-	)
-	for _, c := range env.cookies {
-		req.AddCookie(c)
-	}
-
-	sw := &stalledWriter{
-		ResponseRecorder: httptest.NewRecorder(),
-		writing:          make(chan struct{}),
-		resume:           make(chan struct{}),
-	}
-	downloaded := make(chan struct{})
-
-	go func() {
-		targetRouter(env).ServeHTTP(sw, req)
-		close(downloaded)
-	}()
-
-	<-sw.writing
-
-	edited := make(chan *httptest.ResponseRecorder, 1)
-
-	go func() {
-		edited <- renameTarget(env, wh.ID, archive.ID)
-	}()
-
-	select {
-	case w := <-edited:
-		assert.Equal(t, http.StatusSeeOther, w.Code)
-	case <-time.After(10 * time.Second):
-		t.Error("the rename waited for the download")
-	}
-
-	close(sw.resume)
-	<-downloaded
-	assert.Equal(t, http.StatusOK, sw.Code)
-}
-
-// seedArchive writes rows to the archive file at path, each with a
-// body of bodySize random bytes, which do not compress. Its table has
-// only the columns the test fills; an export writes the others empty.
-func seedArchive(t *testing.T, path string, rows, bodySize int) {
-	t.Helper()
-
-	db, err := database.OpenSQLite(path, database.SQLiteModeCreate)
-	require.NoError(t, err)
-
-	defer func() { require.NoError(t, db.Close()) }()
-
-	_, err = db.ExecContext(t.Context(),
-		"CREATE TABLE archived_events (id INTEGER PRIMARY KEY, body TEXT)",
-	)
-	require.NoError(t, err)
-
-	body := make([]byte, bodySize)
-
-	for range rows {
-		_, _ = rand.Read(body)
-
-		_, err = db.ExecContext(t.Context(),
-			"INSERT INTO archived_events (body) VALUES (?)", string(body),
-		)
-		require.NoError(t, err)
-	}
-}
-
-// limitedServer serves the target routes as the server does, behind the
-// access log, whose lines it returns, and the request limit, here
-// limit, which is also its write timeout. Each connection's send buffer
-// is a few KiB, so a larger response is still being written while its
-// client is not reading.
-func limitedServer(
-	t *testing.T, env *sourceTestEnv, limit time.Duration,
-) (*httptest.Server, *bytes.Buffer) {
-	t.Helper()
-
-	const sendBuffer = 4 << 10
-
-	logBuf := new(bytes.Buffer)
-	mw := middleware.NewForTest(
-		slog.New(slog.NewJSONHandler(logBuf, nil)),
-		&config.Config{Environment: config.EnvironmentDev},
-		nil,
-	)
-
-	srv := httptest.NewUnstartedServer(
-		mw.Logging()(mw.Timeout(limit)(targetRouter(env))),
-	)
-	srv.Config.WriteTimeout = limit
-	srv.Config.ConnContext = func(
-		ctx context.Context, c net.Conn,
-	) context.Context {
-		tcp, ok := c.(*net.TCPConn)
-		if assert.True(t, ok) {
-			assert.NoError(t, tcp.SetWriteBuffer(sendBuffer))
-		}
-
-		return ctx
-	}
-	srv.Start()
-	t.Cleanup(srv.Close)
-
-	return srv, logBuf
-}
-
-// TestHandleTargetDownload_OutlastsTheRequestLimit proves a download
-// runs for as long as the client keeps reading, and is logged as the
-// 200 it was. Behind a request limit and a server write timeout of a
-// tenth of a second, the client stops reading once the response has
-// started, waits three times as long, and still gets the whole file.
-// The archive is larger than the connection holds, so the download is
-// still being written while the client waits.
-func TestHandleTargetDownload_OutlastsTheRequestLimit(t *testing.T) {
-	t.Parallel()
-
-	const (
-		limit    = 100 * time.Millisecond
-		rows     = 8
-		bodySize = 64 << 10
-	)
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	seedArchive(
-		t, delivery.ArchivePath(env.dbMgr, &wh, archive), rows, bodySize,
-	)
-
-	srv, accessLog := limitedServer(t, env, limit)
-
-	req, err := http.NewRequestWithContext(
-		t.Context(), http.MethodGet,
-		srv.URL+downloadPath(wh.ID, archive.ID), nil,
-	)
-	require.NoError(t, err)
-
-	for _, c := range env.cookies {
-		req.AddCookie(c)
-	}
-
-	resp, err := srv.Client().Do(req)
-	require.NoError(t, err)
-
-	defer func() { _ = resp.Body.Close() }()
-
-	require.Equal(t, http.StatusOK, resp.StatusCode)
-
-	time.Sleep(3 * limit)
-
-	zr, err := gzip.NewReader(resp.Body)
-	require.NoError(t, err)
-
-	var (
-		got    map[string]json.RawMessage
-		events []json.RawMessage
-	)
-
-	require.NoError(t, json.NewDecoder(zr).Decode(&got))
-	require.NoError(t, json.Unmarshal(got["archived_events"], &events))
-	assert.Len(t, events, rows)
-
-	// Reading to the end makes the gzip reader check that the file was
-	// finished.
-	_, err = io.ReadAll(zr)
-	require.NoError(t, err)
-
-	// Close waits for the handler, so the access log line is written.
-	srv.Close()
-
-	var access map[string]any
-
-	require.NoError(t, json.Unmarshal(accessLog.Bytes(), &access))
-	assert.EqualValues(t, http.StatusOK, access["status"])
-	assert.GreaterOrEqual(t,
-		access["latency_ms"], float64(limit.Milliseconds()),
-		"the download must outlast the request limit",
-	)
-}
-
-// brokenWriter is a response writer whose writes fail once the
-// response has started, as they do when the client goes away.
-type brokenWriter struct {
-	*httptest.ResponseRecorder
-}
-
-func (b brokenWriter) Write(p []byte) (int, error) {
-	if b.Body.Len() > 0 {
-		return 0, errClientGone
-	}
-
-	return b.ResponseRecorder.Write(p)
-}
-
-// TestHandleTargetDownload_AbortsWhenItFails proves a download that
-// fails after its response has started aborts the connection, so the
-// client sees a failed download rather than a file that looks
-// complete and does not decompress.
-func TestHandleTargetDownload_AbortsWhenItFails(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	req := httptest.NewRequestWithContext(
-		t.Context(), http.MethodGet, downloadPath(wh.ID, archive.ID), nil,
-	)
-	for _, c := range env.cookies {
-		req.AddCookie(c)
-	}
-
-	w := brokenWriter{ResponseRecorder: httptest.NewRecorder()}
-
-	assert.PanicsWithValue(t, http.ErrAbortHandler, func() {
-		targetRouter(env).ServeHTTP(w, req)
-	})
-	assert.Equal(t, http.StatusOK, w.Code)
-}

internal/handlers/target_edit.go

@@ -1,7 +1,6 @@
 package handlers
 
 import (
-	"errors"
 	"net/http"
 
 	"github.com/go-chi/chi"
@@ -80,9 +79,6 @@ func (h *Handlers) HandleTargetEdit() http.HandlerFunc {
 // HandleTargetEditSubmit handles the target edit form submission.
 func (h *Handlers) HandleTargetEditSubmit() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		h.renameMu.Lock()
-		defer h.renameMu.Unlock()
-
 		webhook, target, ok := h.ownedTarget(w, r)
 		if !ok {
 			return
@@ -154,43 +150,11 @@ func (h *Handlers) applyTargetEdit(
 		target.MaxRetries = retries
 	}
 
-	oldName := target.Name
 	target.Name = name
 	target.Config = configJSON
 
-	// A new name renames the archive file before it is saved (see
+	err = h.db.DB().Save(target).Error
-	// delivery.Engine.Rename). If either step fails, it goes back to
-	// the name that is still stored.
-	err = h.renameTargetArchive(target, webhook.Name, oldName, name)
-	if err == nil {
-		err = h.db.DB().Save(target).Error
-	}
-
 	if err != nil {
-		restoreErr := h.renameTargetArchive(
-			target, webhook.Name, name, oldName,
-		)
-		if restoreErr != nil {
-			h.log.Error(
-				"failed to rename archive back",
-				"target_id", target.ID,
-				"error", restoreErr,
-			)
-		}
-
-		if errors.Is(err, delivery.ErrArchiveNameTaken) {
-			http.Error(
-				w,
-				"Not saved: "+err.Error()+
-					". Move that archive out of the data directory, "+
-					"its .db together with any -wal and -shm beside "+
-					"it, then save again.",
-				http.StatusConflict,
-			)
-
-			return
-		}
-
 		h.serverError(w, r, "failed to update target", err)
 
 		return
@@ -202,21 +166,6 @@ func (h *Handlers) applyTargetEdit(
 	)
 }
 
-// renameTargetArchive renames a database target's archive file from
-// the target name oldName to newName. It does nothing when the name
-// is unchanged; other target types have no archive.
-func (h *Handlers) renameTargetArchive(
-	target *database.Target,
-	webhookName, oldName, newName string,
-) error {
-	if h.archives == nil || oldName == newName ||
-		target.Type != database.TargetTypeDatabase {
-		return nil
-	}
-
-	return h.archives.Rename(target.ID, webhookName, newName)
-}
-
 // renderTargetEdit renders the target edit page with an optional
 // error message.
 func (h *Handlers) renderTargetEdit(

internal/handlers/target_edit_test.go

@@ -37,18 +37,14 @@ const (
 	editAuthHeader   = "Authorization: Bearer " + editBearerSecret
 )
 
-// targetRouter mounts the target create, edit and download routes on
+// targetRouter mounts the target create and edit routes on a chi
-// a chi router so the handlers see the URL parameters they read.
+// router so the handlers see the URL parameters they read.
 func targetRouter(env *sourceTestEnv) *chi.Mux {
 	router := chi.NewRouter()
 	router.Post(
 		"/hook/{sourceID}/targets",
 		env.handlers.HandleTargetCreate(),
 	)
-	router.Get(
-		"/hook/{sourceID}/targets/{targetID}/download",
-		env.handlers.HandleTargetDownload(),
-	)
 	router.Get(
 		"/hook/{sourceID}/targets/{targetID}/edit",
 		env.handlers.HandleTargetEdit(),
@@ -639,100 +635,3 @@ func assertWebhookOfAnotherUser404s(
 
 	assert.Equal(t, http.StatusNotFound, w.Code)
 }
-
-// renamedTargetName is the name the rename tests give a target.
-const renamedTargetName = "Long Term"
-
-// TestHandleTargetEditSubmit_RenamesArchive proves that renaming a
-// database target renames its archive, that a save that keeps the
-// name renames nothing, that a target of another type has no archive
-// to rename, and that a target whose archive cannot be renamed keeps
-// its stored name. When a file already has the archive's new name,
-// the edit is refused with an error naming that file.
-func TestHandleTargetEditSubmit_RenamesArchive(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	rename := url.Values{"name": {renamedTargetName}}
-
-	w := submitTargetEdit(env, wh.ID, archive.ID, rename)
-	require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-	assert.Equal(
-		t,
-		[]archiveRename{{archive.ID, wh.Name, renamedTargetName}},
-		env.archives.Renames(),
-	)
-
-	w = submitTargetEdit(env, wh.ID, archive.ID, rename)
-	require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-	assert.Len(
-		t, env.archives.Renames(), 1,
-		"a save that keeps the name renames nothing",
-	)
-
-	httpWebhook, httpTarget := seedHTTPTarget(t, env, "", "")
-
-	w = submitTargetEdit(
-		env, httpWebhook.ID, httpTarget.ID,
-		editForm(editOriginalURL, "", ""),
-	)
-	require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-	assert.Len(
-		t, env.archives.Renames(), 1,
-		"an HTTP target has no archive to rename",
-	)
-
-	again := url.Values{"name": {"Again"}}
-
-	env.archives.FailRenames(archive.ID, errInjectedRename)
-
-	w = submitTargetEdit(env, wh.ID, archive.ID, again)
-	require.Equal(t, http.StatusInternalServerError, w.Code)
-	assert.Equal(
-		t, renamedTargetName, storedTarget(t, env, archive.ID).Name,
-		"a target whose archive was not renamed keeps its name",
-	)
-
-	env.archives.FailRenames(archive.ID, errNameTaken)
-
-	w = submitTargetEdit(env, wh.ID, archive.ID, again)
-	require.Equal(t, http.StatusConflict, w.Code)
-	assert.Contains(t, w.Body.String(), "archive-taken.db")
-	assert.Equal(
-		t, renamedTargetName, storedTarget(t, env, archive.ID).Name,
-	)
-}
-
-// TestHandleTargetEditSubmit_FailedSaveRenamesBack proves that when a
-// database target's archive is renamed but the new name cannot be
-// saved, the archive is renamed back to the stored name and the
-// stored name stays.
-func TestHandleTargetEditSubmit_FailedSaveRenamesBack(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-
-	failSaveOnTable(t, env.db, "targets")
-
-	form := url.Values{}
-	form.Set("name", renamedTargetName)
-
-	w := submitTargetEdit(env, wh.ID, archive.ID, form)
-	require.Equal(t, http.StatusInternalServerError, w.Code)
-	assert.Equal(
-		t, archive.Name, storedTarget(t, env, archive.ID).Name,
-	)
-
-	assert.Equal(
-		t,
-		[]archiveRename{
-			{archive.ID, wh.Name, renamedTargetName},
-			{archive.ID, wh.Name, archive.Name},
-		},
-		env.archives.Renames(),
-	)
-}

internal/handlers/target_toggle_test.go

@@ -1,66 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm"
-)
-
-// TestHandleTargetToggle_DoesNotUndoAnEdit proves that a toggle which
-// loaded the target before an edit of it was saved does not write the
-// old name and settings back over the edit. The edit is submitted from
-// a callback on the toggle's own read of the target, so it is saved
-// after that read and before the toggle writes.
-func TestHandleTargetToggle_DoesNotUndoAnEdit(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh, tgt := seedHTTPTarget(t, env, "", "")
-	require.True(t, tgt.Active)
-
-	var (
-		edited   bool
-		editCode int
-	)
-
-	require.NoError(t, env.db.DB().Callback().Query().
-		After("gorm:query").
-		Register("test:edit_after_toggle_read", func(tx *gorm.DB) {
-			// The edit reads the target too; only the toggle's read,
-			// the first, submits it.
-			if tx.Statement.Table != "targets" || edited {
-				return
-			}
-
-			edited = true
-			editCode = submitTargetEdit(
-				env, wh.ID, tgt.ID,
-				editForm(editReplacedURL, "", ""),
-			).Code
-		}),
-	)
-
-	req := postRequest(
-		"/hook/"+wh.ID+"/targets/"+tgt.ID+"/toggle",
-		env.cookies,
-		map[string]string{paramSourceID: wh.ID, paramTargetID: tgt.ID},
-	)
-	w := httptest.NewRecorder()
-
-	env.handlers.HandleTargetToggle().ServeHTTP(w, req)
-
-	require.Equal(t, http.StatusSeeOther, w.Code)
-	require.Equal(t, http.StatusSeeOther, editCode)
-
-	stored := storedTarget(t, env, tgt.ID)
-	assert.False(t, stored.Active)
-	assert.Equal(t, "edited-name", stored.Name)
-	assert.Equal(t, 5, stored.MaxRetries)
-	assert.Equal(
-		t, editReplacedURL, storedHTTPConfig(t, env, tgt.ID).URL,
-	)
-}

internal/handlers/ui_copy_test.go

@@ -82,9 +82,9 @@ func TestNavbarUsesWebhookTerminology(t *testing.T) {
 	})
 
 	assert.Contains(t, body, "Retention: 14 days")
-	assert.Contains(t, body, `class="btn-secondary">Webhooks</a>`)
+	assert.Contains(t, body, `class="btn-text">Webhooks</a>`)
 	assert.Contains(
-		t, body, `class="btn-secondary w-full">Webhooks</a>`,
+		t, body, `class="btn-text w-full text-left">Webhooks</a>`,
 	)
 	assert.Contains(
 		t, body,
@@ -163,7 +163,7 @@ func TestEventLogPageIsCalledFullEventLog(t *testing.T) {
 	)
 	assert.Contains(
 		t, detailBody,
-		`<a href="/hook/wh-1/events" class="btn-small">Full Event Log</a>`,
+		`<a href="/hook/wh-1/events" class="btn-text text-sm">Full Event Log</a>`,
 		"the link under recent events",
 	)
 
@@ -331,9 +331,8 @@ func TestEntrypointCopyButtonIsProgressiveEnhancement(t *testing.T) {
 	assert.Contains(t, body, "https://hooks.example.com/h/abc123")
 	assert.Contains(
 		t, body,
-		`<button type="button" hidden data-copy-target="entrypoint-url-ep-1"`,
+		`hidden data-copy-target="entrypoint-url-ep-1"`,
-		"the copy control must be a button, start hidden and be "+
+		"the button must start hidden and be revealed by script",
-			"revealed by script",
 	)
 
 	// renderTemplate streams to the ResponseWriter, so an abort

internal/handlers/webhook.go

@@ -11,7 +11,6 @@ import (
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/delivery"
 	"sneak.berlin/go/webhooker/internal/logfield"
-	"sneak.berlin/go/webhooker/internal/middleware"
 )
 
 const (
@@ -58,8 +57,7 @@ func (h *Handlers) HandleWebhook() http.HandlerFunc {
 		h.log.Info("webhook request received",
 			"entrypoint_uuid", entrypointUUID,
 			"method", r.Method,
-			"remoteIP", middleware.RemoteIP(r),
+			"remote_addr", r.RemoteAddr,
-			"clientIP", middleware.ClientIP(r),
 		)
 
 		if !entrypoint.Active {
@@ -152,9 +150,7 @@ func (h *Handlers) lookupEntrypoint(
 	return entrypoint, true
 }
 
-// readWebhookBody reads and validates the request body size. This is
+// readWebhookBody reads and validates the request body size.
-// the receiver's only body cap: /h/{uuid} has no MaxBodySize
-// middleware (see Server.setupWebhookRoutes).
 func (h *Handlers) readWebhookBody(
 	w http.ResponseWriter,
 	r *http.Request,
@@ -272,12 +268,10 @@ func requestEventSource(
 
 // createAndFanOut writes the event and one pending delivery per target,
 // and adds them to the webhook's running totals, in a single
-// transaction, then hands the tasks to the delivery engine. Every
+// transaction, then hands the tasks to the delivery engine. It is the
-// event is created here, received or resubmitted, so a resubmitted
+// only path by which an event and its deliveries are created, so a
-// event is retried, SSRF-guarded and circuit-broken exactly as a
+// resubmitted event is retried, SSRF-guarded and circuit-broken
-// received one is. Per-delivery replay is the one other path that
+// exactly as a received one is.
-// creates a delivery: it adds one to an existing event without
-// coming through here.
 //
 // The tasks are returned as well as queued, so a caller can report how
 // many targets the event went to.

internal/handlers/webhook_test.go

@@ -1,124 +0,0 @@
-package handlers_test
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"log/slog"
-	"net/http"
-	"net/http/httptest"
-	"net/netip"
-	"strings"
-	"testing"
-
-	"github.com/go-chi/chi"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/config"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/middleware"
-)
-
-// TestHandleWebhook_LogsClientNextToThePeer checks that the
-// receiver's "webhook request received" line carries both addresses:
-// remoteIP, the connecting peer, and clientIP, the client the access
-// log attributes the request to.
-func TestHandleWebhook_LogsClientNextToThePeer(t *testing.T) {
-	t.Parallel()
-
-	// untrustedPeer is outside the trusted 10.0.0.0/8, so its
-	// X-Forwarded-For is ignored and it is the client.
-	const untrustedPeer = "192.0.2.10"
-
-	cases := map[string]struct {
-		peer       string
-		wantRemote string
-		wantClient string
-	}{
-		"trusted proxy with a forwarded chain": {
-			peer:       "10.0.0.1:44444",
-			wantRemote: "10.0.0.1",
-			wantClient: "198.51.100.7",
-		},
-		"untrusted peer": {
-			peer:       untrustedPeer + ":5555",
-			wantRemote: untrustedPeer,
-			wantClient: untrustedPeer,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			var (
-				h  *handlers.Handlers
-				mw *middleware.Middleware
-				db *database.Database
-			)
-
-			app := newTestAppWithConfig(t, &config.Config{
-				DataDir: t.TempDir(),
-				TrustedProxies: []netip.Prefix{
-					netip.MustParsePrefix("10.0.0.0/8"),
-				},
-			}, &h, &mw, &db)
-			app.RequireStart()
-
-			t.Cleanup(app.RequireStop)
-
-			buf := new(bytes.Buffer)
-			h.SetLogForTest(slog.New(slog.NewJSONHandler(buf, nil)))
-
-			webhook := seedWebhook(t, db)
-			seedEntrypoint(t, db, webhook.ID)
-
-			// Logging is what works the client address out, so the
-			// request goes through it as it does in production.
-			router := chi.NewRouter()
-			router.Use(mw.Logging())
-			router.Post("/h/{uuid}", h.HandleWebhook())
-
-			req := httptest.NewRequestWithContext(
-				context.Background(), http.MethodPost,
-				"/h/ep-"+webhook.ID, strings.NewReader("{}"),
-			)
-			req.RemoteAddr = tc.peer
-			req.Header.Set("X-Forwarded-For", "198.51.100.7, 10.0.0.2")
-
-			w := httptest.NewRecorder()
-			router.ServeHTTP(w, req)
-
-			require.Equal(t, http.StatusOK, w.Code)
-
-			line := receivedLine(t, buf)
-			assert.Equal(t, tc.wantRemote, line["remoteIP"])
-			assert.Equal(t, tc.wantClient, line["clientIP"])
-		})
-	}
-}
-
-// receivedLine returns the one "webhook request received" line in the
-// captured JSON log.
-func receivedLine(t *testing.T, buf *bytes.Buffer) map[string]any {
-	t.Helper()
-
-	var found []map[string]any
-
-	for line := range strings.SplitSeq(
-		strings.TrimSpace(buf.String()), "\n",
-	) {
-		var entry map[string]any
-
-		require.NoError(t, json.Unmarshal([]byte(line), &entry))
-
-		if entry["msg"] == "webhook request received" {
-			found = append(found, entry)
-		}
-	}
-
-	require.Len(t, found, 1)
-
-	return found[0]
-}

internal/healthcheck/healthcheck.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"go.uber.org/fx"
+	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/database"
 	"sneak.berlin/go/webhooker/internal/globals"
 	"sneak.berlin/go/webhooker/internal/logger"
@@ -17,6 +18,7 @@ type HealthcheckParams struct {
 	fx.In
 
 	Globals  *globals.Globals
+	Config   *config.Config
 	Logger   *logger.Logger
 	Database *database.Database
 }
@@ -62,6 +64,7 @@ func (s *Healthcheck) Healthcheck() *Response {
 		UptimeHuman:   s.uptime().String(),
 		Appname:       s.params.Globals.Appname,
 		Version:       s.params.Globals.Version,
+		Maintenance:   s.params.Config.MaintenanceMode,
 	}
 
 	return resp
@@ -75,6 +78,7 @@ type Response struct {
 	UptimeHuman   string `json:"uptimeHuman"`
 	Version       string `json:"version"`
 	Appname       string `json:"appname"`
+	Maintenance   bool   `json:"maintenanceMode"`
 }
 
 func (s *Healthcheck) uptime() time.Duration {

internal/logfield/logfield_test.go

@@ -5,7 +5,6 @@ import (
 	"io"
 	"log/slog"
 	"strings"
-	"sync"
 	"testing"
 	"unicode/utf8"
 
@@ -19,11 +18,15 @@ import (
 // width.
 const budget = 64
 
-// batchRunes is how many consecutive code points the charge test logs
+// sampleRunes is how many runes wide the values in the charge test
-// in one value from U+1000 up. Logging each of those on its own line
+// are. The handlers add a constant per field — a pair of quotes when
-// is too slow for the suite under the race detector; 4,096 at a time
+// the value needs quoting — so the per-rune charge is only visible
-// is 271 batches, each logged on two lines, so 542 lines per handler.
+// once it is amortised over a run of them.
-const batchRunes = 4096
+const sampleRunes = 64
+
+// quotingSlack is that constant: the pair of quotes a handler adds to
+// a value that needs them and omits from one that does not.
+const quotingSlack = 2
 
 // newHandlers are the two handlers internal/logger can install. Time
 // is dropped so a line's width is a function of its value alone —
@@ -63,48 +66,46 @@ func renderedWidth(
 	return buf.Len()
 }
 
-// emittedBytes is what a handler writes for the runes of s alone, in a
+// chargeTestRunes is the set of code points the charge test measures:
-// value that starts with prefix: the width of a line carrying prefix
+// every rune in the first two planes' worth of the BMP that the
-// and then s twice, less that of a line carrying prefix and s once.
+// handlers are most likely to treat specially, the separators that
-// Both values start the same way and hold the same runes, so the text
+// only slog's JSON handler escapes, and a stratified sample across
-// handler quotes both or neither, and the quotes cancel along with the
+// the rest of Unicode so the astral charge is exercised on more than
-// prefix and everything else on the line.
+// one hand-picked rune.
-func emittedBytes(
+func chargeTestRunes() []rune {
-	newHandler func(io.Writer) slog.Handler,
+	const (
-	prefix, s string,
+		denseCeiling = 0x800
-) int {
+		stride       = 1021
-	return renderedWidth(newHandler, prefix+s+s) -
+		surrogateLo  = 0xD800
-		renderedWidth(newHandler, prefix+s)
+		surrogateHi  = 0xDFFF
-}
+	)
 
-// firstUndercharged returns the first rune in s that the handler
+	var runes []rune
-// writes in more bytes than EncodedBytes charges for it, and how many
-// runes in s are undercharged that way. It measures one rune per line,
-// in a value of that rune alone and again after a space, which makes
-// the text handler quote the value. The charge test calls it on the
-// code points below U+1000, and from there up only on a batch that has
-// already failed, to name the code points rather than just their range.
-func firstUndercharged(
-	newHandler func(io.Writer) slog.Handler,
-	s string,
-) (rune, int) {
-	first, count := rune(-1), 0
 
-	for _, r := range s {
+	keep := func(r rune) {
-		charge := logfield.EncodedBytes(r)
+		if r >= surrogateLo && r <= surrogateHi {
-		if emittedBytes(newHandler, "", string(r)) <= charge &&
+			return
-			emittedBytes(newHandler, " ", string(r)) <= charge {
-			continue
 		}
 
-		if count == 0 {
+		runes = append(runes, r)
-			first = r
-		}
-
-		count++
 	}
 
-	return first, count
+	for r := range rune(denseCeiling) {
+		keep(r)
+	}
+
+	for _, r := range []rune{
+		0x2028, 0x2029, 0x200B, 0x4E00, 0xE000, 0xFFFD,
+		0x1000C, 0x1F600, 0xE0001, 0x10FFFF,
+	} {
+		keep(r)
+	}
+
+	for r := rune(denseCeiling); r <= utf8.MaxRune; r += stride {
+		keep(r)
+	}
+
+	return runes
 }
 
 // TestEncodedBytes_ChargesAtLeastWhatTheHandlersEmit is the property
@@ -113,93 +114,33 @@ func firstUndercharged(
 // how a stated ceiling becomes false without any test noticing, so
 // the charge is measured against what the handlers actually write
 // rather than against the escaping rules as read.
-//
-// Every code point below U+1000 is checked on its own, for both
-// handlers. That range holds the quote, the backslash and the control
-// characters the handlers escape, next to code points each handler
-// writes in fewer bytes than their charge, which in a sum would cover
-// a neighbour charged too little. Each is measured in a value of it
-// alone and again in one the text handler quotes, because that handler
-// writes U+007F as one raw byte in a value it leaves bare but as \x7f,
-// four bytes, in one it quotes.
-//
-// From U+1000 up the text handler writes every code point in exactly
-// its charge, so the rest of Unicode is checked batchRunes at a time:
-// each batch's summed charge must cover what the handler writes for
-// the whole batch. The sums there can miss the JSON handler alone
-// writing one code point in more bytes than its charge, when it writes
-// others in the same batch in fewer.
 func TestEncodedBytes_ChargesAtLeastWhatTheHandlersEmit(t *testing.T) {
 	t.Parallel()
 
-	var below strings.Builder
-	for r := range rune(0x1000) {
-		below.WriteRune(r)
-	}
-
-	var batches []string
-
-	for lo := rune(0x1000); lo <= utf8.MaxRune; lo += batchRunes {
-		var batch strings.Builder
-
-		for r := lo; r < lo+batchRunes; r++ {
-			// Surrogate halves are not runes a string can carry.
-			if utf8.ValidRune(r) {
-				batch.WriteRune(r)
-			}
-		}
-
-		batches = append(batches, batch.String())
-	}
-
-	// What EncodedBytes charges for each batch. Under -race -cover this
-	// takes longer than logging the batches, so it is worked out once,
-	// by whichever handler finishes logging first, while the other is
-	// still logging.
-	charged := sync.OnceValue(func() []int {
-		costs := make([]int, len(batches))
-
-		for i, batch := range batches {
-			for _, r := range batch {
-				costs[i] += logfield.EncodedBytes(r)
-			}
-		}
-
-		return costs
-	})
-
 	for name, newHandler := range newHandlers() {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			if first, count := firstUndercharged(newHandler, below.String()); count > 0 {
+			// 'a' is a printable ASCII rune, charged exactly one
-				t.Errorf(
+			// byte, so it is the zero point the other runes are
-					"%d code points below U+1000 cost more than "+
+			// measured against.
-						"EncodedBytes charges, the first U+%04X",
+			base := renderedWidth(
-					count, first,
+				newHandler, strings.Repeat("a", sampleRunes),
+			)
+
+			for _, r := range chargeTestRunes() {
+				got := renderedWidth(
+					newHandler,
+					strings.Repeat(string(r), sampleRunes),
 				)
-			}
+				charged := sampleRunes *
+					(logfield.EncodedBytes(r) - 1)
 
-			emitted := make([]int, len(batches))
+				require.LessOrEqual(
-			for i, batch := range batches {
+					t, got-base, charged+quotingSlack,
-				emitted[i] = emittedBytes(newHandler, "", batch)
+					"U+%04X costs more on the line than "+
-			}
+						"EncodedBytes charges for it",
-
+					r,
-			for i, cost := range charged() {
-				if emitted[i] <= cost {
-					continue
-				}
-
-				lo := rune(0x1000 + i*batchRunes)
-				first, count := firstUndercharged(
-					newHandler, batches[i],
-				)
-				t.Errorf(
-					"U+%04X to U+%04X emit %d bytes but are "+
-						"charged %d; %d of them cost more than "+
-						"EncodedBytes charges, the first U+%04X",
-					lo, lo+batchRunes-1, emitted[i], cost,
-					count, first,
 				)
 			}
 		})

internal/logger/logger.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"go.uber.org/fx"
-	"go.uber.org/fx/fxevent"
 	"sneak.berlin/go/webhooker/internal/globals"
 )
 
@@ -107,40 +106,3 @@ func (l *Logger) Identify() {
 func (l *Logger) Writer() io.Writer {
 	return os.Stdout
 }
-
-// FxLogger writes fx's own events through a slog logger: how the
-// dependency graph was built at DEBUG, since it repeats on every
-// start; the start and stop hooks, the start itself and the signal
-// that stops the service at INFO; every failure at ERROR.
-//
-// The formatting is fx's own fxevent.SlogLogger. That logger takes a
-// single level for every event that is not a failure, so FxLogger
-// holds one at each level and picks between them.
-type FxLogger struct {
-	graph     *fxevent.SlogLogger
-	lifecycle *fxevent.SlogLogger
-}
-
-// NewFxLogger returns an FxLogger that writes through log.
-func NewFxLogger(log *slog.Logger) *FxLogger {
-	graph := &fxevent.SlogLogger{Logger: log}
-	graph.UseLogLevel(slog.LevelDebug)
-
-	lifecycle := &fxevent.SlogLogger{Logger: log}
-	lifecycle.UseLogLevel(slog.LevelInfo)
-
-	return &FxLogger{graph: graph, lifecycle: lifecycle}
-}
-
-// LogEvent implements fxevent.Logger.
-func (f *FxLogger) LogEvent(event fxevent.Event) {
-	switch event.(type) {
-	case *fxevent.Supplied, *fxevent.Provided, *fxevent.Replaced,
-		*fxevent.Decorated, *fxevent.BeforeRun, *fxevent.Run,
-		*fxevent.Invoking, *fxevent.Invoked,
-		*fxevent.LoggerInitialized:
-		f.graph.LogEvent(event)
-	default:
-		f.lifecycle.LogEvent(event)
-	}
-}

internal/logger/logger_test.go

@@ -1,23 +1,13 @@
 package logger_test
 
 import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"log/slog"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/fx"
-	"go.uber.org/fx/fxevent"
 	"go.uber.org/fx/fxtest"
 	"sneak.berlin/go/webhooker/internal/globals"
 	"sneak.berlin/go/webhooker/internal/logger"
 )
 
-var errStopHook = errors.New("stop hook failed on purpose")
-
 func testGlobals() *globals.Globals {
 	return &globals.Globals{
 		Appname: "test-app",
@@ -67,47 +57,3 @@ func TestEnableDebugLogging(t *testing.T) {
 	// Test debug logging
 	l.Get().Debug("debug message", "test", true)
 }
-
-// TestFxLogger_Levels starts and stops an fx app that reports its own
-// events through NewFxLogger, as cmd/webhooker does, and reads back
-// what reached the handler: the graph at DEBUG, the start at INFO and
-// a failed stop hook at ERROR, each as a structured record.
-func TestFxLogger_Levels(t *testing.T) {
-	t.Parallel()
-
-	var out bytes.Buffer
-
-	log := slog.New(slog.NewJSONHandler(
-		&out, &slog.HandlerOptions{Level: slog.LevelDebug},
-	))
-
-	app := fx.New(
-		fx.WithLogger(func() fxevent.Logger {
-			return logger.NewFxLogger(log)
-		}),
-		fx.Invoke(func(lc fx.Lifecycle) {
-			lc.Append(fx.StopHook(func() error { return errStopHook }))
-		}),
-	)
-
-	require.NoError(t, app.Start(t.Context()))
-	require.ErrorIs(t, app.Stop(t.Context()), errStopHook)
-
-	levels := map[string]string{}
-
-	decoder := json.NewDecoder(&out)
-	for decoder.More() {
-		var record struct {
-			Level string `json:"level"`
-			Msg   string `json:"msg"`
-		}
-
-		require.NoError(t, decoder.Decode(&record))
-
-		levels[record.Msg] = record.Level
-	}
-
-	assert.Equal(t, "DEBUG", levels["provided"])
-	assert.Equal(t, "INFO", levels["started"])
-	assert.Equal(t, "ERROR", levels["OnStop hook failed"])
-}

internal/metrics/metrics.go

@@ -384,7 +384,6 @@ func (s *Set) initSeries() {
 		s.deliveriesFailed.WithLabelValues(label)
 		s.deliveryRetries.WithLabelValues(label)
 		s.deliveryReplays.WithLabelValues(label)
-		s.deliveryDuration.WithLabelValues(label)
 		s.deliveriesPending.WithLabelValues(label)
 		s.deliveriesRetrying.WithLabelValues(label)
 		s.circuitBreakersOpen.WithLabelValues(label)

internal/metrics/metrics_test.go

@@ -167,7 +167,6 @@ func TestKnownSeriesExistBeforeAnyDelivery(t *testing.T) {
 		"webhooker_deliveries_succeeded_total",
 		"webhooker_deliveries_failed_total",
 		"webhooker_delivery_retries_total",
-		"webhooker_delivery_duration_seconds",
 		"webhooker_circuit_breakers_open",
 	} {
 		assert.ElementsMatch(t,

internal/middleware/accesslog_test.go

@@ -63,12 +63,6 @@ const (
 // capturingMiddleware returns a Middleware whose logger writes JSON
 // lines into the returned buffer, so the access log can be asserted
 // on directly.
-//
-// It trusts 192.0.2.1, the peer address httptest.NewRequestWithContext
-// gives a request, as a proxy, the way a deployment trusts its reverse
-// proxy: a request built that way and carrying X-Forwarded-For is
-// logged with the client that header names as clientIP, and one
-// without it with the peer.
 func capturingMiddleware(t *testing.T) (*middleware.Middleware, *bytes.Buffer) {
 	t.Helper()
 
@@ -78,10 +72,7 @@ func capturingMiddleware(t *testing.T) (*middleware.Middleware, *bytes.Buffer) {
 		&slog.HandlerOptions{Level: slog.LevelInfo},
 	))
 
-	cfg := &config.Config{
+	cfg := &config.Config{Environment: config.EnvironmentDev}
-		Environment:    config.EnvironmentDev,
-		TrustedProxies: trustedProxies("192.0.2.1/32"),
-	}
 
 	return middleware.NewForTest(log, cfg, nil), buf
 }
@@ -90,7 +81,7 @@ func capturingMiddleware(t *testing.T) (*middleware.Middleware, *bytes.Buffer) {
 // internal/logger can select: slog's text handler, which
 // internal/logger/logger.go installs when stderr is a tty. It escapes
 // differently from the JSON one, so the line bound has to be asserted
-// against both. It trusts the same peer.
+// against both.
 func capturingTextMiddleware(
 	t *testing.T,
 ) (*middleware.Middleware, *bytes.Buffer) {
@@ -102,10 +93,7 @@ func capturingTextMiddleware(
 		&slog.HandlerOptions{Level: slog.LevelInfo},
 	))
 
-	cfg := &config.Config{
+	cfg := &config.Config{Environment: config.EnvironmentDev}
-		Environment:    config.EnvironmentDev,
-		TrustedProxies: trustedProxies("192.0.2.1/32"),
-	}
 
 	return middleware.NewForTest(log, cfg, nil), buf
 }
@@ -346,12 +334,11 @@ func oversizedHeaders(value string) map[string]string {
 // sizeCase is one way of pointing 8 KB of client-chosen text at the
 // access log.
 type sizeCase struct {
-	target       string
+	target     string
-	headers      map[string]string
+	headers    map[string]string
-	wantStatus   int
+	wantStatus int
-	wantURL      string
+	wantURL    string
-	wantClientIP string
+	bound      int
-	bound        int
 }
 
 // lineSizeCases enumerates every part of a request that reaches the
@@ -388,7 +375,8 @@ func lineSizeCases() map[string]sizeCase {
 	}
 
 	// The url field on a 5xx keeps the concrete path, so it reaches its
-	// own budget on the same line as the three header fields.
+	// own budget on the same line as the three header fields. That is
+	// the widest access log line the service can be made to write.
 	longPath := "/boom/" + strings.Repeat("x", oversizedSegmentBytes)
 	wantLongURL := longPath[:maxFieldBytes] + truncationSuffix
 
@@ -432,29 +420,6 @@ func lineSizeCases() map[string]sizeCase {
 			}
 	}
 
-	// From a trusted proxy, clientIP is read out of X-Forwarded-For,
-	// which the client writes. What bounds the field is that only one
-	// address from the header is written, and it is written parsed, with
-	// no zone. An IPv6 address with all eight groups at four digits is
-	// the longest such address; here it carries an 8 KB zone, which must
-	// not reach the line. It goes on the 5xx line with all three header
-	// fields at their budget.
-	const longestIPv6 = "ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"
-
-	forwarded := oversizedHeaders(oversizedValue("h"))
-	forwarded[headerXFF] = oversizedValue("h") + ", " +
-		longestIPv6 + "%" + oversizedValue("h")
-
-	cases["oversized X-Forwarded-For from a trusted proxy "+
-		"with a 5xx concrete url"] = sizeCase{
-		target:       longPath,
-		headers:      forwarded,
-		wantStatus:   http.StatusInternalServerError,
-		wantURL:      wantLongURL,
-		wantClientIP: longestIPv6,
-		bound:        maxCappedLineBytes,
-	}
-
 	return cases
 }
 
@@ -495,14 +460,6 @@ func TestAccessLog_LineSizeDoesNotTrackInputSize(t *testing.T) {
 			require.Len(t, entries, 1)
 			assert.Equal(t, tc.wantURL, entries[0]["url"])
 
-			// Set only by the X-Forwarded-For case, where it proves
-			// the header was read rather than ignored.
-			if tc.wantClientIP != "" {
-				assert.Equal(
-					t, tc.wantClientIP, entries[0]["clientIP"],
-				)
-			}
-
 			// The markers sit at the far end of the client-chosen
 			// text, so their absence is what proves the redaction and
 			// the truncation actually ran.
@@ -691,8 +648,7 @@ func TestAccessLog_RetainsEveryOtherField(t *testing.T) {
 
 	for _, key := range []string{
 		"request_start", "method", "url", "useragent", "request_id",
-		"referer", "proto", "remoteIP", "clientIP", "status",
+		"referer", "proto", "remoteIP", "status", "latency_ms",
-		"latency_ms",
 	} {
 		assert.Contains(t, entries[0], key)
 	}

internal/middleware/clientip_test.go

@@ -1,200 +0,0 @@
-package middleware_test
-
-import (
-	"bytes"
-	"context"
-	"log/slog"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/config"
-	"sneak.berlin/go/webhooker/internal/middleware"
-)
-
-const (
-	// forwardedChain is the X-Forwarded-For a request arrives with:
-	// the client, then a second proxy inside trustedProxyCIDR that the
-	// request passed through before reaching trustedPeer.
-	forwardedChain = clientIPv4 + ", 10.0.0.2"
-
-	// untrustedPeer is a peer outside trustedProxyCIDR, so its
-	// X-Forwarded-For is ignored and the peer is the client.
-	untrustedPeer = "192.0.2.10:5555"
-
-	// oneRequestPerMinute is the receiver limit these tests install:
-	// the second request on a path is rejected, and the aggregate
-	// limit is ReceiverAggregateMultiplierConst.
-	oneRequestPerMinute = 1
-)
-
-// clientLogSite is one log line that names the client. build wraps the
-// middleware that writes it around a handler, and requests is how many
-// identical requests it takes before the line is written.
-type clientLogSite struct {
-	build    func(m *middleware.Middleware) http.Handler
-	requests int
-}
-
-// clientLogSites maps the message of each line that names the client
-// to the way to make it be written.
-func clientLogSites() map[string]clientLogSite {
-	served := func(*middleware.Middleware) http.Handler {
-		return okHandler()
-	}
-
-	receiver := func(m *middleware.Middleware) http.Handler {
-		return m.ReceiverRateLimit()(okHandler())
-	}
-
-	login := func(m *middleware.Middleware) http.Handler {
-		return http.HandlerFunc(
-			func(w http.ResponseWriter, r *http.Request) {
-				m.RecordLoginFailure(r, "someone")
-				w.WriteHeader(http.StatusUnauthorized)
-			},
-		)
-	}
-
-	csrf := func(m *middleware.Middleware) http.Handler {
-		return m.CSRF(http.HandlerFunc(forbidden))(okHandler())
-	}
-
-	passwordChange := func(m *middleware.Middleware) http.Handler {
-		return m.PasswordChangeRateLimit()(okHandler())
-	}
-
-	replay := func(m *middleware.Middleware) http.Handler {
-		return m.ReplayRateLimit()(okHandler())
-	}
-
-	resubmit := func(m *middleware.Middleware) http.Handler {
-		return m.ResubmitRateLimit()(okHandler())
-	}
-
-	return map[string]clientLogSite{
-		"http request": {
-			build:    served,
-			requests: 1,
-		},
-		"webhook receiver rate limit exceeded": {
-			build:    receiver,
-			requests: oneRequestPerMinute + 1,
-		},
-		// The aggregate limit sits in front of the per-entrypoint
-		// one, so the requests that one rejects count towards it.
-		"webhook receiver aggregate rate limit exceeded": {
-			build: receiver,
-			requests: middleware.ReceiverAggregateMultiplierConst*
-				oneRequestPerMinute + 1,
-		},
-		"login failure limit exceeded": {
-			build:    login,
-			requests: middleware.LoginRateLimitConst + 1,
-		},
-		"csrf: token validation failed": {
-			build:    csrf,
-			requests: 1,
-		},
-		"password change rate limit exceeded": {
-			build:    passwordChange,
-			requests: middleware.PasswordChangeRateLimitConst + 1,
-		},
-		"delivery replay rate limit exceeded": {
-			build:    replay,
-			requests: middleware.ReplayRateLimitConst + 1,
-		},
-		"event resubmit rate limit exceeded": {
-			build:    resubmit,
-			requests: middleware.ResubmitRateLimitConst + 1,
-		},
-	}
-}
-
-// clientLogLines sends the site's requests from peer, each carrying
-// forwardedChain, through Logging and then the site, as production
-// does, and returns the logged lines whose message is msg.
-func clientLogLines(
-	t *testing.T, site clientLogSite, msg, peer string,
-) []map[string]any {
-	t.Helper()
-
-	buf := new(bytes.Buffer)
-	log := slog.New(slog.NewJSONHandler(
-		buf,
-		&slog.HandlerOptions{Level: slog.LevelDebug},
-	))
-
-	cfg := &config.Config{
-		Environment:       config.EnvironmentDev,
-		ReceiverRateLimit: oneRequestPerMinute,
-		TrustedProxies:    trustedProxies(trustedProxyCIDR),
-	}
-
-	m := middleware.NewForTest(
-		log, cfg, newTestSessionManager(cfg, log, nil),
-	)
-	handler := m.Logging()(site.build(m))
-
-	for range site.requests {
-		req := httptest.NewRequestWithContext(
-			context.Background(), http.MethodPost, "/h/x", nil,
-		)
-		req.RemoteAddr = peer
-		req.Header.Set(headerXFF, forwardedChain)
-
-		handler.ServeHTTP(httptest.NewRecorder(), req)
-	}
-
-	var lines []map[string]any
-
-	for _, entry := range accessLogEntries(t, buf) {
-		if entry["msg"] == msg {
-			lines = append(lines, entry)
-		}
-	}
-
-	return lines
-}
-
-// TestClientIP_LoggedNextToThePeer checks that every line that names
-// the client carries both addresses: remoteIP, the connecting peer,
-// and clientIP, the client the rate limiters key on.
-func TestClientIP_LoggedNextToThePeer(t *testing.T) {
-	t.Parallel()
-
-	cases := map[string]struct {
-		peer       string
-		wantRemote string
-		wantClient string
-	}{
-		"trusted proxy with a forwarded chain": {
-			peer:       trustedPeer,
-			wantRemote: "10.0.0.1",
-			wantClient: clientIPv4,
-		},
-		"untrusted peer": {
-			peer:       untrustedPeer,
-			wantRemote: "192.0.2.10",
-			wantClient: "192.0.2.10",
-		},
-	}
-
-	for msg, site := range clientLogSites() {
-		for name, tc := range cases {
-			t.Run(msg+"/"+name, func(t *testing.T) {
-				t.Parallel()
-
-				lines := clientLogLines(t, site, msg, tc.peer)
-				require.NotEmpty(t, lines, "%q was never logged", msg)
-
-				for _, line := range lines {
-					assert.Equal(t, tc.wantRemote, line["remoteIP"])
-					assert.Equal(t, tc.wantClient, line["clientIP"])
-				}
-			})
-		}
-	}
-}

internal/middleware/csrf.go

@@ -45,10 +45,10 @@ func (m *Middleware) CSRF(
 		// unauthenticated client: a POST with no token to
 		// /hook/<any length of any text>/edit lands here. The
 		// method and path are capped against the same budgets as
-		// the access log. remoteIP and clientIP are the same
+		// the access log. remote_addr is set by net/http from the
-		// addresses the access log carries, and
+		// accepted connection rather than by the client, and
 		// csrf.FailureReason returns one of gorilla/csrf's own
-		// fixed error values, so none of them is client-sized.
+		// fixed error values, so neither is client-sized.
 		m.log.Warn("csrf: token validation failed",
 			"method", logfield.Truncate(
 				r.Method, maxLogMethodBytes,
@@ -56,8 +56,7 @@ func (m *Middleware) CSRF(
 			"path", logfield.Truncate(
 				r.URL.Path, logfield.MaxBytes,
 			),
-			"remoteIP", RemoteIP(r),
+			"remote_addr", r.RemoteAddr,
-			"clientIP", ClientIP(r),
 			"reason", csrf.FailureReason(r),
 		)
 		forbidden.ServeHTTP(w, r)

internal/middleware/export_test.go

@@ -132,12 +132,6 @@ func (g *LoginGuard) TrackedKeysForTest() (int, int) {
 // passwordChangeRateLimit constant.
 const PasswordChangeRateLimitConst = passwordChangeRateLimit
 
-// ReplayRateLimitConst exposes the replayRateLimit constant.
-const ReplayRateLimitConst = replayRateLimit
-
-// ResubmitRateLimitConst exposes the resubmitRateLimit constant.
-const ResubmitRateLimitConst = resubmitRateLimit
-
 // ReceiverAggregateMultiplierConst exposes the
 // receiverAggregateMultiplier constant.
 const ReceiverAggregateMultiplierConst = receiverAggregateMultiplier

internal/middleware/loginguard.go

@@ -385,8 +385,6 @@ func (m *Middleware) RecordLoginFailure(
 			"path", logfield.Truncate(
 				r.URL.Path, logfield.MaxBytes,
 			),
-			"remoteIP", RemoteIP(r),
-			"clientIP", ClientIP(r),
 		)
 	}
 

internal/middleware/metrics.go

@@ -8,6 +8,7 @@ import (
 	"github.com/go-chi/chi"
 	httpmetrics "github.com/slok/go-http-metrics/metrics"
 	ghmm "github.com/slok/go-http-metrics/middleware"
+	"github.com/slok/go-http-metrics/middleware/std"
 )
 
 // inflightHandler is the fixed `handler` label on
@@ -168,72 +169,13 @@ func metricsMiddleware(
 	})
 
 	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// The handler id is unmatchedRoute rather than "" so that
-			mw := &metricsResponseWriter{
+		// the client-chosen URL path never enters the metrics
-				ResponseWriter: w,
+		// pipeline at all: an empty id is the library's signal to
-				request:        r,
+		// substitute it. boundedLabelRecorder overwrites this value
-				statusCode:     http.StatusOK,
+		// on every observation, so it is reachable only if that
-			}
+		// decorator is removed — in which case the metrics collapse
-
+		// to one series instead of leaking again.
-			// The handler id is unmatchedRoute rather than "" so
+		return std.Handler(unmatchedRoute, mdlw, next)
-			// that the client-chosen URL path never enters the
-			// metrics pipeline at all: an empty id is the library's
-			// signal to substitute it. boundedLabelRecorder
-			// overwrites this value on every observation, so it is
-			// reachable only if that decorator is removed — in which
-			// case the metrics collapse to one series instead of
-			// leaking again.
-			mdlw.Measure(unmatchedRoute, mw, func() {
-				next.ServeHTTP(mw, r)
-			})
-		})
 	}
 }
-
-// metricsResponseWriter records the status code and body size of a
-// response, and hands them with the request to go-http-metrics'
-// Measure as its Reporter.
-//
-// It stands in for the library's std.Handler, whose writer has no
-// Unwrap: behind it, http.ResponseController cannot reach net/http's
-// own writer, so a handler's write deadline fails with metrics on.
-type metricsResponseWriter struct {
-	http.ResponseWriter
-
-	request      *http.Request
-	statusCode   int
-	bytesWritten int64
-}
-
-func (w *metricsResponseWriter) WriteHeader(code int) {
-	w.statusCode = code
-
-	w.ResponseWriter.WriteHeader(code)
-}
-
-func (w *metricsResponseWriter) Write(b []byte) (int, error) {
-	w.bytesWritten += int64(len(b))
-
-	//nolint:wrapcheck // Pass the writer's own error through unchanged.
-	return w.ResponseWriter.Write(b)
-}
-
-// Unwrap lets http.ResponseController reach the writer underneath, so
-// a handler can still flush or set a write deadline with metrics on.
-func (w *metricsResponseWriter) Unwrap() http.ResponseWriter {
-	return w.ResponseWriter
-}
-
-func (w *metricsResponseWriter) Method() string { return w.request.Method }
-
-func (w *metricsResponseWriter) Context() context.Context {
-	return w.request.Context()
-}
-
-func (w *metricsResponseWriter) URLPath() string { return w.request.URL.Path }
-
-func (w *metricsResponseWriter) StatusCode() int { return w.statusCode }
-
-func (w *metricsResponseWriter) BytesWritten() int64 { return w.bytesWritten }
-
-var _ ghmm.Reporter = (*metricsResponseWriter)(nil)

internal/middleware/middleware.go

@@ -3,7 +3,6 @@
 package middleware
 
 import (
-	"context"
 	"log/slog"
 	"net"
 	"net/http"
@@ -70,19 +69,18 @@ const (
 	//	url, useragent, referer   3*(512+11) = 1569
 	//	request_id                    128+11 =  139
 	//	method                         32+11 =   43
-	//	fixed portion                        =  405
+	//	fixed portion                        =  336
 	//	                                        ----
-	//	                                        2156
+	//	                                        2087
 	//
 	// The 512 is logfield.MaxBytes; the 11 is the truncation marker,
 	// charged on top of each budget rather than inside it.
 	//
 	// The fixed portion is the JSON punctuation, the field names, the
-	// level and the message, both timestamps at their longest, remoteIP
+	// level and the message, both timestamps at their longest, an IPv6
-	// and clientIP each charged as an IPv6 address with a zone, a
+	// remoteIP with a zone, a three-digit status and a full-width int64
-	// three-digit status and a full-width int64 latency. Stated at 2560
+	// latency. Stated at 2560 so the figure carries headroom rather
-	// so the figure carries headroom rather than sitting on the
+	// than sitting on the arithmetic.
-	// arithmetic.
 	//
 	// The tty text handler in internal/logger is covered by the same
 	// figure. logfield.EncodedBytes charges every rune at least what
@@ -90,8 +88,8 @@ const (
 	// bytes strconv.Quote spends on a non-printable rune at or above
 	// U+10000, which is four more than the JSON handler ever spends —
 	// so each budget bounds the encoded field under either handler.
-	// The text handler's fixed portion is 351, the smaller of the two,
+	// The text handler's fixed portion is 286, the smaller of the two,
-	// which puts its worst case at 2102.
+	// which puts its worst case at 2037.
 	//
 	// It is also the ceiling on every OTHER line this service writes
 	// THROUGH SLOG that carries text an UNAUTHENTICATED client
@@ -217,28 +215,6 @@ func ipFromHostPort(hp string) string {
 	return h
 }
 
-// RemoteIP returns the address of the connecting peer, without its
-// port. Behind a reverse proxy it is the proxy. Every log line that
-// names the client logs it as remoteIP, next to clientIP.
-func RemoteIP(r *http.Request) string {
-	return ipFromHostPort(r.RemoteAddr)
-}
-
-// clientIPKey is the request context key under which Logging stores
-// the value ClientIP returns.
-type clientIPKey struct{}
-
-// ClientIP returns the address the request is attributed to, which
-// Logging works out once per request with clientAddr in ratelimit.go
-// and logs as clientIP. The other lines that name the client read it
-// from here, so all of them agree. It is empty for a request Logging
-// has not seen.
-func ClientIP(r *http.Request) string {
-	ip, _ := r.Context().Value(clientIPKey{}).(string)
-
-	return ip
-}
-
 type loggingResponseWriter struct {
 	http.ResponseWriter
 
@@ -257,13 +233,6 @@ func (lrw *loggingResponseWriter) WriteHeader(code int) {
 	lrw.ResponseWriter.WriteHeader(code)
 }
 
-// Unwrap lets http.ResponseController reach the writer underneath, so
-// a handler can still flush or set a write deadline through the access
-// log.
-func (lrw *loggingResponseWriter) Unwrap() http.ResponseWriter {
-	return lrw.ResponseWriter
-}
-
 // concreteLogURL renders the request's own URL for the access log
 // branches that keep it, with the query string replaced by a fixed
 // marker.
@@ -340,13 +309,6 @@ func (s *Middleware) Logging() func(http.Handler) http.Handler {
 			lrw := newLoggingResponseWriter(w)
 			ctx := r.Context()
 
-			// When RemoteAddr is not an address, the peer's own
-			// text is all the request can be attributed to.
-			clientIP := RemoteIP(r)
-			if addr, ok := s.clientAddr(r); ok {
-				clientIP = addr.String()
-			}
-
 			defer func() {
 				latency := time.Since(start)
 				requestID := ""
@@ -381,16 +343,13 @@ func (s *Middleware) Logging() func(http.Handler) http.Handler {
 						r.Referer(), logfield.MaxBytes,
 					),
 					"proto", r.Proto,
-					"remoteIP", RemoteIP(r),
+					"remoteIP", ipFromHostPort(r.RemoteAddr),
-					"clientIP", clientIP,
 					"status", lrw.statusCode,
 					"latency_ms", latency.Milliseconds(),
 				)
 			}()
 
-			next.ServeHTTP(lrw, r.WithContext(
+			next.ServeHTTP(lrw, r)
-				context.WithValue(ctx, clientIPKey{}, clientIP),
-			))
 		})
 	}
 }
@@ -600,10 +559,7 @@ func bodyLimitedMethod(method string) bool {
 }
 
 // MaxBodySize returns middleware that limits the size of
-// POST/PUT/PATCH request bodies to maxBytes. A request with any other
+// POST/PUT/PATCH request bodies to maxBytes. It must be registered
-// method passes through uncapped, deliberately: no route behind it
-// reads a body on GET, HEAD or DELETE. A handler that starts to needs
-// its method added to bodyLimitedMethod first. It must be registered
 // before any middleware that parses the body — notably CSRF, which
 // calls r.PostFormValue — so that form parsing happens under this
 // cap rather than net/http's 10 MB default.

internal/middleware/middleware_test.go

@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gorilla/sessions"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"sneak.berlin/go/webhooker/internal/config"
@@ -77,7 +78,14 @@ func newTestSessionManager(
 		key[i] = byte(i)
 	}
 
-	store := session.NewStore(key)
+	store := sessions.NewCookieStore(key)
+	store.Options = &sessions.Options{
+		Path:     "/",
+		MaxAge:   86400 * 7,
+		HttpOnly: true,
+		Secure:   false,
+		SameSite: http.SameSiteLaxMode,
+	}
 
 	var now func() time.Time
 
@@ -730,8 +738,10 @@ func TestNoCache_SetsHeaders(t *testing.T) {
 
 const testBodyLimit int64 = 64
 
-// maxBodySizeResult is what runMaxBodySize's sentinel handler saw,
+// maxBodySizeHandler wraps a sentinel handler in MaxBodySize with
-// together with the response.
+// testBodyLimit. The sentinel records whether it ran and how much of
+// the body it managed to read, so tests can distinguish "never
+// reached" from "reached but truncated".
 type maxBodySizeResult struct {
 	called   bool
 	read     int
@@ -739,10 +749,6 @@ type maxBodySizeResult struct {
 	response *httptest.ResponseRecorder
 }
 
-// runMaxBodySize wraps a sentinel handler in MaxBodySize with
-// testBodyLimit and serves req through it. The sentinel records
-// whether it ran and how much of the body it managed to read, so
-// tests can distinguish "never reached" from "reached but truncated".
 func runMaxBodySize(
 	t *testing.T,
 	req *http.Request,
@@ -925,7 +931,8 @@ func metricsAuthMiddleware(
 	}
 
 	key := make([]byte, testKeySize)
-	store := session.NewStore(key)
+	store := sessions.NewCookieStore(key)
+	store.Options = &sessions.Options{Path: "/", MaxAge: 86400}
 
 	sessManager := session.NewForTest(store, cfg, log, key, nil)
 

internal/middleware/ratelimit.go

@@ -202,61 +202,44 @@ func (m *Middleware) forwardedClientAddr(
 }
 
 // rateLimitKey is the client identity every rate limiter in this
-// package buckets on: the address clientAddr attributes the request
+// package buckets on. Forwarded headers are honoured only when the
-// to, reduced to a bucket by bucketKey — full address for IPv4, /64
+// direct peer (RemoteAddr) is inside the configured trusted-proxy
-// prefix for IPv6.
+// set; otherwise the peer address itself is the key. Without that
+// gate any client could mint a fresh bucket per request, or starve
+// another client's bucket, by picking an X-Forwarded-For value —
+// which makes every limit here decorative against a deliberate
+// attacker.
+//
+// The address that identifies the client is then reduced to a bucket
+// by bucketKey: full address for IPv4, /64 prefix for IPv6.
 func (m *Middleware) rateLimitKey(r *http.Request) (string, error) {
 	return m.clientKey(r), nil
 }
 
 // clientKey computes the bucket key described on rateLimitKey.
 func (m *Middleware) clientKey(r *http.Request) string {
-	addr, ok := m.clientAddr(r)
+	peer, err := netip.ParseAddr(ipFromHostPort(r.RemoteAddr))
-	if !ok {
+	if err != nil {
 		// Not an address we can reason about; key on the raw
 		// value, the most specific identity left. Distinct
 		// RemoteAddr values stay in distinct buckets, so this
 		// path cannot silently collapse unrelated clients
 		// together. On a Unix-socket listener every peer
 		// carries the same RemoteAddr and so shares one bucket,
-		// which is the fail-closed direction. An empty RemoteAddr
+		// which is the fail-closed direction.
-		// is a different case, which net/http never produces for
-		// a TCP listener and only a hand-built request carries,
-		// but it fails closed the same way: every such request
-		// shares the one bucket keyed on the empty string.
 		return r.RemoteAddr
 	}
 
-	return bucketKey(addr)
-}
-
-// clientAddr is the address a request is attributed to. The rate
-// limiters key on it and the logs name it as clientIP.
-//
-// Forwarded headers are honoured only when the direct peer
-// (RemoteAddr) is inside the configured trusted-proxy set; otherwise
-// the peer address itself is the client. Without that gate any client
-// could mint a fresh bucket per request, or starve another client's
-// bucket, by picking an X-Forwarded-For value — which makes every
-// limit here decorative against a deliberate attacker.
-//
-// ok is false when RemoteAddr is not an address at all.
-func (m *Middleware) clientAddr(r *http.Request) (netip.Addr, bool) {
-	peer, err := netip.ParseAddr(ipFromHostPort(r.RemoteAddr))
-	if err != nil {
-		return netip.Addr{}, false
-	}
-
 	peer = normalizeAddr(peer)
 	if !m.isTrustedProxy(peer) {
-		return peer, true
+		return bucketKey(peer)
 	}
 
 	if addr, ok := m.forwardedClientAddr(r); ok {
-		return addr, true
+		return bucketKey(addr)
 	}
 
-	return peer, true
+	return bucketKey(peer)
 }
 
 // tooManyRequests returns the 429 handler used by the
@@ -279,8 +262,6 @@ func (m *Middleware) tooManyRequests(
 			"path", logfield.Truncate(
 				r.URL.Path, logfield.MaxBytes,
 			),
-			"remoteIP", RemoteIP(r),
-			"clientIP", ClientIP(r),
 		)
 		http.Error(w, responseMessage, http.StatusTooManyRequests)
 	}
@@ -305,12 +286,8 @@ func (m *Middleware) tooManyRequests(
 func (m *Middleware) floodTooManyRequests(
 	logMessage, responseMessage string,
 ) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
+	return func(w http.ResponseWriter, _ *http.Request) {
-		m.log.Debug(
+		m.log.Debug(logMessage)
-			logMessage,
-			"remoteIP", RemoteIP(r),
-			"clientIP", ClientIP(r),
-		)
 		http.Error(w, responseMessage, http.StatusTooManyRequests)
 	}
 }

internal/middleware/ratelimit_test.go

@@ -1012,23 +1012,6 @@ func TestRateLimitKey_UnparseablePeerKeepsDistinctBuckets(
 	)
 }
 
-// TestRateLimitKey_EmptyPeerSharesOneBucket pins what the fallback
-// does with an empty RemoteAddr: it keys on the empty string, so every
-// such request shares one bucket. That is the fail-closed direction
-// and is kept on purpose; only a hand-built request carries an empty
-// RemoteAddr.
-func TestRateLimitKey_EmptyPeerSharesOneBucket(t *testing.T) {
-	t.Parallel()
-
-	m := rateLimitMiddleware(t, &config.Config{})
-
-	assert.Empty(
-		t, clientKeyFor(t, m, ""),
-		"every peer with an empty RemoteAddr must key on the "+
-			"empty string and so share one bucket",
-	)
-}
-
 // TestPostRateLimit_IPv6SharesBucketWithinSlash64 is the behavioural
 // half, and the regression test for the bypass itself: a client that
 // rotates source addresses inside its own routed /64 must stay in one

internal/middleware/recoverer_test.go

@@ -627,9 +627,11 @@ func TestRecovererIgnoresANonPanickingHandler(t *testing.T) {
 // net/http's own writer from http.ResponseController, so a handler
 // that flushes or sets a deadline starts failing.
 //
-// The recoverer is the only middleware in the chain here;
+// The recoverer is the only middleware in the chain here. The access
-// TestResponseControllerThroughProductionRouter in internal/server
+// logger's own wrapper does not implement Unwrap, so a chain
-// covers the shipped chain.
+// containing it fails this regardless of what the recoverer does;
+// what is being pinned is that the recoverer adds no such opacity of
+// its own.
 func TestRecovererKeepsResponseControllerWorking(t *testing.T) {
 	t.Parallel()
 

internal/middleware/timeout.go

@@ -1,71 +0,0 @@
-package middleware
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"time"
-)
-
-// Timeout returns middleware that gives each request limit to finish:
-// it cancels the request's context once limit has passed, and answers
-// 504 when the handler then returns without having started its
-// response.
-//
-// It replaces chi's middleware.Timeout, which writes that 504 even
-// after the handler has sent its own status. A download that outlasts
-// the limit has already sent its 200 and the whole file, so the late
-// 504 changes nothing for the client: the access log and the metrics
-// would record it in place of the 200, and net/http would complain of
-// a superfluous WriteHeader.
-func (s *Middleware) Timeout(
-	limit time.Duration,
-) func(http.Handler) http.Handler {
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(
-			w http.ResponseWriter,
-			r *http.Request,
-		) {
-			ctx, cancel := context.WithTimeout(r.Context(), limit)
-			defer cancel()
-
-			tw := &timeoutResponseWriter{ResponseWriter: w}
-
-			next.ServeHTTP(tw, r.WithContext(ctx))
-
-			if !tw.started &&
-				errors.Is(ctx.Err(), context.DeadlineExceeded) {
-				w.WriteHeader(http.StatusGatewayTimeout)
-			}
-		})
-	}
-}
-
-// timeoutResponseWriter records whether the handler has started its
-// response.
-type timeoutResponseWriter struct {
-	http.ResponseWriter
-
-	started bool
-}
-
-func (w *timeoutResponseWriter) WriteHeader(code int) {
-	w.started = true
-
-	w.ResponseWriter.WriteHeader(code)
-}
-
-func (w *timeoutResponseWriter) Write(b []byte) (int, error) {
-	// A Write without a WriteHeader starts the response too: net/http
-	// sends 200 in front of it.
-	w.started = true
-
-	//nolint:wrapcheck // Pass the writer's own error through unchanged.
-	return w.ResponseWriter.Write(b)
-}
-
-// Unwrap lets http.ResponseController reach the writer underneath, so
-// a handler can still set a write deadline through this wrapper.
-func (w *timeoutResponseWriter) Unwrap() http.ResponseWriter {
-	return w.ResponseWriter
-}

internal/middleware/timeout_test.go

@@ -1,56 +0,0 @@
-package middleware_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-// TestTimeout proves the request limit answers 504 to a handler that
-// outlasts it without starting its response, and leaves a response the
-// handler has started with the status it sent. Both are what the
-// access log records.
-func TestTimeout(t *testing.T) {
-	t.Parallel()
-
-	const limit = 10 * time.Millisecond
-
-	for _, tc := range []struct {
-		name string
-		sent int // the status the handler sends, or 0 for none
-		want int
-	}{
-		{name: "not started", sent: 0, want: http.StatusGatewayTimeout},
-		{name: "started", sent: http.StatusOK, want: http.StatusOK},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			m, buf := capturingMiddleware(t)
-			handler := m.Logging()(m.Timeout(limit)(http.HandlerFunc(
-				func(w http.ResponseWriter, r *http.Request) {
-					if tc.sent != 0 {
-						w.WriteHeader(tc.sent)
-					}
-
-					<-r.Context().Done()
-				},
-			)))
-
-			w := httptest.NewRecorder()
-			handler.ServeHTTP(w, httptest.NewRequestWithContext(
-				t.Context(), http.MethodGet, "/", nil,
-			))
-
-			assert.Equal(t, tc.want, w.Code)
-
-			entries := accessLogEntries(t, buf)
-			require.Len(t, entries, 1)
-			assert.EqualValues(t, tc.want, entries[0]["status"])
-		})
-	}
-}

internal/resetpw/resetpw_test.go

@@ -132,15 +132,9 @@ type noopNotifier struct{}
 
 func (n *noopNotifier) Notify([]delivery.Task) {}
 
-type noopArchives struct{}
+type noopEvictor struct{}
 
-func (n *noopArchives) EvictWebhook(string) {}
+func (n *noopEvictor) EvictWebhook(string) {}
-
-func (n *noopArchives) EvictTarget(string) {}
-
-func (n *noopArchives) Rename(_, _, _ string) error {
-	return nil
-}
 
 // newServerApp starts the real login path against dir: the handlers,
 // the middleware that bounds password verification, the session store
@@ -158,10 +152,6 @@ func newServerApp(
 
 	app := fxtest.New(
 		t,
-		// fx's own log is discarded, not sent to t.Logf: a hook still
-		// running after a start or stop timeout would write there after
-		// the test has returned.
-		fx.NopLogger,
 		fx.Provide(
 			globals.New,
 			logger.New,
@@ -173,7 +163,7 @@ func newServerApp(
 			healthcheck.New,
 			session.New,
 			func() delivery.Notifier { return &noopNotifier{} },
-			func() delivery.Archives { return &noopArchives{} },
+			func() delivery.WebhookEvictor { return &noopEvictor{} },
 			metrics.NewRegistry,
 			metrics.New,
 			middleware.New,

internal/server/alpine_browser_test.go

@@ -1,427 +0,0 @@
-//go:build browser
-
-// This test needs a headless browser, so it is built only with the
-// browser build tag: `make test` leaves it out, and `make test-browser`
-// runs it in the browser image that Dockerfile.browser pins.
-
-package server_test
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"slices"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/chromedp/cdproto/browser"
-	"github.com/chromedp/cdproto/log"
-	"github.com/chromedp/cdproto/network"
-	"github.com/chromedp/cdproto/runtime"
-	"github.com/chromedp/chromedp"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm/clause"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-const (
-	// browserTimeout bounds everything one test does in the browser.
-	browserTimeout = 60 * time.Second
-
-	// settleTimeout bounds the wait for an element to show or hide.
-	settleTimeout = 5 * time.Second
-
-	// The window size of a phone, narrow enough that the pages show
-	// the mobile menu button instead of the navigation links.
-	phoneWidth  = 390
-	phoneHeight = 844
-)
-
-// TestAlpineRunsUnderTheSecurityPolicy loads the webhook page and the
-// event log in a headless browser, served by the real router and so
-// under the real Content-Security-Policy, and checks that the pages'
-// Alpine.js directives and the copy control work.
-func TestAlpineRunsUnderTheSecurityPolicy(t *testing.T) {
-	t.Parallel()
-
-	ctx, problems := startBrowser(t)
-
-	env := newTestEnv(t)
-	srv := httptest.NewServer(env.router)
-	t.Cleanup(srv.Close)
-
-	userID, _ := env.seedUser(t, "browser", "browser-password")
-	webhook := env.seedWebhook(t, userID)
-	require.NoError(t, env.db.DB().Omit(clause.Associations).Create(
-		&database.Entrypoint{
-			WebhookID: webhook.ID,
-			Path:      "3c9e1f7a-5b2d-4e8a-9f6c-2a7d1e4b8c05",
-			Active:    true,
-		},
-	).Error)
-	event := env.seedEvent(t, webhook.ID, `{"hello":"browser"}`)
-	target := env.seedTarget(t, webhook.ID)
-	dlv := env.seedFailedDelivery(t, webhook.ID, event.ID, target.ID)
-
-	webhookDB, err := env.dbMgr.GetDB(webhook.ID)
-	require.NoError(t, err)
-	require.NoError(t, webhookDB.Omit(clause.Associations).Create(
-		&database.DeliveryResult{
-			DeliveryID: dlv.ID,
-			AttemptNum: 1,
-			StatusCode: http.StatusBadGateway,
-		},
-	).Error)
-
-	require.NoError(t, chromedp.Run(
-		ctx, setCookies(srv.URL, env.authCookies(t, userID, "browser")),
-	))
-
-	page := srv.URL + "/hook/" + webhook.ID
-
-	checkAddForms(ctx, t, page)
-	checkTargetType(ctx, t, page+"/events")
-	checkCopy(ctx, t, page)
-	checkEventLog(ctx, t, page+"/events", event.ID, target.Name)
-	checkMobileMenu(ctx, t, page)
-
-	assert.Empty(t, problems(), "the browser reported problems")
-}
-
-// startBrowser starts a headless browser for one test. It returns the
-// context that drives it, and a function listing what the browser
-// reported going wrong on its pages: console warnings and errors,
-// which is how Alpine.js reports an expression it cannot run; uncaught
-// exceptions; and every entry in the browser's own security log, which
-// is where it reports each script, style, image or request the
-// Content-Security-Policy refused.
-//
-// The browser library finds the browser on PATH. Without one the first
-// chromedp.Run fails, and with it the test.
-func startBrowser(t *testing.T) (context.Context, func() []string) {
-	t.Helper()
-
-	allocCtx, cancelAlloc := chromedp.NewExecAllocator(
-		t.Context(),
-		append(
-			chromedp.DefaultExecAllocatorOptions[:],
-			// Dockerfile.browser runs the test as root, where the
-			// browser's sandbox cannot start.
-			chromedp.NoSandbox,
-		)...,
-	)
-	t.Cleanup(cancelAlloc)
-
-	ctx, cancel := chromedp.NewContext(allocCtx)
-	t.Cleanup(cancel)
-
-	ctx, cancelTimeout := context.WithTimeout(ctx, browserTimeout)
-	t.Cleanup(cancelTimeout)
-
-	var (
-		mu       sync.Mutex
-		problems []string
-	)
-
-	chromedp.ListenTarget(ctx, func(ev any) {
-		var problem string
-
-		switch ev := ev.(type) {
-		case *runtime.EventConsoleAPICalled:
-			if ev.Type != runtime.APITypeWarning &&
-				ev.Type != runtime.APITypeError {
-				return
-			}
-
-			args := make([]string, 0, len(ev.Args))
-			for _, arg := range ev.Args {
-				args = append(args, string(arg.Value))
-			}
-
-			problem = strings.Join(args, " ")
-		case *runtime.EventExceptionThrown:
-			problem = ev.ExceptionDetails.Error()
-		case *log.EventEntryAdded:
-			if ev.Entry.Source != log.SourceSecurity {
-				return
-			}
-
-			problem = ev.Entry.Text
-		default:
-			return
-		}
-
-		mu.Lock()
-		defer mu.Unlock()
-
-		problems = append(problems, problem)
-	})
-
-	return ctx, func() []string {
-		mu.Lock()
-		defer mu.Unlock()
-
-		return slices.Clone(problems)
-	}
-}
-
-// setCookies gives the browser the cookies for the server at base.
-func setCookies(base string, cookies []*http.Cookie) chromedp.ActionFunc {
-	return chromedp.ActionFunc(func(ctx context.Context) error {
-		for _, c := range cookies {
-			err := network.SetCookie(c.Name, c.Value).
-				WithURL(base).
-				Do(ctx)
-			if err != nil {
-				return fmt.Errorf("set cookie %s: %w", c.Name, err)
-			}
-		}
-
-		return nil
-	})
-}
-
-// loadPage opens url and waits for Alpine.js to start, which it does
-// by removing every x-cloak attribute. Until then x-cloak hides the
-// elements Alpine would hide, so a check made earlier proves nothing.
-func loadPage(url string) chromedp.Tasks {
-	return chromedp.Tasks{
-		chromedp.Navigate(url),
-		chromedp.WaitNotPresent("[x-cloak]", chromedp.ByQuery),
-	}
-}
-
-// shown waits up to settleTimeout for the elements matching a CSS
-// selector or an XPath expression to be rendered, and reports whether
-// they were. The wait is needed because Alpine.js shows an element on
-// the next animation frame, not at once.
-func shown(ctx context.Context, selector string) bool {
-	ctx, cancel := context.WithTimeout(ctx, settleTimeout)
-	defer cancel()
-
-	return chromedp.Run(
-		ctx, chromedp.WaitVisible(selector, chromedp.BySearch),
-	) == nil
-}
-
-// hidden is shown's opposite: it waits for the elements to be hidden.
-func hidden(ctx context.Context, selector string) bool {
-	ctx, cancel := context.WithTimeout(ctx, settleTimeout)
-	defer cancel()
-
-	return chromedp.Run(
-		ctx, chromedp.WaitNotVisible(selector, chromedp.BySearch),
-	) == nil
-}
-
-// click clicks the element matching an XPath expression.
-func click(ctx context.Context, t *testing.T, xpath string) {
-	t.Helper()
-
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.Click(xpath, chromedp.BySearch),
-	))
-}
-
-// checkAddForms loads a webhook page and checks that each section's add
-// form stays hidden until the Add button beside its heading is clicked.
-// The click looks for a button element there, so it also checks that
-// Add is one.
-func checkAddForms(ctx context.Context, t *testing.T, url string) {
-	t.Helper()
-
-	require.NoError(t, chromedp.Run(ctx, loadPage(url)))
-
-	sections := []struct{ heading, form string }{
-		{"Entrypoints", `form[action$="/entrypoints"]`},
-		{"Targets", `form[action$="/targets"]`},
-	}
-
-	for _, s := range sections {
-		assert.Truef(
-			t, hidden(ctx, s.form),
-			"%s: the add form shows before Add is clicked", s.heading,
-		)
-
-		click(ctx, t, `//h2[text()="`+s.heading+
-			`"]/following-sibling::button`)
-
-		assert.Truef(
-			t, shown(ctx, s.form),
-			"%s: the add form stays hidden when Add is clicked", s.heading,
-		)
-	}
-}
-
-// checkTargetType chooses Slack in the open add target form and checks
-// what the form would then submit: one url field, the Slack one, and
-// not the HTTP url, headers or timeout, which are hidden and disabled.
-//
-// It then opens the page at elsewhere and goes back. The browser loads
-// the webhook page again and restores the form as it was left, Slack
-// chosen, without a change event; the form must again show and submit
-// Slack's fields, not the HTTP ones.
-func checkTargetType(ctx context.Context, t *testing.T, elsewhere string) {
-	t.Helper()
-
-	const (
-		chooseSlack = `(() => {
-			const type = document.querySelector('select[name="type"]');
-			type.value = "slack";
-			type.dispatchEvent(new Event("change"));
-		})()`
-		chosen    = `document.querySelector('select[name="type"]').value`
-		howLoaded = `performance.getEntriesByType("navigation")[0].type`
-		submitted = `[...new FormData(
-			document.querySelector('form[action$="/targets"]')).keys()]`
-		slackURL = `input[placeholder^="https://hooks.slack.com/"]`
-		httpURL  = `input[placeholder="https://example.com/webhook"]`
-	)
-
-	slackFields := strings.Fields("csrf_token name type max_retries url")
-
-	var fields []string
-
-	require.NoError(t, chromedp.Run(
-		ctx,
-		chromedp.Evaluate(chooseSlack, nil),
-		chromedp.Evaluate(submitted, &fields),
-	))
-
-	assert.Equal(
-		t, slackFields, fields,
-		"with Slack chosen, the HTTP fields must not be submitted",
-	)
-
-	var loaded, restored string
-
-	// Going back waits for the load event, after which the browser has
-	// restored the form.
-	require.NoError(t, chromedp.Run(
-		ctx,
-		loadPage(elsewhere),
-		chromedp.NavigateBack(),
-		chromedp.WaitNotPresent("[x-cloak]", chromedp.ByQuery),
-		chromedp.Evaluate(howLoaded, &loaded),
-		chromedp.Evaluate(chosen, &restored),
-	))
-
-	// A page the browser kept in memory and showed again as it was
-	// would prove nothing here.
-	require.Equal(
-		t, "back_forward", loaded,
-		"going back, the browser did not load the page again",
-	)
-	require.Equal(
-		t, "slack", restored,
-		"going back, the browser did not restore the chosen type",
-	)
-
-	click(ctx, t, `//h2[text()="Targets"]/following-sibling::button`)
-
-	assert.True(t, shown(ctx, slackURL),
-		"going back with Slack chosen, the Slack fields are not shown")
-	assert.True(t, hidden(ctx, httpURL),
-		"going back with Slack chosen, the HTTP fields are shown")
-
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.Evaluate(submitted, &fields),
-	))
-
-	assert.Equal(
-		t, slackFields, fields,
-		"going back with Slack chosen, the HTTP fields must not be submitted",
-	)
-}
-
-// checkCopy loads a webhook page and checks that the Copy control beside
-// its entrypoint's URL is a button, and that clicking it copies the URL
-// and says so: the button reads "Copied" only once the copy succeeded.
-func checkCopy(ctx context.Context, t *testing.T, url string) {
-	t.Helper()
-
-	copyButton := `//button[@data-copy-target]`
-
-	// A browser lets the page in its active tab write to the clipboard
-	// on a click. A headless browser refuses unless told to allow it.
-	require.NoError(t, chromedp.Run(
-		ctx,
-		browser.SetPermission(
-			&browser.PermissionDescriptor{Name: "clipboard-write"},
-			browser.PermissionSettingGranted,
-		),
-		loadPage(url),
-	))
-
-	click(ctx, t, copyButton)
-
-	assert.True(t, shown(ctx, copyButton+`[text()="Copied"]`),
-		`clicking Copy does not show "Copied"`)
-}
-
-// checkEventLog loads the event log and checks that clicking an event's
-// row expands it, that in there clicking its delivery shows the
-// delivery's attempts and clicking again hides them, and that clicking
-// the event's row again collapses it.
-func checkEventLog(
-	ctx context.Context, t *testing.T, url, eventID, targetName string,
-) {
-	t.Helper()
-
-	// The event's row shows its ID, and its Resubmit form is in the part
-	// that expands. The delivery's row there shows the target's name.
-	eventRow := `//span[text()="` + eventID + `"]`
-	expanded := `form[action$="/resubmit"]`
-	deliveryRow := `//span[text()="` + targetName + `"]`
-	attempt := `//span[text()="Attempt 1"]`
-
-	require.NoError(t, chromedp.Run(ctx, loadPage(url)))
-
-	assert.True(t, hidden(ctx, expanded), "the event starts expanded")
-
-	click(ctx, t, eventRow)
-	assert.True(t, shown(ctx, expanded), "clicking the event does not expand it")
-
-	assert.True(t, hidden(ctx, attempt), "the delivery's attempts start shown")
-
-	click(ctx, t, deliveryRow)
-	assert.True(t, shown(ctx, attempt),
-		"clicking the delivery does not show its attempts")
-
-	click(ctx, t, deliveryRow)
-	assert.True(t, hidden(ctx, attempt),
-		"clicking the delivery again does not hide its attempts")
-
-	click(ctx, t, eventRow)
-	assert.True(t, hidden(ctx, expanded),
-		"clicking the event again does not collapse it")
-}
-
-// checkMobileMenu loads a page in a phone-sized window and checks that
-// the menu button opens and closes the mobile menu.
-func checkMobileMenu(ctx context.Context, t *testing.T, url string) {
-	t.Helper()
-
-	// The menu button is the only button directly in the navigation
-	// bar's top row. Profile is a link only the mobile menu has.
-	button := `//nav/div/button`
-	menu := `//nav//a[text()="Profile"]`
-
-	require.NoError(t, chromedp.Run(
-		ctx,
-		chromedp.EmulateViewport(phoneWidth, phoneHeight),
-		loadPage(url),
-	))
-
-	assert.True(t, hidden(ctx, menu), "the mobile menu starts open")
-
-	click(ctx, t, button)
-	assert.True(t, shown(ctx, menu), "the menu button does not open the menu")
-
-	click(ctx, t, button)
-	assert.True(t, hidden(ctx, menu), "the menu button does not close the menu")
-}

internal/server/archive_download_test.go

@@ -1,69 +0,0 @@
-package server_test
-
-import (
-	"compress/gzip"
-	"encoding/json"
-	"net/http"
-	"regexp"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm/clause"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestHook_DownloadArchive follows the Download link the webhook page
-// shows for a database target, and only for it, and gets the archive
-// as a gzipped JSON file. Signed out, the link leads to the login page.
-func TestHook_DownloadArchive(t *testing.T) {
-	t.Parallel()
-
-	env := newTestEnv(t)
-
-	userID, _ := env.seedUser(t, "archivist", "somepassword")
-	cookies := env.authCookies(t, userID, "archivist")
-	wh := env.seedWebhook(t, userID)
-	env.seedTarget(t, wh.ID)
-
-	archive := &database.Target{
-		WebhookID: wh.ID,
-		Name:      "kept",
-		Type:      database.TargetTypeDatabase,
-		Active:    true,
-	}
-	require.NoError(t,
-		env.db.DB().Omit(clause.Associations).Create(archive).Error,
-	)
-
-	page := env.get("/hook/"+wh.ID, cookies)
-	require.Equal(t, http.StatusOK, page.Code)
-
-	links := regexp.MustCompile(
-		`href="(/hook/[^/"]+/targets/[^/"]+/download)"`,
-	).FindAllStringSubmatch(page.Body.String(), -1)
-	require.Len(t, links, 1, "only the database target has a Download")
-
-	link := links[0][1]
-	assert.Equal(t,
-		"/hook/"+wh.ID+"/targets/"+archive.ID+"/download", link,
-	)
-
-	w := env.get(link, cookies)
-	require.Equal(t, http.StatusOK, w.Code)
-	assert.Equal(t, "application/gzip", w.Header().Get("Content-Type"))
-
-	zr, err := gzip.NewReader(w.Body)
-	require.NoError(t, err)
-
-	var got map[string]json.RawMessage
-
-	require.NoError(t, json.NewDecoder(zr).Decode(&got))
-	assert.JSONEq(t,
-		`{"id":"`+wh.ID+`","name":"routed"}`, string(got["webhook"]),
-	)
-
-	w = env.get(link, nil)
-	assert.Equal(t, http.StatusSeeOther, w.Code)
-	assert.Contains(t, w.Header().Get("Location"), "/pages/login")
-}

internal/server/error_page_test.go

@@ -191,7 +191,7 @@ func TestErrorPage_PanicOnAdminPage(t *testing.T) {
 
 	w := serve(
 		server.NewRouterWithPageProbeForTest(
-			t, env.log, env.cfg, env.mw, env.hnd,
+			env.log.Get(), env.cfg, env.mw, env.hnd,
 			true, panicProbeHandler,
 		),
 		server.PageProbePattern,
@@ -200,7 +200,7 @@ func TestErrorPage_PanicOnAdminPage(t *testing.T) {
 
 	w = serve(
 		server.NewRouterWithProbeForTest(
-			t, env.log, env.cfg, env.mw, env.hnd,
+			env.log.Get(), env.cfg, env.mw, env.hnd,
 			true, panicProbeHandler,
 		),
 		server.ProbePattern,

internal/server/export_test.go

@@ -1,18 +1,13 @@
 package server
 
 import (
-	"context"
 	"log/slog"
 	"net/http"
-	"testing"
 
 	"github.com/getsentry/sentry-go"
 	"github.com/go-chi/chi"
-	"github.com/stretchr/testify/require"
-	"go.uber.org/fx/fxtest"
 	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/logger"
 	"sneak.berlin/go/webhooker/internal/middleware"
 )
 
@@ -39,53 +34,23 @@ func SentryClientOptionsForTest(
 	return sentryClientOptions(dsn, release)
 }
 
-// CleanShutdownForTest runs the server's stop hook, cleanShutdown,
-// against hs: a server the test started itself, so it can hold a
-// request open across the drain. Sentry is off.
-func CleanShutdownForTest(ctx context.Context, hs *http.Server) {
-	s := &Server{log: slog.New(slog.DiscardHandler), httpServer: hs}
-	s.cleanShutdown(ctx)
-}
-
-// newServerForTest builds a Server through New, as the application
-// does, on a lifecycle that is never started: the hooks New adds to
-// it never run, so nothing listens.
-func newServerForTest(
-	t *testing.T,
-	log *logger.Logger,
-	cfg *config.Config,
-	mw *middleware.Middleware,
-	h *handlers.Handlers,
-) *Server {
-	t.Helper()
-
-	s, err := New(fxtest.NewLifecycle(t), ServerParams{
-		Logger:     log,
-		Config:     cfg,
-		Middleware: mw,
-		Handlers:   h,
-	})
-	require.NoError(t, err)
-
-	return s
-}
-
 // NewRouterForTest builds the real route tree via SetupRoutes with
-// the supplied middleware and handlers, on a Server from New whose
+// the supplied middleware and handlers, bypassing the fx lifecycle
-// lifecycle is never started, so no HTTP listener runs. Tests use it
+// and the HTTP listener. Tests use it so that route-group middleware
-// so that route-group middleware registration order is exercised
+// registration order is exercised exactly as it ships, rather than
-// exactly as it ships, rather than against a hand-rebuilt chain that
+// against a hand-rebuilt chain that could drift from routes.go.
-// could drift from routes.go.
 func NewRouterForTest(
-	t *testing.T,
+	log *slog.Logger,
-	log *logger.Logger,
 	cfg *config.Config,
 	mw *middleware.Middleware,
 	h *handlers.Handlers,
 ) http.Handler {
-	t.Helper()
+	s := &Server{
-
+		log:    log,
-	s := newServerForTest(t, log, cfg, mw, h)
+		mw:     mw,
+		h:      h,
+		params: ServerParams{Config: cfg},
+	}
 	s.SetupRoutes()
 
 	return s.router
@@ -118,17 +83,19 @@ const ProbePattern = "/probe"
 // option and the recoverer registered outside it is the thing a test
 // has to be able to pin.
 func NewRouterWithProbeForTest(
-	t *testing.T,
+	log *slog.Logger,
-	log *logger.Logger,
 	cfg *config.Config,
 	mw *middleware.Middleware,
 	h *handlers.Handlers,
 	sentryEnabled bool,
 	probe http.HandlerFunc,
 ) http.Handler {
-	t.Helper()
+	s := &Server{
-
+		log:    log,
-	s := newServerForTest(t, log, cfg, mw, h)
+		mw:     mw,
+		h:      h,
+		params: ServerParams{Config: cfg},
+	}
 	s.sentryEnabled.Store(sentryEnabled)
 	s.SetupRoutes()
 	s.router.Handle(ProbePattern, probe)
@@ -146,17 +113,19 @@ const PageProbePattern = "/pages/probe"
 // it, so the probe runs behind that group's own middleware exactly as
 // the group's real routes do.
 func NewRouterWithPageProbeForTest(
-	t *testing.T,
+	log *slog.Logger,
-	log *logger.Logger,
 	cfg *config.Config,
 	mw *middleware.Middleware,
 	h *handlers.Handlers,
 	sentryEnabled bool,
 	probe http.HandlerFunc,
 ) http.Handler {
-	t.Helper()
+	s := &Server{
-
+		log:    log,
-	s := newServerForTest(t, log, cfg, mw, h)
+		mw:     mw,
+		h:      h,
+		params: ServerParams{Config: cfg},
+	}
 	s.sentryEnabled.Store(sentryEnabled)
 	s.SetupRoutes()
 

internal/server/recoverer_test.go

@@ -199,7 +199,7 @@ func TestPanicProbeChild(t *testing.T) {
 	env := newTestEnv(t)
 
 	router := server.NewRouterWithProbeForTest(
-		t, env.log, env.cfg, env.mw, env.hnd,
+		env.log.Get(), env.cfg, env.mw, env.hnd,
 		false, panicProbeHandler,
 	)
 
@@ -253,7 +253,7 @@ func TestSentryStillSeesAPanic(t *testing.T) {
 	require.NoError(t, err)
 
 	router := server.NewRouterWithProbeForTest(
-		t, env.log, env.cfg, env.mw, env.hnd,
+		env.log.Get(), env.cfg, env.mw, env.hnd,
 		true, panicProbeHandler,
 	)