Make every clickable control look clickable, in two shared styles (closes #375)

Buttons keep btn-primary, btn-secondary and btn-danger and gain a
pointer cursor; the site name and the navigation links become
btn-secondary buttons. Every control that was plain coloured text
(Copy, both Add, the row actions, Resubmit, Replay, the back, footer
and download links) now uses btn-small, bordered at rest with hover
and focus states. Each card on the webhook list shows an Open label in
btn-small and takes its focus outline. Both styles are in
static/css/style.css, which the layout now loads.

The event log's clickable rows become buttons, so they work by
keyboard; Replay moves beside its delivery's row. Rows on the webhook
page and in the event log wrap at phone width. The browser test now
checks that Copy reads "Copied".

Model: opus-5-5

.dockerignore

@@ -15,9 +15,6 @@ bin/
 # Extracted from 3p/ by `make assets` inside the build; a host copy is not
 # needed. The tarball in 3p/ must stay in the context.
 static/js/alpine.min.js
-# The js-deps stage installs ESLint; a host copy would overwrite it at the
-# js-lint stage's `COPY . .`.
-node_modules/
 .env
 .env.*
 *.db

.gitea/workflows/check.yml

@@ -28,10 +28,10 @@ jobs:
 
       - name: Fingerprint the build context
         # Writes the hash of the commit being checked into the context, which
-        # invalidates the `COPY . .` layer of every check stage: a commit
+        # invalidates the `COPY . .` layer of both check stages: a commit
-        # that was never linted, format-checked, stylesheet-checked, tested
+        # that was never linted, format-checked, tested and built cannot
-        # and built cannot report success from cache.
+        # report success from cache.
         run: git rev-parse HEAD > .ci-fingerprint
 
-      - name: Build Docker image (runs make fmt-check, golangci-lint, the stylesheet check, ESLint, make test, make build)
+      - name: Build Docker image (runs make fmt-check, golangci-lint, make test, make build)
         run: script/cibuild

.gitignore

@@ -15,9 +15,6 @@ bin/
 # Go vendor directory
 vendor/
 
-# ESLint and its dependencies, installed from yarn.lock
-node_modules/
-
 # IDE specific files
 .idea/
 *.swp

Dockerfile

@@ -25,71 +25,17 @@ COPY . .
 # would need a docker daemon inside the build. Keep these steps in step with
 # Dockerfile.lint, including --network=none (see its header for why).
 RUN make fmt-check
-RUN script/assets
 RUN --network=none golangci-lint config verify --config .golangci.yml
 RUN --network=none golangci-lint run --config .golangci.yml --build-tags browser ./...
 
-# Stylesheet stages. static/css/tailwind.css is generated, by this pinned
-# tailwindcss, from static/css/input.css and the files its @source lines
-# name. `make css` (script/css) writes it out from the css-output stage.
-# The css-check stage fails when the committed file differs from what is
-# generated; `make check` runs it, and so does the build stage below.
-#
-# tailwindcss v4.2.1 standalone CLI, released 2026-02-23: one binary per
-# architecture, each pinned by its sha256 from the release's sha256sums.txt.
-# debian:bookworm-slim, 2026-10-02: the binary needs glibc.
-FROM debian:bookworm-slim@sha256:3783cc01769c7b2b1b83a5c5ad96c815348e28ed7da68e2e3687004faa906251 AS tailwind-amd64
-ADD --checksum=sha256:39e8d4e24b3c83b0a6e69e100a972fbc75d5fef8dce47b3ddac3cf92dea81fe3 --chmod=755 \
-    https://github.com/tailwindlabs/tailwindcss/releases/download/v4.2.1/tailwindcss-linux-x64 /usr/local/bin/tailwindcss
-
-FROM debian:bookworm-slim@sha256:3783cc01769c7b2b1b83a5c5ad96c815348e28ed7da68e2e3687004faa906251 AS tailwind-arm64
-ADD --checksum=sha256:d87e6486bb3f70b04ef1dcaacc4ee6548a5a15fbf521b31bc24d2c774f68a951 --chmod=755 \
-    https://github.com/tailwindlabs/tailwindcss/releases/download/v4.2.1/tailwindcss-linux-arm64 /usr/local/bin/tailwindcss
-
-# TARGETARCH, set by docker, is the architecture being built for.
-FROM tailwind-${TARGETARCH} AS css
-WORKDIR /src
-COPY . .
-RUN tailwindcss -i static/css/input.css -o /out/tailwind.css --minify
-
-FROM scratch AS css-output
-COPY --from=css /out/tailwind.css /
-
-# Both files are split after each "}", one rule per line, so that when they
-# differ the diff shows the rules that differ.
-FROM css AS css-check
-RUN sed 's/}/}\n/g' static/css/tailwind.css > /tmp/committed.css \
-    && sed 's/}/}\n/g' /out/tailwind.css > /tmp/generated.css \
-    && diff -U0 /tmp/committed.css /tmp/generated.css || { \
-        echo "static/css/tailwind.css is not what make css generates; run make css" >&2; \
-        exit 1; \
-    }
-
-# JavaScript lint stages: ESLint, at the version package.json and yarn.lock
-# pin, checks static/js/ against eslint.config.mjs. js-deps installs it and
-# stays cached until those two files change. script/lint forces only js-lint
-# to re-run, and the build stage below runs it too. COPY . . brings in the CI
-# cache barrier described in the lint stage above.
-# node:24.21.0-alpine (LTS, with yarn 1.22.22), 2026-09-18
-FROM node:24.21.0-alpine@sha256:ebfe2f90462722a7a4de65e91990e97fe0d401c70e0e762c5b53302f905ec1c1 AS js-deps
-WORKDIR /src
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --ignore-scripts
-
-FROM js-deps AS js-lint
-COPY . .
-RUN --network=none node_modules/.bin/eslint static/js
-
 # Build stage
 # golang:1.26.1-bookworm (Debian-based), 2026-03-17
 # Using Debian-based image because gorm.io/driver/sqlite pulls in
 # mattn/go-sqlite3 (CGO), which does not compile on Alpine musl.
 FROM golang:1.26.1-bookworm@sha256:4465644228bc2857a954b092167e12aa59c006a3492282a6c820bf4755fd64a4 AS builder
 
-# Depend on the lint, stylesheet check and JavaScript lint stages passing
+# Depend on lint stage passing
 COPY --from=lint /src/go.sum /dev/null
-COPY --from=css-check /out/tailwind.css /dev/null
-COPY --from=js-lint /src/yarn.lock /dev/null
 
 # jq is a runtime dependency of script/ci-mark-superseded, which the test
 # suite executes. git is what script/version derives the version with.

Dockerfile.lint

@@ -31,10 +31,6 @@ FROM deps AS lint
 
 COPY . .
 
-# static/static.go embeds the Alpine.js file this extracts from 3p/; without
-# it the static package does not compile and cannot be linted.
-RUN script/assets
-
 # `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

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 css-check version
+.PHONY: bootstrap setup assets test test-browser lint fmt fmt-check check build run dev deps docker clean hooks css version
 
 # Default target
 .DEFAULT_GOAL := check
@@ -74,7 +74,4 @@ hooks:
 	@script/install-precommit
 
 css:
-	@script/css
+	tailwindcss -i static/css/input.css -o static/css/tailwind.css --minify
-
-css-check:
-	@script/css-check

README.md

@@ -19,16 +19,12 @@ before deploying one.
 ### Prerequisites
 
 - Go 1.26.1+ (the version in `go.mod`)
-- Docker (for `make lint` and `make css`, and so for `make check`, for the
+- Docker (for `make lint` and so for `make check`, for the browser test in
-  browser test in `make test-browser`, for 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
-digest-pinned linter image via `Dockerfile.lint`. The same holds for
+digest-pinned linter image via `Dockerfile.lint`.
-tailwindcss (see [Stylesheet](#stylesheet)). ESLint, node and yarn are
-not prerequisites either, and `make lint` never uses a host copy of them
-(see [Linting](#linting)).
 
 ### Quick Start
 
@@ -40,7 +36,7 @@ cd webhooker
 # Install the Go toolchain if missing, and the Go dependencies
 make bootstrap
 
-# Run all checks (test, lint, format check, stylesheet check)
+# Run all checks (test, lint, format check)
 make check
 
 # Run the server from the clone. DATA_DIR defaults to
@@ -60,10 +56,10 @@ make setup      # Bootstrap + install git pre-commit hook
 make assets     # Extract Alpine.js from 3p/ (test, check, build, dev run it)
 make fmt        # Format code (gofmt + goimports)
 make fmt-check  # Fail if gofmt would change anything (writes nothing)
-make lint       # Run golangci-lint and ESLint in Docker
+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 + css-check (CI gate)
+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
 make run        # build, then run ./bin/webhooker
@@ -71,8 +67,7 @@ make dev        # go run ./cmd/webhooker
 make deps       # go mod download + go mod tidy
 make docker     # Build Docker image
 make hooks      # Install git pre-commit hook that runs script/precommit
-make css        # Regenerate static/css/tailwind.css (tailwindcss in Docker)
+make css        # Regenerate static/css/tailwind.css (needs tailwindcss)
-make css-check  # Fail if static/css/tailwind.css is stale (writes nothing)
 make clean      # Remove bin/
 ```
 
@@ -84,8 +79,7 @@ directory, read once at startup before anything else looks at the
 environment.
 
 The file is optional and having none is the normal case for a
-deployment. An empty file is the same as none: it has nothing in it to
+deployment. A file that is there but cannot be parsed aborts startup
-apply. A file that is there but cannot be parsed aborts startup
 with a message naming it, because a single malformed line makes none
 of the file apply: every variable in it silently reverts to its
 default, which is exactly the failure [Invalid values abort
@@ -570,13 +564,11 @@ 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
 in.
 
-A start that finds no `webhooker.db` in `DATA_DIR`, or a zero-length
+A start that finds no `webhooker.db` in `DATA_DIR` also logs
-one (which SQLite opens as an empty database), also logs
 `created a new, empty database` at `WARN`, with the file's path,
 shortly before the banner. On a deployment that has run before, that
-line means `webhooker.db` was lost: either the file was missing, most
+line means `DATA_DIR` was empty, most often because its volume is not
-often because the volume holding `DATA_DIR` is not mounted, or it was
+mounted.
-zero-length, as a truncated copy leaves it.
 
 #### Recovering a lost admin password
 
@@ -620,8 +612,7 @@ What it will not do:
   the old password, so a reset underneath it would report a change the
   service does not honour.
 - **Create anything.** A `DATA_DIR` that does not exist, or that holds
-  no `webhooker.db` or a zero-length one, is an error naming the path
+  no `webhooker.db`, is an error rather than a new empty deployment —
-  rather than a new empty deployment —
   a mistyped path must not be built out and then reported as a success.
 - **Create an account.** A username that does not exist is an error.
   `resetpw` changes an existing account's password and nothing else.
@@ -738,8 +729,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`, with
+targets (`archive-{webhook_name}-{target_name}-{target_uuid}.db`). Mount
-`-{period}` before `.db` for a target that rotates). Mount
 this as a persistent volume to
 preserve data across container restarts.
 
@@ -979,11 +969,9 @@ is both the simplest and the only complete rule:
 - `events-{webhook_uuid}.db` — **one per webhook**. Events, deliveries,
   delivery results.
 - `archive-{webhook_name}-{target_name}-{target_uuid}.db` — **one per
-  `database` target**, or one per month, day or hour for a target that
+  `database` target**. Archived events. The two names are made safe for
-  rotates, with `-{period}` before `.db`. Archived events. The two names
+  a file name, and the file is renamed when the webhook or the target is
-  are made safe for a file name, and the files are renamed when the
+  (see [Database Architecture](#database-architecture)).
-  webhook or the target is (see
-  [Database Architecture](#database-architecture)).
 
 `{webhook_uuid}` and `{target_uuid}` are UUID primary keys in their
 canonical 36-character hyphenated form, so a real filename looks like
@@ -1005,16 +993,6 @@ its sidecars; a killed or crashed instance leaves them, and they must be
 carried with the `.db`. An archive the service has not opened since a
 crash keeps that crash's sidecars, even across a later clean stop.
 
-A missing sidecar is therefore normal, and SQLite makes new ones, so a
-`-wal` lost from a copy cannot be reported: the transactions it held
-are simply gone. SQLite reads a `-wal` up to its first damaged frame,
-as after a crash, and rebuilds a damaged `-shm`. A sidecar with the
-wrong mode is set back to `0600` when its database is opened. A
-directory in place of either is refused then, with an error naming it:
-for `webhooker.db` the server and `webhooker resetpw` stop, and an event
-or archive database fails as a damaged one does (see
-[Database Architecture](#database-architecture)).
-
 Configuration is **not** in `DATA_DIR` — it comes from the environment
 and from a `.env` file read out of the process working directory. Back
 that up with your deployment config, separately.
@@ -1072,8 +1050,7 @@ 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
 `archive-….db` away for offline retention while the service runs,
-and it is recreated on the next write. The webhook page names each
+and it is recreated on the next write. See
-`database` target's archive file. See
 [Database Architecture](#database-architecture). That is a
 move-the-file-away workflow, not a substitute for the backup procedures
 above.
@@ -1098,19 +1075,13 @@ with any `-wal`/`-shm` beside it, or wait until there are none.
 1. Stop the service.
 
 2. Restore the **whole set together**: `webhooker.db` *and* every
-   `events-*.db` *and* every `archive-*.db`. A restore that leaves out
+   `events-*.db` *and* every `archive-*.db`. A partial restore fails
-   `webhooker.db` or an `events-*.db` is reported, not refused; one
+   quietly rather than loudly. Every database is opened `mode=rwc`, so a
-   that leaves out an `archive-*.db` or a `-wal` (step 3) is not
+   missing `events-{uuid}.db` is **created empty** on first access
-   reported at all. Every database is opened `mode=rwc`, so a
+   instead of erroring — the webhook comes back with its configuration
-   missing `events-{uuid}.db` is **created empty**: the webhook comes
+   intact and its entire event history silently gone. Event databases
-   back with its configuration intact and its entire event history
+   restored without `webhooker.db` are simply orphaned; nothing
-   gone. The first start after the restore logs
+   references their UUIDs.
-   `created a new, empty database` at `WARN` for each such file, with
-   its path, as it does for a missing `webhooker.db`. A missing
-   `archive-*.db` is recreated at its target's next delivery without a
-   warning, since moving one away is a supported workflow. Event
-   databases restored without `webhooker.db` are simply orphaned;
-   nothing references their UUIDs.
 
 3. Carry any `*.db-wal` and `*.db-shm` files that are in the backup.
    They are part of the database, and dropping a `-wal` silently
@@ -1135,7 +1106,7 @@ unconditionally against whatever files it finds:
 - the main database on connect — `Setting`, `User`, `APIKey`, `Webhook`,
   `Entrypoint`, `Target`
 - each event database when it is lazily opened — `Event`, `Delivery`,
-  `DeliveryResult`, `EventTotals`, `TargetTotals`, `EntrypointTotals`
+  `DeliveryResult`, `EventTotals`, `TargetTotals`
 - each archive database on every open and reopen
 
 There is no schema version table, no migration ledger, and no down
@@ -1300,11 +1271,11 @@ 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. Thirteen of the Makefile's nineteen targets are thin
+development workflow. Eleven of the Makefile's eighteen targets are thin
-shims that call them; `build`, `run`, `dev`, `deps`, `clean` and `version`
+shims that call them; `build`, `run`, `dev`, `deps`, `clean`, `css` and
-are inline commands with no script behind them, though `build`, `run` and
+`version` are inline commands with no script behind them, though `build`,
-`dev` first run `script/assets`, and `build` and `version` both take their
+`run` and `dev` first run `script/assets`, and `build` and `version` both
-value from `script/version`.
+take their value from `script/version`.
 
 `script/test`, `make build` and `make dev` each run `script/assets`
 first, which writes the ignored `static/js/alpine.min.js` (see
@@ -1323,15 +1294,10 @@ We provide:
 - `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 and ESLint in Docker (see Linting
+- `script/lint` — run golangci-lint in Docker (see Linting below)
-  below)
 - `script/fmt` — format all code (writes)
 - `script/fmt-check` — check formatting (read-only)
-- `script/css` — regenerate `static/css/tailwind.css` in Docker (writes;
+- `script/check` — run test, lint, and fmt-check
-  see [Stylesheet](#stylesheet))
-- `script/css-check` — fail if `static/css/tailwind.css` differs from what
-  `script/css` would generate (read-only)
-- `script/check` — run test, lint, fmt-check, and css-check
 - `script/version` — output the version to stamp into the binary (see
   [Version stamping](#version-stamping))
 - `script/docker` — build the Docker image tagged via
@@ -1356,32 +1322,20 @@ markup. The CSP build runs no expressions, so every Alpine directive in
 `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, its edit pages and
+A browser test in `internal/server` loads the webhook page and the event log
-the event log under the real policy and checks that: the add entrypoint form
+under the real policy and checks that: both add forms stay hidden until Add is
-stays hidden until Add is clicked; for every target type, the targets section's
+clicked; choosing Slack in the add target form leaves the HTTP fields out of
-Add shows only a choice of type with Next and Cancel, Next shows only that
+what it submits, also after leaving the page and going back to it, when the
-type's fields (no url field for `database` or `log`), Cancel at either step
+browser restores the choice; the Copy button beside an entrypoint URL reads
-closes the form, and saving adds the target; a refused target comes back with
+"Copied" once clicked; an event expands and collapses, and so do a delivery's
-its form open, the values entered and the reason, and after Cancel the next Add
+attempts inside it; and at phone width the menu button opens and closes the
-starts with an empty form and no reason; a refused save on the target edit page
+mobile menu. It also fails if the browser reports a console warning or error,
-and on the webhook edit page comes back with the reason and every value
+an uncaught exception, or anything the policy refused. `make check` and the
-entered; the Copy button beside an entrypoint URL reads "Copied" once clicked;
+image build lint it but do not run it, and `make test` leaves it out (its file
-an entrypoint's Edit button shows its edit form in place of its description and
+is built only with the `browser` build tag). Run it with `make test-browser`
-hides until the form closes, Cancel hides the form and drops what was typed, as
+after changing `templates/` or `static/js/`: that builds `Dockerfile.browser`,
-does leaving the page and going back to it, and Save changes the description;
+which runs the test in a digest-pinned headless browser image, so the host
-of the recent events on the webhook page only the newest starts expanded, each
+needs no browser.
-expands and collapses, and Open leads to the event's own page; of the events in
-the event log only the newest starts expanded, and an event there expands and
-collapses when its row's caret or its ID is clicked, and from the keyboard, but
-not when its ID is selected with the mouse, and a delivery's attempts inside it
-expand and collapse; 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
@@ -1394,9 +1348,7 @@ apply. The directory is `3p/` rather than `vendor/` because Go treats a root
 where `go:embed` picks it up. `script/test`, `make build` and `make dev` run
 it first, and the Dockerfile builds through `make test` and `make build`, so
 nothing downloads Alpine.js. The extracted file is not committed, and
-`.dockerignore` keeps any host copy out of the build context. `static/static.go`
+`.dockerignore` keeps any host copy out of the build context.
-names every file it embeds, so a build that skips the extraction, such as a
-bare `go build`, fails with an error naming `js/alpine.min.js`.
 
 To move to a new version: download
 `https://registry.npmjs.org/@alpinejs/csp/-/csp-<version>.tgz`, check it against
@@ -1405,23 +1357,6 @@ the `dist.integrity` hash listed at
 `3p/` with it as `alpinejs-csp-<version>.tgz`, update its file name in
 `script/assets`, and run `make check` and `make test-browser`.
 
-## Stylesheet
-
-`static/css/tailwind.css` is generated by Tailwind and committed. To change the
-styles, edit the templates, `static/js/app.js`,
-`internal/handlers/recent_events.go` or `static/css/input.css`, run `make css`,
-and commit the regenerated file with the change. Tailwind takes classes only
-from the files that `input.css` names in its `@source` lines; a class written in
-any other file is not generated until that file is named there too. `make check`
-and the image build fail when the committed file differs from what `make css`
-generates. `static/css/style.css` is hand-written and is not generated.
-
-`make css` runs the Tailwind standalone CLI in Docker, at the version and sha256
-pinned in the Dockerfile's stylesheet stages; it is never installed on the host.
-To move to a new version, change the version in both download URLs and both
-sha256 sums, taken from the release's `sha256sums.txt`, then run `make css` and
-commit the result.
-
 ## Rationale
 
 Webhook integrations between services are inherently fragile. The
@@ -1565,9 +1500,6 @@ tier** (event ingestion, delivery, and logging).
 │  ┌──────────────┐  (one row per target: running counts      │
 │  │ TargetTotals │   of its deliveries)                      │
 │  └──────────────┘                                           │
-│  ┌──────────────────┐  (one row per entrypoint: when the    │
-│  │ EntrypointTotals │   last event arrived on its URL)      │
-│  └──────────────────┘                                       │
 └─────────────────────────────────────────────────────────────┘
 ```
 
@@ -1614,14 +1546,6 @@ more entrypoints (receiver URLs) and one or more targets (delivery
 destinations) into a logical unit. A user creates a webhook to set up
 event routing.
 
-The new webhook form can also give the webhook its first targets: an
-optional HTTP target URL creates an `http` target named `HTTP`, and the
-archive checkbox creates a `database` target named `Archive` whose
-`expiry` is the pruning chosen beside it (never, 1h, 12h, 24h, 30d, 90d
-or 365d) and whose `rotation` is the rotation chosen below that (none,
-monthly, daily or hourly). Both are validated as on the add target form,
-and the webhook and its targets are created together or not at all.
-
 | Field            | Type    | Description |
 | ---------------- | ------- | ----------- |
 | `id`             | UUID    | Primary key |
@@ -1689,11 +1613,6 @@ different event sources that all feed into the same processing pipeline
 (e.g., one entrypoint for GitHub, another for Stripe, both routing to
 the same targets).
 
-The webhook page shows, for each entrypoint, when the last event arrived
-on its URL, which retention leaves in place, or "never" if none ever has,
-and how many events arrived on it within the webhook's retention period.
-A resubmitted event did not arrive on the URL and counts in neither.
-
 #### Target
 
 A delivery destination for events. Each target defines where and how
@@ -1708,6 +1627,7 @@ events should be forwarded.
 | `active`         | boolean    | Whether deliveries are enabled (default: true) |
 | `config`         | JSON text  | Type-specific configuration |
 | `max_retries`    | integer    | Total delivery attempts for `http` and `slack` targets, not retries on top of the first: 0 is a single fire-and-forget attempt with no retries and no circuit breaker, and a value of N makes N attempts in all, with exponential backoff and a per-target circuit breaker. Ignored by `database` and `log` targets |
+| `max_queue_size` | integer    | Stored and shown on the target's detail view, but not enforced anywhere yet: nothing in the delivery engine consults it. Queue depth is set by the two fixed 10,000-entry channels |
 
 **Relations:** Belongs to Webhook. Has many Deliveries.
 
@@ -1729,14 +1649,9 @@ events should be forwarded.
   own archive database
   (`archive-{webhook_name}-{target_name}-{target_uuid}.db`) for long-term
   retention, with an optional creation-validated expiry (default: keep
-  forever) and rotation (default: none, one file). The new webhook form,
+  forever). No external delivery and no retries; an archive write
-  the add target form and the target edit form all offer the same
+  failure fails the delivery. See the database target section under
-  expiries: never, 1h, 12h, 24h, 30d, 90d or 365d, and the same
+  "Per-Webhook Event Databases" for the full semantics.
-  rotations: none, monthly, daily or hourly. The target list shows the
-  expiry in plain units, such as "30 days", and the rotation. No external
-  delivery and no retries; an archive write failure fails the delivery.
-  See the database target section under "Per-Webhook Event Databases"
-  for the full semantics.
 - **`log`** — Write the event to the application log (stdout). Useful
   for debugging.
 
@@ -1840,7 +1755,6 @@ status across potentially multiple attempts.
 | `target_id`| UUID           | Foreign key → Target |
 | `status`   | DeliveryStatus | One of: `pending`, `delivered`, `failed`, `retrying` |
 | `finished_at` | timestamp   | When the delivery became `delivered` or `failed` (nullable; empty while `pending` or `retrying`) |
-| `replay`   | boolean        | Whether the delivery was created by **Replay** |
 
 **Relations:** Belongs to Event. Belongs to Target. Has many
 DeliveryResults.
@@ -1860,8 +1774,7 @@ NEW `pending` delivery for the same event and target and hands it to
 the engine on the ordinary path — same retries, same SSRF guard, same
 circuit breaker as a first attempt. It never touches the delivery it
 repeats: that row's status, timestamps and recorded attempts stand as
-the record of what happened. The new delivery records `replay`, and the
+the record of what happened.
-event log and the event's page label it a replay.
 
 What is re-sent is the stored event body, against the target's
 configuration **as it stands now** — the point of a replay is to
@@ -1869,11 +1782,7 @@ deliver where the destination has since been fixed. A target that has
 been deleted or deactivated therefore refuses the replay with a
 message on the event log rather than delivering from stale
 configuration, and a replay is refused while an earlier one for the
-same event and target is still pending or retrying. A delivery whose
+same event and target is still pending or retrying.
-target has been deleted shows no **Replay** action at all: recreating
-the target makes a new one that the old delivery does not name, so
-**Resubmit** is how that event reaches the webhook's currently active
-targets.
 
 **Resubmit.** Replay recovers one delivery; **resubmit** re-injects one
 EVENT. The event log offers a per-event **Resubmit** action that stores
@@ -1911,21 +1820,12 @@ retries) is individually logged for full observability.
 | `error`         | string  | Error message (on failure) |
 | `duration`      | integer | Request duration in milliseconds |
 
-A `database` or `log` target sends no HTTP request, so in the event log and
-on the event's page its attempts show no status: a successful one reads
-"archived" or "written to the log".
-
-The event log and the event's page show when each attempt was recorded and
-when each delivery was created, as the recent events list shows when an event
-arrived: how long ago, with the full UTC time on hover.
-
 **Relations:** Belongs to Delivery.
 
-#### EventTotals, TargetTotals and EntrypointTotals
+#### 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, and each entrypoint's last
+top of the webhook page and by the webhook list. `EventTotals` is one row:
-event, read by the webhook page's entrypoint list. `EventTotals` is one row:
 
 | Field            | Type      | Description |
 | ---------------- | --------- | ----------- |
@@ -1944,26 +1844,18 @@ event, read by the webhook page's entrypoint list. `EventTotals` is one row:
 | `deliveries_removed` | integer | Its deliveries retention has deleted |
 | `failed_removed`     | integer | Its failed deliveries retention has deleted |
 
-`EntrypointTotals` is one row per entrypoint, created by the first event
+Each count changes in the transaction that writes or deletes the rows it
-that arrives on its URL:
+counts. The pane's lifetime events are `events`, and its lifetime
-
+deliveries and failures are `deliveries` and `failed` summed over the
-| Field           | Type      | Description |
+targets; each figure within retention is the same less what retention
-| --------------- | --------- | ----------- |
+removed, so neither needs the rows themselves. Its last event is
-| `entrypoint_id` | UUID      | The entrypoint (primary key) |
+`last_event_at`, written in the transaction that stores the event, so it
-| `last_event_at` | timestamp | When the newest event arrived on its URL; a resubmitted event leaves it as it is, and so does retention |
+still shows once retention has removed every event. Its last-10-minutes and
-
+last-24-hours figures are counted from the `events` and `deliveries`
-Each count changes in the transaction that writes or deletes the rows it counts,
+indexes over just that window, the deliveries in one query grouped by
-and each `last_event_at` in the transaction that stores the event. The pane's
+target. Its failure percentage for a window is the deliveries that became
-lifetime events are `events`, and its lifetime deliveries and failures are
+`failed` in it out of all that became `delivered` or `failed` in it, and
-`deliveries` and `failed` summed over the targets; each figure within retention
+a dash when none did.
-is the same less what retention removed, so neither needs the rows themselves.
-Its last event is `last_event_at` in `EventTotals`, so it still shows once
-retention has removed every event; each entrypoint's last event, from
-`EntrypointTotals`, does too. Its last-10-minutes and last-24-hours figures are
-counted from the `events` and `deliveries` indexes over just that window, the
-deliveries in one query grouped by 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
@@ -1973,12 +1865,6 @@ counted with the pane's query. It opens each webhook's event database once
 with the number of webhooks and, for each, with the deliveries that
 finished in the last 24 hours, never with the events stored.
 
-The target list on the webhook page shows, for each target, its
-`delivered` and `failed` totals, which retention does not reduce, and its
-deliveries that became `delivered` and `failed` in the last 24 hours,
-counted with the pane's query. Deliveries still `pending` or `retrying`
-count in neither.
-
 #### Event-tier indexes
 
 These indexes on the per-webhook event databases are declared in the model
@@ -1986,36 +1872,28 @@ 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 target list 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 and the webhook list, 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 |
-| `events`           | `resubmitted_from_id`, `deleted_at` | The event log, which counts the events resubmitted from each event on a page |
-| `events`           | `entrypoint_id`, `deleted_at`, `resubmitted_from_id`, `created_at` | The webhook page's entrypoint list, which counts the events that arrived on each entrypoint's URL within the retention period |
 | `events`           | `created_at`                | Retention, which selects expired events by age |
 
-GORM's soft delete adds `deleted_at IS NULL` to these queries; retention leaves
+GORM's soft delete adds `deleted_at IS NULL` to these queries; retention
-it out. SQLite keeps no statistics on these tables, and without them it rates
+leaves it out. SQLite keeps no statistics on these tables, and without them it
-the `deleted_at` index, which every live row matches, above an index on a column
+rates the `deleted_at` index, which every live row matches, above an index on
-matched against several values or compared with a range. So every index but the
+a column matched against several values or compared with a range. So every
-last also covers `deleted_at`. It comes second in the `event_id` and
+index but the last also covers `deleted_at`. It comes second, so that
-`delivery_id` indexes, so that retention can use them without it. The event
+retention can use the index without it, except in `events`, where the
-log's count, the one query on the `resubmitted_from_id` index, always carries
+statistics compare `created_at` with a range (`>=`) and SQLite narrows by a
-`deleted_at IS NULL` and uses both columns. The entrypoint list's count, the one
-query on the `entrypoint_id` index, uses all four, `resubmitted_from_id IS NULL`
-leaving out resubmitted copies and `created_at` last because it compares it with
-a range (`>=`). In the statistics' `events` index `deleted_at` comes first,
-because they compare `created_at` with a range (`>=`) and SQLite narrows by a
 range only on the last column it uses.
 
 #### Common Fields
 
-Every entity except `Setting`, `EventTotals`, `TargetTotals` and
+Every entity except `Setting`, `EventTotals` and `TargetTotals` includes
-`EntrypointTotals` includes these fields from `BaseModel`. `Setting` is a bare
+these fields from `BaseModel`. `Setting` is a bare key-value row with no
-key-value row with no `id`, no timestamps and no soft delete. Of the three
+`id`, no timestamps and no soft delete, and the two totals tables hold
-totals tables, `event_totals` holds counts and `last_event_at`, keyed by a
+counts, plus `last_event_at` in `event_totals`, keyed by a numeric `id`
-numeric `id`; `target_totals` holds counts, keyed by `target_id`; and
+and by `target_id`:
-`entrypoint_totals` holds `last_event_at`, keyed by `entrypoint_id`:
 
 | Field        | Type      | Description |
 | ------------ | --------- | ----------- |
@@ -2057,24 +1935,14 @@ encryption key is generated and stored, and an `admin` user is created.
 - **Events** — captured incoming webhook payloads
 - **Deliveries** — event-to-target pairings and their status
 - **DeliveryResults** — individual delivery attempt logs
-- **EventTotals**, **TargetTotals** and **EntrypointTotals** — running
+- **EventTotals** and **TargetTotals** — running counts of the above,
-  counts of the above, the deliveries per target, and each entrypoint's
+  the deliveries per target, kept through retention
-  last event, kept through retention
 
 Per-webhook databases are created automatically when a webhook is
-created. They are managed by the `WebhookDBManager` component, which
+created (and lazily on first access for webhooks that predate this
+feature). They are managed by the `WebhookDBManager` component, which
 handles connection pooling, lazy opening, migrations, and cleanup.
 
-A per-webhook database that is missing or zero-length later means its
-webhook's events and pending deliveries are gone. The next time it is
-opened, an empty one is created in its place, so the webhook keeps
-receiving, and `created a new, empty database` is logged at `WARN` with
-the file's path. Every webhook's database is opened when the service
-starts, so this appears at the latest at the first start after the
-file was lost. A file there that SQLite cannot open fails that
-webhook alone, with an `ERROR` naming the webhook on every access and a
-500 to its senders, so one damaged file does not stop the others.
-
 This separation provides:
 
 - **Isolation** — a high-volume webhook won't cause lock contention or
@@ -2113,31 +1981,15 @@ 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
-An optional `rotation` in the target's config JSON (e.g.
+lock the archive writes and the archive sweeper take. Webhook edits,
-`{"rotation":"daily"}`) is `none`, the default, which keeps the one
+target edits and target creation run one at a time, so no edit can
-file, or `monthly`, `daily` or `hourly`. A target that rotates writes
+rename the file between another's rename and save, and the name on disk
-each event to a file named for the period of the event's receive time,
+matches the UI. A rename never replaces a file: if one already has
-in UTC, put before the `.db`:
+the new name, the edit is refused with an error naming that file, and
-`archive-orders-eu-long-term-archive-{target_uuid}-2026-10.db` monthly,
+the stored name stays. If the archive is not there (the operator moved
-`…-2026-10-01.db` daily and `…-2026-10-01-19.db` hourly. Each file holds
+it away), the rename is not an error, and the next write creates the
-exactly its period's events, and the first event of a new period starts
+file under the new name.
-the next file, so a finished period's file can be moved away like any
-archive. A changed rotation applies from the next event: the files
-already written keep their names and stay, pruned, shown and downloaded
-with the rest, since every file named for the target is its archive,
-whichever rotation wrote it.
-
-Renaming the webhook or the target renames every one of the target's
-files, each keeping its period, 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 files between
-another's rename and save, and the names on disk match the UI. A rename
-never replaces a file: if one already has a new name, the edit is
-refused with an error naming that file, nothing is moved, 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
@@ -2155,9 +2007,7 @@ 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
-the next write. A zero-length archive file is written to as a new
+the next write. An optional `expiry` in the target's config JSON (e.g.
-archive: SQLite opens it as an empty database, so it holds nothing to
-lose. An optional `expiry` in the target's config JSON (e.g.
 `{"expiry":"720h"}`) is validated when the target is created — the
 default (unset or the literal `never`) keeps rows forever — and rows
 older than the expiry are pruned each time the archive is (re)opened. An
@@ -2176,62 +2026,11 @@ interleave with a write, and it leaves the archive closed afterwards so
 the move-the-file-away workflow keeps working. Archives with no expiry,
 or the expiry `never`, are not touched by the sweep at all.
 
-For a target with several files, the write path prunes only the file it
-writes to, and the sweep prunes every one of them, taking the target's
-lock for one file at a time, so a write to the target waits for at most
-one file's prune. A file that is gone by the time the sweep reaches it
-is skipped. A file named for a period that the sweep leaves empty is
-deleted, with any `-wal` and `-shm` beside it; the file without a period
-is kept even when empty, as it always has been.
-
 Because each `database` target has its own archive file, a target's
 `expiry` governs only its own archive. Two `database` targets on one
 webhook with different expiries keep two archives, each pruned on its
 own schedule.
 
-The webhook page shows, for each `database` target, the name of the
-archive file an event received now would go to, the size on disk of all
-the target's archive files together, how many there are when there is
-more than one, and when the latest of them was last written. The size
-counts each `.db` and its `-wal` together, and the last write is the
-latest of their modification times, since a write lands in the `-wal`
-first. All are read from the files' metadata; the archive is never
-opened. While the named file does not exist — before the first write,
-before the first event of a new period, and after the file has been
-moved away — the page shows `not created yet` beside the name.
-
-Each `database` target on the webhook page has a **Download** button,
-which returns its archive as one gzipped JSON file,
-`archive-{webhook_name}-{target_name}-{YYYYMMDDTHHMMSSZ}.json.gz`, the
-names made safe as above and the time in UTC. The file holds one
-object: `webhook` and `target`, each an `id` and a `name`;
-`exported_at`; and `archived_events`, one object per archived row with
-every column, keyed by column name. The rows come from every one of the
-target's files: the file without a period first, then the others in
-the order of their periods, oldest first, and each row from a file named
-for a period has that `period` beside its columns. A body that is not
-valid UTF-8 is written in base64, with `"body_encoding": "base64"`
-beside it. An archive that does not exist yet, or was moved away,
-downloads with an empty `archived_events`; the download never creates a
-file.
-
-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. When it starts it lists the target's files by the stored names,
-under the lock that webhook edits, target edits and target creation
-hold, and lets go. It then opens one file at a time, only when its rows
-are about to be written out, and closes it before it opens the next, so
-it never has more than one of the target's files open. To open each, it
-takes the lock again just long enough to find the file by its period
-under the names stored then, so a rename during the download loses no
-file; a file that is gone by then, emptied by the sweep or moved away,
-is skipped. Each file is read on a connection of its own inside one
-read-only transaction, so it is written out as it stood when it was
-opened, and archive writes go on meanwhile, since under WAL a reader
-never blocks a writer. Until the open file is closed its `-wal` cannot
-be checkpointed past what the download reads, so a long download lets
-that `-wal` grow.
-
 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
@@ -2427,20 +2226,6 @@ just delayed until the target is healthy again. A delivery already in
 `retrying` keeps that status without another database write each time
 the breaker turns it away.
 
-While a target's breaker is open, the target's row on the webhook page
-says its deliveries are paused until the cooldown ends, in UTC and as a
-time from now. Each of its `retrying` deliveries shows as waiting in the
-event log and on the event's page, with the earliest it can be tried
-next: the later of the cooldown's end and the end of its own backoff
-after its last attempt. It is only the earliest: when the cooldown ends,
-one of the target's waiting deliveries is sent to test it while the
-others wait at least one more cooldown, as the row also says. A time not
-on the current UTC day is shown with its date. While the breaker is
-half-open, the row says instead that deliveries are held while one
-delivery tests whether the target has recovered, with no time, and the
-target's deliveries show their plain status, since any of them may be
-the one being sent.
-
 ### Metrics
 
 `/metrics` serves one Prometheus registry behind basic auth (see
@@ -2588,9 +2373,8 @@ The query string is never logged; it is replaced by the fixed marker
 `/.well-known/healthcheck` and `/s/*` answer 200 to anyone with no rate
 limiter in front of them, so a query on a fixed 200 URL would otherwise
 buy the same amplification as an invented path. Nothing debuggable is
-lost: the only query parameters this service reads are the login page's
+lost: `page`, on the authenticated pagination links, is the only query
-`next`, the page to return to, and `notice`, which names the line a page
+parameter this service reads.
-shows after an action.
 
 Client-supplied request content does not leave the host by the other
 route either. The Sentry SDK attaches the request to every event it
@@ -2825,10 +2609,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
@@ -3104,18 +2889,15 @@ returns to the page that was asked for.
 | `POST` | `/hook/{id}/edit`        | Edit webhook submission |
 | `POST` | `/hook/{id}/delete`      | Delete webhook |
 | `GET`  | `/hook/{id}/events`      | Full Event Log |
-| `GET`  | `/hook/{id}/events/{eventID}` | One event's own page: its details, its whole body and every delivery of it |
+| `GET`  | `/hook/{id}/events/{eventID}/body` | Download an event's full stored body. The log page renders each body only up to its cap, so this is the only route that serves a whole one; it is offered wherever a body is shown truncated |
-| `GET`  | `/hook/{id}/events/{eventID}/body` | Download an event's stored body. The pages show a body as text, cut at 32 KiB in the recent events and the event log, and leave a binary one out, so this is the only route that serves the stored bytes; it is offered wherever a body is cut or binary |
 | `POST` | `/hook/{id}/deliveries/{deliveryID}/replay` | Replay a finished delivery: creates a new delivery for the same event against the target's current configuration (30 per minute per bucket, then `429`) |
 | `POST` | `/hook/{id}/events/{eventID}/resubmit` | Resubmit a stored event: creates a new event copying it and fans that out to every currently active target (30 per minute per bucket, then `429`) |
 | `POST` | `/hook/{id}/entrypoints` | Add entrypoint to webhook |
-| `POST` | `/hook/{id}/entrypoints/{entrypointID}/edit` | Change an entrypoint's description; its URL stays the same |
 | `POST` | `/hook/{id}/entrypoints/{entrypointID}/delete` | Delete an entrypoint |
 | `POST` | `/hook/{id}/entrypoints/{entrypointID}/toggle` | Enable or disable an entrypoint |
 | `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 |
 
@@ -3175,7 +2957,7 @@ webhooker/
 │   │   ├── model_event.go     # Event entity (per-webhook DB)
 │   │   ├── model_delivery.go  # Delivery entity (per-webhook DB)
 │   │   ├── model_delivery_result.go  # DeliveryResult entity (per-webhook DB)
-│   │   ├── model_totals.go    # EventTotals, TargetTotals and EntrypointTotals (per-webhook DB)
+│   │   ├── model_totals.go    # EventTotals and TargetTotals (per-webhook DB)
 │   │   ├── model_apikey.go    # APIKey entity
 │   │   ├── password.go        # Argon2id hashing and verification
 │   │   ├── retention.go       # Retention reaper (per-webhook event expiry)
@@ -3197,8 +2979,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_rotation.go # Archive rotation and file names
-│   │   ├── 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
@@ -3252,14 +3032,12 @@ webhooker/
 │   └── js/alpine.min.js       # Alpine.js CSP build, extracted from 3p/ by make assets, not committed
 ├── templates/                 # Go HTML templates (base, login, sources, etc.)
 ├── script/                    # Scripts to Rule Them All entrypoints
-├── Dockerfile                 # Stages: lint, stylesheet, JavaScript lint, test+build, Alpine runtime
+├── 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                   # 13 of 19 targets shim script/; 6 are inline
+├── Makefile                   # 11 of 18 targets shim script/; 7 are inline
 ├── go.mod / go.sum
-├── package.json / yarn.lock   # ESLint, pinned, for the JavaScript lint stage
+└── .golangci.yml              # Linter configuration
-├── eslint.config.mjs          # ESLint configuration for static/js/
-└── .golangci.yml              # golangci-lint configuration
 ```
 
 ### Dependency Injection
@@ -3454,9 +3232,9 @@ check, see [The login endpoint](#the-login-endpoint).
   `ENTRYPOINT` script, which sets the data directory's owner and mode
   before the app starts; the image's health check; and `docker exec`,
   unless given `--user`
-- GORM soft deletes on every entity that carries `BaseModel`, which is all of
+- GORM soft deletes on every entity that carries `BaseModel`, which is
-  them but `Setting`, `EventTotals`, `TargetTotals` and `EntrypointTotals`
+  all of them but `Setting`, `EventTotals` and `TargetTotals` (data
-  (data preserved for audit)
+  preserved for audit)
 
 ### Shutdown
 
@@ -3467,9 +3245,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`
@@ -3489,30 +3267,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
@@ -3569,46 +3340,19 @@ Three properties are load-bearing:
   `golangci-lint run` silently ignores config keys it does not
   recognize, so a typo would disable a setting with no warning.
 
-ESLint never runs on the host either. It lints `static/js/` (not the
-extracted Alpine.js) in the Dockerfile's `js-lint` stage, which
-`script/lint` builds after `Dockerfile.lint` and the image build runs
-before the builder stage. Its version is pinned in `package.json` and
-every package's hash in `yarn.lock`. The `js-deps` stage before it
-installs ESLint and stays cached until either file changes, so only the
-lint step re-runs and ESLint is not downloaded again.
-`eslint.config.mjs` turns on the rules of the JavaScript styleguide
-`REPO_POLICIES.md` links to that a linter can check: `no-var` and
-`prefer-const`. ESLint prints nothing on a pass, so `script/lint` has no
-summary line to look for; it names the stage once for both `--target`
-and `--no-cache-filter`, and `--target` fails on a name that matches no
-stage.
-
 ### Docker
 
-The Dockerfile uses a multi-stage build. Each stage is pinned by
+The Dockerfile uses a three-stage build. Each stage is pinned by
-digest, and the lint and builder stages are separate images so the
+digest, and the two check stages are separate images so the linter's
-linter's version is fixed independently of the compiler's:
+version is fixed independently of the compiler's:
 
 1. **Lint stage** (`golangci/golangci-lint:v2.12.2`, Debian-based) —
    installs `make`, downloads dependencies, copies the source, and runs
-   `make fmt-check`, then `script/assets` to extract Alpine.js from
+   `make fmt-check`, then `golangci-lint config verify` and
-   `3p/`, then `golangci-lint config verify` and `golangci-lint run`,
+   `golangci-lint run`, both with `--network=none`.
-   both with `--network=none`.
+2. **Builder stage** (`golang:1.26.1-bookworm`) — depends on the lint
-2. **Stylesheet stages** (`debian:bookworm-slim`, with the Tailwind
+   stage passing (it copies a file from it), runs `make test` and
-   standalone CLI pinned by version and sha256, one binary per
+   `make build` (both extract Alpine.js from `3p/` first), and finally
-   architecture) — generate `static/css/tailwind.css` from
-   `static/css/input.css` and the files its `@source` lines name.
-   `css-check` fails when the committed file differs from the generated
-   one, and `make css` writes the generated file out from `css-output`
-   (see [Stylesheet](#stylesheet)).
-3. **JavaScript lint stages** (`node:24.21.0-alpine`, with yarn) —
-   `js-deps` installs ESLint from `yarn.lock` and `js-lint` runs it over
-   `static/js/` (see [Linting](#linting)).
-4. **Builder stage** (`golang:1.26.1-bookworm`) — depends on the lint,
-   `css-check` and `js-lint` stages passing (it copies a file from
-   each), runs
-   `make test` and `make build` (both extract Alpine.js from `3p/`
-   first), and finally
    rebuilds the binary with `CGO_ENABLED=1` and static linking so it
    runs on musl. Both builds go through `make build`, the relink adding
    its `-extldflags` via `GO_LDFLAGS`, so neither can drop the `-X` that
@@ -3616,7 +3360,7 @@ linter's version is fixed independently of the compiler's:
    given, otherwise derived from the `.git` in the context, and the
    stage fails if a context with `.git` would stamp `unknown` (see
    [Version stamping](#version-stamping)).
-5. **Runtime stage** (`alpine:3.21`) — copies the static binary and
+3. **Runtime stage** (`alpine:3.21`) — copies the static binary and
    `deploy/docker-entrypoint.sh`, creates the `/var/lib/webhooker`
    directory for all SQLite databases, exposes port 8080, and includes
    a health check against `/.well-known/healthcheck`. It sets no
@@ -3628,19 +3372,18 @@ The lint stage invokes `golangci-lint` directly rather than `make lint`:
 it is already the pinned linter image, and `make lint` builds
 `Dockerfile.lint`, which would need a docker daemon inside this build.
 
-The lint and builder stages use Debian rather than Alpine because
+Both check stages use Debian rather than Alpine because
 `gorm.io/driver/sqlite` pulls in `mattn/go-sqlite3`, which needs CGO
 and does not compile against musl. Only the final binary is statically
 linked, which is what lets it run on the Alpine runtime image.
 
 `script/cibuild` — `docker build .` — is the CI gate: the checks run
 inside the image, so a build that succeeds is a repo that is formatted,
-linted, tested and compiled, with a current stylesheet. `script/lint`
+linted, tested and compiled. `script/lint` also uses Docker
-also uses Docker (`Dockerfile.lint` and the `js-lint` stage, see Linting
+(`Dockerfile.lint`, see Linting above), so `make lint` and `make check`
-above), so `make lint` and `make check` run the same pinned linter
+run the same pinned linter version the gate does; of the steps
-versions the gate does; of
+`make check` runs, only `script/test` and `script/fmt-check` run on the
-the steps `make check` runs, only `script/test` and `script/fmt-check`
+host.
-run on the host.
 
 #### CI gate honesty
 
@@ -3650,10 +3393,9 @@ check meaningless. The `check` workflow therefore writes
 `.ci-fingerprint` into the build context before building. Its value is
 the hash of the commit being checked, so every commit, docs-only ones
 and a squash merge whose tree matches an already-built branch included,
-gets a new fingerprint, invalidates the `COPY . .` layer of every check
+gets a new fingerprint, invalidates the `COPY . .` layer of both check
-stage, and really runs `make fmt-check`, `golangci-lint`, the stylesheet
+stages, and really runs `make fmt-check`, `golangci-lint`, `make test`,
-check, ESLint, `make test`, and `make build`. A run that reports success
+and `make build`. A run that reports success ran them.
-ran them.
 
 The module download layer sits above `COPY . .` and stays cached.
 

cmd/webhooker/main.go

@@ -38,19 +38,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
@@ -212,10 +210,6 @@ func newApp() *fx.App {
 			// or renaming a webhook or target reaches its archive
 			// files.
 			func(e *delivery.Engine) delivery.Archives { return e },
-			// Wire *delivery.Engine as delivery.CircuitBreakers so
-			// the pages can show a target whose deliveries are
-			// paused.
-			func(e *delivery.Engine) delivery.CircuitBreakers { return e },
 			server.New,
 		),
 		fx.Invoke(

cmd/webhooker/main_test.go

@@ -14,7 +14,6 @@ import (
 
 	"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 +36,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()
@@ -75,7 +73,6 @@ func freePort(t *testing.T) int {
 // 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")
@@ -252,40 +249,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,
 		)
 	}
-	}
 }

eslint.config.mjs

@@ -1,18 +0,0 @@
-// ESLint configuration for static/js/. script/lint and the image build run
-// ESLint in the Dockerfile's js-lint stage, never on the host.
-//
-// The rules are the ones the JavaScript styleguide linked from
-// REPO_POLICIES.md states that a linter can check: const for everything,
-// let only for a variable that is reassigned, never var.
-export default [
-    // Alpine.js, extracted from 3p/ by make assets; not ours to lint.
-    { ignores: ["static/js/alpine.min.js"] },
-    {
-        // The pages load static/js/app.js as a classic script, not a module.
-        languageOptions: { sourceType: "script" },
-        rules: {
-            "no-var": "error",
-            "prefer-const": "error",
-        },
-    },
-];

internal/database/bootstrap_banner_test.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"log/slog"
-	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -120,26 +119,3 @@ func TestNewDatabase_IsLoggedWithItsPath(t *testing.T) {
 		t, second, created, "an existing database is not new",
 	)
 }
-
-// TestZeroLengthDatabase_IsLoggedAsNew covers what
-// https://git.eeqj.de/sneak/webhooker/issues/290 found: SQLite opens a
-// zero-length file as an empty database, so a start on one is a first
-// start, and it must say so exactly as a start with no file does.
-func TestZeroLengthDatabase_IsLoggedAsNew(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, database.MainDBFileName)
-	require.NoError(t, os.WriteFile(path, nil, database.SQLiteFilePerm))
-
-	var out bytes.Buffer
-
-	db, err := database.Open(dir, slog.New(slog.NewTextHandler(&out, nil)))
-	require.NoError(t, err)
-	require.NoError(t, db.Close())
-
-	assert.Contains(
-		t, out.String(),
-		`level=WARN msg="created a new, empty database" path=`+path,
-	)
-}

internal/database/database.go

@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -202,7 +203,8 @@ func (d *Database) connectTo(dataDir string) error {
 	// Checked before opening, which creates the file. A DATA_DIR that
 	// is unexpectedly empty -- its volume not mounted, say -- looks
 	// exactly like a first start, so a new database is a warning.
-	created := missingOrEmpty(dbPath)
+	_, statErr := os.Stat(dbPath)
+	created := errors.Is(statErr, fs.ErrNotExist)
 
 	// Opened through OpenSQLite so this handle carries the same WAL
 	// journaling, busy timeout, immediate-transaction locking, and pool
@@ -211,15 +213,13 @@ func (d *Database) connectTo(dataDir string) error {
 	if err != nil {
 		d.log.Error(
 			"failed to open database",
-			"path", dbPath,
 			"error", err,
 		)
 
 		return err
 	}
 
-	// Then use it with GORM. Its errors are SQLite's alone and name no
+	// Then use it with GORM
-	// file, so the path is added to them here.
 	db, err := gorm.Open(sqlite.Dialector{
 		Conn: sqlDB,
 	}, &gorm.Config{
@@ -229,11 +229,10 @@ func (d *Database) connectTo(dataDir string) error {
 	if err != nil {
 		d.log.Error(
 			"failed to connect to database",
-			"path", dbPath,
 			"error", err,
 		)
 
-		return fmt.Errorf("connecting to %s: %w", dbPath, err)
+		return err
 	}
 
 	d.db = db
@@ -244,12 +243,8 @@ func (d *Database) connectTo(dataDir string) error {
 		d.log.Info("connected to database", "path", dbPath)
 	}
 
-	err = d.migrate()
+	// Run migrations
-	if err != nil {
+	return d.migrate()
-		return fmt.Errorf("migrating %s: %w", dbPath, err)
-	}
-
-	return nil
 }
 
 func (d *Database) migrate() error {

internal/database/database_test.go

@@ -1,15 +1,9 @@
 package database_test
 
 import (
-	"bytes"
 	"context"
-	"log/slog"
-	"os"
-	"path/filepath"
 	"testing"
 
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"go.uber.org/fx/fxtest"
 	"sneak.berlin/go/webhooker/internal/config"
 	"sneak.berlin/go/webhooker/internal/database"
@@ -106,22 +100,3 @@ func TestDatabaseConnection(t *testing.T) {
 		)
 	}
 }
-
-// TestOpen_UnreadableDatabaseIsNamed pins
-// https://git.eeqj.de/sneak/webhooker/issues/459: when SQLite cannot
-// read webhooker.db, the error that stops the server and `webhooker
-// resetpw` names the file, not only SQLite's own message.
-func TestOpen_UnreadableDatabaseIsNamed(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, database.MainDBFileName)
-	require.NoError(t, os.WriteFile(
-		path, bytes.Repeat([]byte("junk"), 1024), database.SQLiteFilePerm,
-	))
-
-	_, err := database.Open(dir, slog.New(slog.DiscardHandler))
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), path)
-	assert.Contains(t, err.Error(), "file is not a database")
-}

internal/database/event_tier_indexes_test.go

@@ -199,77 +199,6 @@ func TestStatisticsQueriesUseTheirIndexes(t *testing.T) {
 			"(deleted_at=? AND created_at>?)")
 }
 
-// TestResubmitCountUsesItsIndex does the same for the event log's count
-// of the events resubmitted from each of a page's events (resubmitCounts
-// in the handlers). It passes a full page of 25 ids: with an index on
-// resubmitted_from_id alone, SQLite uses it for three ids and turns to
-// the deleted_at index from five.
-func TestResubmitCountUsesItsIndex(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)) }()
-
-	db, err := mgr.GetDB(uuid.New().String())
-	require.NoError(t, err)
-
-	dry := db.Session(&gorm.Session{DryRun: true})
-
-	page := make([]string, 25)
-	for i := range page {
-		page[i] = uuid.New().String()
-	}
-
-	var counts []struct{ Total int }
-
-	assertPlanUses(t, db, dry.Model(&database.Event{}).
-		Select("resubmitted_from_id, count(*) AS total").
-		Where("resubmitted_from_id IN ?", page).
-		Group("resubmitted_from_id").Find(&counts),
-		"idx_events_resubmitted_from_id "+
-			"(resubmitted_from_id=? AND deleted_at=?)")
-}
-
-// TestEntrypointEventsUseTheirIndex does the same for the webhook
-// page's count, for each entrypoint, of the events that arrived on its
-// URL since the retention cutoff (addEntrypointEvents in the
-// handlers), which must come from the index alone. It passes 25
-// entrypoints, as TestResubmitCountUsesItsIndex passes 25 events.
-func TestEntrypointEventsUseTheirIndex(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)) }()
-
-	db, err := mgr.GetDB(uuid.New().String())
-	require.NoError(t, err)
-
-	dry := db.Session(&gorm.Session{DryRun: true})
-
-	entrypoints := make([]string, 25)
-	for i := range entrypoints {
-		entrypoints[i] = uuid.New().String()
-	}
-
-	var rows []struct{ Events int }
-
-	assertPlanUses(t, db, dry.Model(&database.Event{}).
-		Select("entrypoint_id, count(*) AS events").
-		Where("entrypoint_id IN ? AND resubmitted_from_id IS NULL",
-			entrypoints).
-		Where("created_at >= ?", time.Now()).
-		Group("entrypoint_id").Find(&rows),
-		"COVERING INDEX idx_events_entrypoint_id "+
-			"(entrypoint_id=? AND deleted_at=? AND "+
-			"resubmitted_from_id=? AND created_at>?)")
-}
-
 // assertPlanUses asserts that SQLite's plan for a statement GORM built
 // in a dry run, run with the same SQL and arguments GORM would send,
 // names each of the given indexes.

internal/database/model_delivery.go

@@ -56,10 +56,6 @@ type Delivery struct {
 	// the index.
 	FinishedAt *time.Time `gorm:"index:idx_deliveries_status,priority:3" json:"finishedAt,omitempty"`
 
-	// Replay is set on a delivery created by the event log's Replay
-	// action, so the pages can tell it from the delivery it repeats.
-	Replay bool `gorm:"not null;default:false" json:"replay"`
-
 	// Relations. No model marshals the record it belongs to:
 	// Event.Deliveries and Target.Deliveries lead back here, and the
 	// JSON could loop.

internal/database/model_event.go

@@ -19,16 +19,11 @@ type Event struct {
 	// narrows by a < only on the last column it uses. Its final delete
 	// has no deleted_at condition and uses the index on created_at
 	// alone. The other tables keep the unindexed BaseModel created_at.
-	// DeletedAt is also the second column of the resubmitted_from_id
+	CreatedAt time.Time      `gorm:"index;index:idx_events_deleted_at_created_at,priority:2" json:"createdAt"`
-	// index, for the reason DeliveryResult gives. The entrypoint_id
+	DeletedAt gorm.DeletedAt `gorm:"index:idx_events_deleted_at_created_at,priority:1"       json:"deletedAt,omitzero"`
-	// index, for the webhook page's entrypoint list, has it second too,
-	// resubmitted_from_id third, and created_at last, which the list
-	// compares with a range.
-	CreatedAt time.Time      `gorm:"index;index:idx_events_deleted_at_created_at,priority:2;index:idx_events_entrypoint_id,priority:4"                                           json:"createdAt"`
-	DeletedAt gorm.DeletedAt `gorm:"index:idx_events_deleted_at_created_at,priority:1;index:idx_events_resubmitted_from_id,priority:2;index:idx_events_entrypoint_id,priority:2" json:"deletedAt,omitzero"`
 
 	WebhookID    string `gorm:"type:uuid;not null" json:"webhookId"`
-	EntrypointID string `gorm:"type:uuid;not null;index:idx_events_entrypoint_id,priority:1" json:"entrypointId"`
+	EntrypointID string `gorm:"type:uuid;not null" json:"entrypointId"`
 
 	// Request data
 	Method      string `gorm:"not null"    json:"method"`
@@ -37,8 +32,8 @@ type Event struct {
 	ContentType string `json:"contentType"`
 
 	// BodyBytes is the size of Body in bytes, recorded when the event
-	// is stored, so that the recent events list, which reads only the
+	// is stored so the recent events list can show it without reading
-	// start of each body, knows the whole body's size.
+	// the body.
 	BodyBytes int64 `gorm:"not null" json:"bodyBytes"`
 
 	// ResubmittedFromID names the event this one was copied from by
@@ -47,7 +42,7 @@ type Event struct {
 	// existed. It is not a foreign key: the source event can be
 	// reaped by retention while its copies remain, and the id is
 	// kept as the record of where the copy came from either way.
-	ResubmittedFromID *string `gorm:"type:uuid;index:idx_events_resubmitted_from_id,priority:1;index:idx_events_entrypoint_id,priority:3" json:"resubmittedFromId,omitempty"`
+	ResubmittedFromID *string `gorm:"type:uuid;index" json:"resubmittedFromId,omitempty"`
 
 	// Relations. No model marshals the record it belongs to, so
 	// Webhook and Entrypoint are left out of the JSON.

internal/database/model_target.go

@@ -32,6 +32,7 @@ type Target struct {
 	// For HTTP targets (max_retries=0 means fire-and-forget,
 	// >0 enables retries with backoff)
 	MaxRetries   int `json:"maxRetries,omitempty"`
+	MaxQueueSize int `json:"maxQueueSize,omitempty"`
 
 	// Relations. No model marshals the record it belongs to:
 	// Webhook.Targets leads back here, and the JSON could loop.

internal/database/model_totals.go

@@ -52,21 +52,6 @@ func (TargetTotals) TableName() string {
 	return "target_totals"
 }
 
-// EntrypointTotals is one row per entrypoint, created by the first
-// event that arrives on its URL: when the newest such event arrived,
-// which retention leaves as it is. A resubmitted copy did not arrive
-// on the URL and does not change it.
-type EntrypointTotals struct {
-	EntrypointID string `gorm:"type:uuid;primaryKey"`
-
-	LastEventAt time.Time `gorm:"not null"`
-}
-
-// TableName names the table AddEntrypointTotals updates.
-func (EntrypointTotals) TableName() string {
-	return "entrypoint_totals"
-}
-
 // AddEventTotals adds each count in add to the webhook's event totals,
 // and records add.LastEventAt as when the newest event arrived if it is
 // set. Call it on the transaction that writes or deletes the events it
@@ -112,25 +97,3 @@ func AddTargetTotals(tx *gorm.DB, add TargetTotals) error {
 
 	return nil
 }
-
-// AddEntrypointTotals records add.LastEventAt as when the newest event
-// arrived on the URL of the entrypoint add.EntrypointID names, creating
-// its row the first time. Call it on the transaction that stores the
-// event.
-func AddEntrypointTotals(tx *gorm.DB, add EntrypointTotals) error {
-	err := tx.Exec(
-		`INSERT INTO entrypoint_totals (entrypoint_id, last_event_at)
-		VALUES (?, ?)
-		ON CONFLICT (entrypoint_id) DO UPDATE SET
-			last_event_at = excluded.last_event_at`,
-		add.EntrypointID, add.LastEventAt,
-	).Error
-	if err != nil {
-		return fmt.Errorf(
-			"adding to totals of entrypoint %s: %w",
-			add.EntrypointID, err,
-		)
-	}
-
-	return nil
-}

internal/database/model_webhook.go

@@ -111,13 +111,6 @@ func (w *Webhook) RetainsForever() bool {
 	return retainsForever(w.RetentionDays)
 }
 
-// RetentionCutoff returns the time before which this webhook's events
-// have expired, as the reaper computes it, and false when the webhook
-// retains them forever.
-func (w *Webhook) RetentionCutoff(now time.Time) (time.Time, bool) {
-	return retentionCutoff(now, w.RetentionDays)
-}
-
 // RetentionLabel returns the webhook's retention policy as display
 // text, so that no template has to know about the sentinel value.
 func (w *Webhook) RetentionLabel() string {

internal/database/models.go

@@ -3,7 +3,7 @@ package database
 // Migrate runs database migrations for the main application database.
 // Only configuration-tier models are stored in the main database.
 // Event-tier models (Event, Delivery, DeliveryResult, EventTotals,
-// TargetTotals, EntrypointTotals) live in
+// TargetTotals) live in
 // per-webhook dedicated databases managed by WebhookDBManager.
 func (d *Database) Migrate() error {
 	return d.db.AutoMigrate(

internal/database/retention.go

@@ -184,8 +184,8 @@ func (r *RetentionReaper) sweep(ctx context.Context) {
 
 		wh := webhooks[i]
 
-		// A missing database has nothing to reap. Restart recovery
+		// Nothing to reap if the per-webhook database has never
-		// reports a lost one (see WebhookDBManager.GetDB).
+		// been created.
 		if !r.dbManager.DBExists(wh.ID) {
 			continue
 		}

internal/database/sqlite_mode_test.go

@@ -182,29 +182,6 @@ func TestOpenSQLiteTightensFilesLeftWorldReadable(t *testing.T) {
 	requireDatabaseSetOwnerOnly(t, path)
 }
 
-// TestOpenSQLiteRefusesADirectorySidecar covers a directory in place
-// of -wal or -shm. Beside a -shm directory SQLite opens the database
-// read-only without a word, and every write then fails naming no file,
-// so the open must stop instead, naming the directory.
-func TestOpenSQLiteRefusesADirectorySidecar(t *testing.T) {
-	t.Parallel()
-
-	for _, suffix := range []string{"-wal", "-shm"} {
-		t.Run(suffix, func(t *testing.T) {
-			t.Parallel()
-
-			path := filepath.Join(t.TempDir(), database.MainDBFileName)
-			require.NoError(t, os.Mkdir(path+suffix, 0o700))
-
-			_, err := database.OpenSQLite(
-				path, database.SQLiteModeCreate,
-			)
-			require.Error(t, err)
-			assert.Contains(t, err.Error(), path+suffix)
-		})
-	}
-}
-
 // TestOpenSQLiteExistingModeDoesNotCreateTheFile guards the mechanism
 // the fix uses: OpenSQLite now creates the database file itself, and
 // must not do so for a caller that asked for an existing database. An

internal/database/sqlite_open.go

@@ -7,7 +7,6 @@ import (
 	"io/fs"
 	"net/url"
 	"os"
-	"syscall"
 	"time"
 
 	_ "modernc.org/sqlite" // Pure Go SQLite driver
@@ -94,8 +93,7 @@ const (
 const SQLiteFilePerm fs.FileMode = 0o600
 
 // reserveSQLiteFile puts path at SQLiteFilePerm before the driver ever
-// touches it, and tightens any sidecar already on disk. A directory in
+// touches it, and tightens any sidecar already on disk.
-// place of any of them is an error naming it.
 //
 // The mode has to be settled here rather than by a chmod after opening,
 // because SQLite picks it: robust_open substitutes
@@ -145,15 +143,7 @@ func reserveSQLiteFile(path string, create bool) error {
 	for _, p := range append(
 		[]string{path}, sqliteSidecarPaths(path)...,
 	) {
-		// Chmod accepts a directory, and SQLite opens a database whose
+		err := os.Chmod(p, SQLiteFilePerm)
-		// -shm is one read-only, without a word: every write then
-		// fails naming no file.
-		info, err := os.Stat(p)
-		if err == nil && info.IsDir() {
-			return fmt.Errorf("securing %s: %w", p, syscall.EISDIR)
-		}
-
-		err = os.Chmod(p, SQLiteFilePerm)
 		if err != nil && !errors.Is(err, fs.ErrNotExist) {
 			return fmt.Errorf("securing %s: %w", p, err)
 		}
@@ -162,20 +152,6 @@ func reserveSQLiteFile(path string, create bool) error {
 	return nil
 }
 
-// missingOrEmpty reports whether opening path in SQLiteModeCreate
-// would start a new, empty database: the file is not there, or it is
-// zero-length, which SQLite opens as an empty database. A file left at
-// zero length by an interrupted first start or a truncated copy holds
-// as little as a missing one, and must be reported the same way.
-func missingOrEmpty(path string) bool {
-	info, err := os.Stat(path)
-	if errors.Is(err, fs.ErrNotExist) {
-		return true
-	}
-
-	return err == nil && info.Size() == 0
-}
-
 // sqliteSidecarPaths returns the files SQLite maintains beside a
 // database under WAL. They carry the same rows as the database itself,
 // so a fix that tightens only the main file has fixed nothing.

internal/database/webhook_db_manager.go

@@ -33,23 +33,10 @@ 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
-// running totals of them (EventTotals, TargetTotals, EntrypointTotals).
+// running totals of them (EventTotals, TargetTotals).
 // Database connections are opened lazily and cached.
 type WebhookDBManager struct {
 	dataDir string
@@ -98,37 +85,34 @@ func NewWebhookDBManager(
 	return m, nil
 }
 
-// GetDB returns the database connection for a webhook, opening it on
+// GetDB returns the database connection for a webhook,
-// first use.
+// creating the database file lazily if it doesn't exist.
-//
-// The file is made by CreateDB when the webhook is created. One that is
-// missing or zero-length here means the webhook's events and pending
-// deliveries are gone: an empty database is created in its place so
-// the webhook keeps receiving, and that is logged as a warning naming
-// the file, as a new main database is.
 func (m *WebhookDBManager) GetDB(
 	webhookID string,
 ) (*gorm.DB, error) {
-	return m.getDB(webhookID, false)
+	// Fast path: already open
-}
+	if val, ok := m.dbs.Load(webhookID); ok {
+		return asGormDB(val, webhookID)
+	}
 
-// GetDBIf is GetDB, done only when check reports true. check runs under
+	// Slow path: open the database under the lock, looking in the
-// the lock DeleteDB holds while it removes the files, so a caller can
+	// cache again first. A caller that raced another one here then
-// confirm the webhook still exists and open its database with no delete
+	// waits for its handle instead of opening a second one.
-// in between. The handle is nil when check reports false. check must
-// not call the manager.
-func (m *WebhookDBManager) GetDBIf(
-	webhookID string, check func() (bool, error),
-) (*gorm.DB, error) {
 	m.mu.Lock()
 	defer m.mu.Unlock()
 
-	ok, err := check()
+	if val, ok := m.dbs.Load(webhookID); ok {
-	if err != nil || !ok {
+		return asGormDB(val, webhookID)
+	}
+
+	db, err := m.openDB(webhookID)
+	if err != nil {
 		return nil, err
 	}
 
-	return m.getDBLocked(webhookID, false)
+	m.dbs.Store(webhookID, db)
+
+	return db, nil
 }
 
 // asGormDB returns a value read from the cache as the database
@@ -146,12 +130,12 @@ func asGormDB(val any, webhookID string) (*gorm.DB, error) {
 	return db, nil
 }
 
-// CreateDB creates a new webhook's database file and runs
+// CreateDB explicitly creates a new per-webhook database file
-// migrations.
+// and runs migrations.
 func (m *WebhookDBManager) CreateDB(
 	webhookID string,
 ) error {
-	_, err := m.getDB(webhookID, true)
+	_, err := m.GetDB(webhookID)
 
 	return err
 }
@@ -167,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 {
@@ -189,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"),
-		removeFile(path+"-shm"),
-	)
-
-	if dbErr != nil {
 			return fmt.Errorf(
-			"%w: %w",
+				"deleting webhook database file %s%s: %w",
-			ErrEventDBNotRemoved, errors.Join(dbErr, sidecarErr),
+				path, suffix, err,
 			)
 		}
-
-	if sidecarErr != nil {
-		return fmt.Errorf("%w: %w", ErrSidecarNotRemoved, sidecarErr)
 	}
 
 	m.log.Info(
@@ -216,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 {
@@ -269,54 +232,6 @@ func (m *WebhookDBManager) DBPath(
 	return m.dbPath(webhookID)
 }
 
-// getDB is GetDB, and CreateDB when isNew is true: the webhook has just
-// been created, so a missing file is expected rather than lost.
-func (m *WebhookDBManager) getDB(
-	webhookID string, isNew bool,
-) (*gorm.DB, error) {
-	// Fast path: already open
-	if val, ok := m.dbs.Load(webhookID); ok {
-		return asGormDB(val, webhookID)
-	}
-
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	return m.getDBLocked(webhookID, isNew)
-}
-
-// getDBLocked is getDB's slow path, run with m.mu held. It looks in the
-// cache again first: a caller that raced another one to the lock then
-// gets its handle instead of opening a second one.
-func (m *WebhookDBManager) getDBLocked(
-	webhookID string, isNew bool,
-) (*gorm.DB, error) {
-	if val, ok := m.dbs.Load(webhookID); ok {
-		return asGormDB(val, webhookID)
-	}
-
-	// Checked before opening, which creates the file. See GetDB.
-	path := m.dbPath(webhookID)
-	replaced := !isNew && missingOrEmpty(path)
-
-	db, err := m.openDB(webhookID)
-	if err != nil {
-		return nil, err
-	}
-
-	if replaced {
-		m.log.Warn(
-			"created a new, empty database",
-			"webhook_id", webhookID,
-			"path", path,
-		)
-	}
-
-	m.dbs.Store(webhookID, db)
-
-	return db, nil
-}
-
 func (m *WebhookDBManager) dbPath(
 	webhookID string,
 ) string {
@@ -381,7 +296,7 @@ func (m *WebhookDBManager) openDB(
 	// Run migrations for event-tier models only
 	err = db.AutoMigrate(
 		&Event{}, &Delivery{}, &DeliveryResult{},
-		&EventTotals{}, &TargetTotals{}, &EntrypointTotals{},
+		&EventTotals{}, &TargetTotals{},
 	)
 	if err != nil {
 		_ = sqlDB.Close()

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) {
@@ -289,75 +215,6 @@ func TestWebhookDBManager_LazyCreation(t *testing.T) {
 	assert.True(t, mgr.DBExists(webhookID))
 }
 
-// A webhook's database is made by CreateDB along with the webhook. One
-// that GetDB finds missing or zero-length has lost the webhook's events
-// and pending deliveries, so the empty database made in its place is
-// logged as a warning naming the file
-// (https://git.eeqj.de/sneak/webhooker/issues/290). CreateDB, and
-// reopening a database that is there, log no such warning.
-func TestWebhookDBManager_LostDatabaseIsLogged(t *testing.T) {
-	t.Parallel()
-
-	const created = `level=WARN msg="created a new, empty database"`
-
-	open := func(
-		t *testing.T, prepare func(*database.WebhookDBManager, string),
-	) (string, string) {
-		t.Helper()
-
-		var logs bytes.Buffer
-
-		mgr := database.NewTestWebhookDBManagerWithLogger(
-			t.TempDir(),
-			slog.New(slog.NewTextHandler(&logs, nil)),
-		)
-
-		webhookID := uuid.New().String()
-		prepare(mgr, webhookID)
-
-		_, err := mgr.GetDB(webhookID)
-		require.NoError(t, err)
-		require.NoError(t, mgr.CloseAll())
-
-		return logs.String(),
-			" webhook_id=" + webhookID + " path=" + mgr.DBPath(webhookID)
-	}
-
-	t.Run("missing", func(t *testing.T) {
-		t.Parallel()
-
-		logs, fields := open(
-			t, func(*database.WebhookDBManager, string) {},
-		)
-		assert.Contains(t, logs, created+fields)
-	})
-
-	t.Run("zero-length", func(t *testing.T) {
-		t.Parallel()
-
-		logs, fields := open(
-			t, func(mgr *database.WebhookDBManager, webhookID string) {
-				require.NoError(t, os.WriteFile(
-					mgr.DBPath(webhookID), nil, database.SQLiteFilePerm,
-				))
-			},
-		)
-		assert.Contains(t, logs, created+fields)
-	})
-
-	t.Run("created with the webhook, then reopened", func(t *testing.T) {
-		t.Parallel()
-
-		logs, _ := open(
-			t, func(mgr *database.WebhookDBManager, webhookID string) {
-				require.NoError(t, mgr.CreateDB(webhookID))
-				require.NoError(t, mgr.CloseAll())
-			},
-		)
-		assert.NotContains(t, logs, created)
-	})
-}
-
 func TestWebhookDBManager_DeliveryWorkflow(t *testing.T) {
 	t.Parallel()
 

internal/delivery/archive_sweeper.go

@@ -45,12 +45,7 @@ type ArchiveSweeper struct {
 	eng      *Engine
 	log      *slog.Logger
 	interval time.Duration
-
-	// cancel needs no lock: fx calls the stop hook only after the
-	// start hook has returned, so stop never reads it while start
-	// is still setting it.
 	cancel   context.CancelFunc
-
 	wg       sync.WaitGroup
 }
 
@@ -168,18 +163,10 @@ 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,

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 (
@@ -71,8 +68,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)
 
@@ -163,17 +159,6 @@ func (env *archiveEnv) seedArchiveRows(
 	t.Helper()
 
 	path := env.archivePath(tgt)
-	seedArchiveFile(t, path, tgt.WebhookID, archivedAt...)
-
-	return path
-}
-
-// seedArchiveFile creates the archive file at path and inserts one row
-// per supplied archived-at timestamp, as seedArchiveRows does.
-func seedArchiveFile(
-	t *testing.T, path, webhookID string, archivedAt ...time.Time,
-) {
-	t.Helper()
 
 	sqlDB, err := sql.Open(
 		"sqlite", fmt.Sprintf("file:%s?mode=rwc", path),
@@ -181,8 +166,7 @@ func seedArchiveFile(
 	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)
 
@@ -193,7 +177,7 @@ func seedArchiveFile(
 	for i, at := range archivedAt {
 		row := delivery.ExportArchivedEvent{
 			EventID:    fmt.Sprintf("ev-%d", i),
-			WebhookID:  webhookID,
+			WebhookID:  tgt.WebhookID,
 			Method:     http.MethodPost,
 			Body:       `{"seeded":true}`,
 			ArchivedAt: at,
@@ -202,6 +186,8 @@ func seedArchiveFile(
 	}
 
 	require.NoError(t, sqlDB.Close())
+
+	return path
 }
 
 // archivedEventIDs returns the event ids currently stored in an
@@ -239,8 +225,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
@@ -696,64 +681,6 @@ func TestArchiveSweep_ClosesHandleOfRegisteredWriter(
 	)
 }
 
-// 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.

internal/delivery/circuit_breaker.go

@@ -102,20 +102,6 @@ func (cb *CircuitBreaker) CooldownRemaining() time.Duration {
 	return remaining
 }
 
-// StateAndCooldown returns the circuit state and, while the circuit is
-// open, what is left of the cooldown, or zero once that has passed.
-// Both are read under one lock, so they always agree.
-func (cb *CircuitBreaker) StateAndCooldown() (CircuitState, time.Duration) {
-	cb.mu.Lock()
-	defer cb.mu.Unlock()
-
-	if cb.state != CircuitOpen {
-		return cb.state, 0
-	}
-
-	return cb.state, max(cb.cooldown-time.Since(cb.lastFailure), 0)
-}
-
 // RecordSuccess records a successful delivery and resets
 // the circuit breaker to closed state.
 func (cb *CircuitBreaker) RecordSuccess() {

internal/delivery/engine.go

@@ -143,15 +143,6 @@ type Archives interface {
 	Rename(targetID, webhookName, targetName string) error
 }
 
-// CircuitBreakers is how the handlers read a target's circuit
-// breaker, so the webhook page and the event log can say that
-// deliveries to the target are paused and until when. Like Archives,
-// it keeps the handlers free of the engine's internals and is
-// trivially faked in tests.
-type CircuitBreakers interface {
-	StateAndCooldown(targetID string) (CircuitState, time.Duration)
-}
-
 // EngineParams are the fx dependencies for the delivery
 // engine.
 type EngineParams struct {
@@ -195,11 +186,9 @@ type Engine struct {
 	// targets maps each target type to its implementation.
 	targets map[database.TargetType]Target
 
-	// httpTarget and slackTarget are retained so StateAndCooldown
+	// httpTarget is retained so tests can reach the HTTP
-	// can read their circuit breakers, and so tests can reach the
+	// target's shared client and circuit breakers.
-	// HTTP target's shared client.
 	httpTarget *httpTarget
-	slackTarget *slackTarget
 
 	// dbTarget is retained so the engine can reach the archive
 	// writer registry for eviction, renames and the idle sweep.
@@ -295,13 +284,12 @@ func (e *Engine) EvictTarget(targetID string) {
 	e.dbTarget.evict(targetID)
 }
 
-// Rename implements Archives. It renames every one of a database
+// Rename implements Archives. It renames a database target's
-// target's archive files to ArchiveFileName(webhookName, targetName,
+// archive file to ArchiveFileName(webhookName, targetName,
-// targetID), each keeping the period in its name, under the lock the
+// targetID), under the lock the target's archive writes and the
-// target's archive writes and the idle sweep take. It never replaces
+// idle sweep take. It never replaces a file: if one already has the
-// a file: if one already has a new name, the error is
+// new name, the error is ErrArchiveNameTaken. The caller renames
-// ErrArchiveNameTaken. The caller renames before it saves the new
+// before it saves the new name: see databaseTarget.rename.
-// name: see databaseTarget.rename.
 func (e *Engine) Rename(
 	targetID, webhookName, targetName string,
 ) error {
@@ -312,28 +300,6 @@ func (e *Engine) Rename(
 	return e.dbTarget.rename(targetID, webhookName, targetName)
 }
 
-// StateAndCooldown implements CircuitBreakers. It returns the state of
-// the target's circuit breaker and, while the breaker is open, what is
-// left of its cooldown; the cooldown is zero once that has passed and
-// in any other state. A target with no breaker reads as closed with no
-// cooldown, and reading never creates one.
-func (e *Engine) StateAndCooldown(
-	targetID string,
-) (CircuitState, time.Duration) {
-	for _, core := range []*httpCore{
-		e.httpTarget.httpCore, e.slackTarget.httpCore,
-	} {
-		val, ok := core.circuitBreakers.Load(targetID)
-		if ok {
-			cb, _ := val.(*CircuitBreaker)
-
-			return cb.StateAndCooldown()
-		}
-	}
-
-	return CircuitClosed, 0
-}
-
 // ScheduleRetry schedules a task to be re-enqueued onto the
 // retry channel after delay. It implements the Scheduler
 // interface the targets use to own their durable retries.
@@ -733,9 +699,10 @@ func (e *Engine) recoverInFlight(ctx context.Context) {
 		default:
 		}
 
-		// Opened even when its file is missing, so that a lost
+		if !e.dbManager.DBExists(webhookID) {
-		// database is reported at start, not when the webhook next
+			continue
-		// receives an event, which for a quiet webhook may be never.
+		}
+
 		e.recoverWebhookDeliveries(ctx, webhookID)
 	}
 }
@@ -743,24 +710,7 @@ func (e *Engine) recoverInFlight(ctx context.Context) {
 func (e *Engine) recoverWebhookDeliveries(
 	ctx context.Context, webhookID string,
 ) {
-	// The web interface is already serving, so the webhook may have
+	webhookDB, err := e.dbManager.GetDB(webhookID)
-	// been deleted since the list was read. Opening its database then
-	// would create the file again after the delete removed it.
-	stillExists := func() (bool, error) {
-		var count int64
-
-		err := e.database.DB().
-			Model(&database.Webhook{}).
-			Where("id = ?", webhookID).
-			Count(&count).Error
-		if err != nil {
-			return false, fmt.Errorf("confirming webhook exists: %w", err)
-		}
-
-		return count > 0, nil
-	}
-
-	webhookDB, err := e.dbManager.GetDBIf(webhookID, stillExists)
 	if err != nil {
 		e.log.Error(
 			"failed to get webhook database for recovery",
@@ -771,10 +721,6 @@ func (e *Engine) recoverWebhookDeliveries(
 		return
 	}
 
-	if webhookDB == nil {
-		return
-	}
-
 	e.recoverPendingDeliveries(
 		ctx, webhookDB, webhookID,
 	)

internal/delivery/engine_integration_test.go

@@ -1,7 +1,6 @@
 package delivery_test
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -24,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.
@@ -82,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)
 
@@ -358,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)
 			},
 		),
@@ -405,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,
 	)
@@ -453,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)
 			},
 		),
@@ -497,8 +482,6 @@ func TestProcessRetryTask_LargeBody_FetchFromDB(
 		context.TODO(), &task,
 	)
 
-	assert.Equal(t, largeBody, receivedBody)
-
 	iAssertStatus(t, s.WebhookDB, d.ID,
 		database.DeliveryStatusDelivered,
 	)
@@ -1137,85 +1120,6 @@ func TestRecoverInFlight_WithPendingDeliveries(
 	}
 }
 
-// TestRecoverInFlight_ReportsAMissingWebhookDatabase covers a webhook
-// whose database file is gone, after a partial restore say. Restart
-// recovery opens every webhook's database, so the empty one made in its
-// place is reported at start, naming the file
-// (https://git.eeqj.de/sneak/webhooker/issues/290).
-func TestRecoverInFlight_ReportsAMissingWebhookDatabase(t *testing.T) {
-	t.Parallel()
-
-	mainDB := iMainDB(t)
-	webhookID := uuid.New().String()
-	iCreateWebhook(t, mainDB, webhookID, "lost-database")
-
-	var logs bytes.Buffer
-
-	dbMgr := database.NewTestWebhookDBManagerWithLogger(
-		t.TempDir(), slog.New(slog.NewTextHandler(&logs, nil)),
-	)
-	t.Cleanup(func() { _ = dbMgr.CloseAll() })
-
-	engine := delivery.NewTestEngineWithDB(
-		database.NewTestDatabase(mainDB), dbMgr,
-		slog.New(slog.DiscardHandler),
-		&http.Client{Timeout: 5 * time.Second}, 1,
-	)
-
-	engine.ExportRecoverInFlight(context.Background())
-
-	assert.Contains(
-		t, logs.String(),
-		`level=WARN msg="created a new, empty database" webhook_id=`+
-			webhookID+" path="+dbMgr.DBPath(webhookID),
-	)
-}
-
-// TestRecoverInFlight_SkipsAWebhookDeletedAfterTheListIsRead covers a
-// webhook deleted from the web interface while restart recovery runs.
-// Its database file is gone, and recovery must not create it again.
-func TestRecoverInFlight_SkipsAWebhookDeletedAfterTheListIsRead(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	mainDB := iMainDB(t)
-	webhookID := uuid.New().String()
-	iCreateWebhook(t, mainDB, webhookID, "deleted-during-recovery")
-
-	// The first query to return is recovery's read of the list of
-	// webhooks. Deleting the webhook right after it puts the delete
-	// between that read and the opening of the webhook's database.
-	deleted := false
-
-	require.NoError(t, mainDB.Callback().Query().After("gorm:query").
-		Register("delete-after-list", func(*gorm.DB) {
-			if deleted {
-				return
-			}
-
-			deleted = true
-
-			require.NoError(t, mainDB.Delete(
-				&database.Webhook{}, "id = ?", webhookID,
-			).Error)
-		}))
-
-	dbMgr := database.NewTestWebhookDBManager(t.TempDir())
-	t.Cleanup(func() { _ = dbMgr.CloseAll() })
-
-	engine := delivery.NewTestEngineWithDB(
-		database.NewTestDatabase(mainDB), dbMgr,
-		slog.New(slog.DiscardHandler),
-		&http.Client{Timeout: 5 * time.Second}, 1,
-	)
-
-	engine.ExportRecoverInFlight(context.Background())
-
-	require.True(t, deleted)
-	assert.False(t, dbMgr.DBExists(webhookID))
-}
-
 // --- HTTP Config with custom headers ---
 
 func TestDeliverHTTP_CustomTargetHeaders(t *testing.T) {
@@ -1507,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_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)
 
@@ -1018,62 +1015,6 @@ func TestGetCircuitBreaker_CreatesOnDemand(t *testing.T) {
 	)
 }
 
-// TestStateAndCooldown_ReadsHTTPAndSlackBreakers proves the engine
-// reads the state of an http or a slack target's circuit breaker, with
-// what is left of its cooldown while it is open, and no cooldown while
-// it is half-open, once it closes, or for a target with no breaker.
-func TestStateAndCooldown_ReadsHTTPAndSlackBreakers(t *testing.T) {
-	t.Parallel()
-
-	e := testEngine(t, 1)
-
-	httpID := uuid.New().String()
-	slackID := uuid.New().String()
-
-	state, cooldown := e.StateAndCooldown(httpID)
-	assert.Equal(t, delivery.CircuitClosed, state, "no breaker")
-	assert.Zero(t, cooldown, "no breaker")
-
-	httpCB := delivery.NewTestCircuitBreaker(1, time.Hour)
-	e.ExportSetCircuitBreaker(httpID, httpCB)
-
-	slackCB := delivery.NewTestCircuitBreaker(1, time.Hour)
-	e.ExportSetSlackCircuitBreaker(slackID, slackCB)
-
-	httpCB.RecordFailure()
-	slackCB.RecordFailure()
-
-	for _, id := range []string{httpID, slackID} {
-		state, cooldown := e.StateAndCooldown(id)
-		assert.Equal(t, delivery.CircuitOpen, state)
-		assert.Greater(t, cooldown, 59*time.Minute)
-		assert.LessOrEqual(t, cooldown, time.Hour)
-	}
-
-	httpCB.RecordSuccess()
-	slackCB.RecordSuccess()
-
-	for _, id := range []string{httpID, slackID} {
-		state, cooldown := e.StateAndCooldown(id)
-		assert.Equal(t, delivery.CircuitClosed, state, "closed")
-		assert.Zero(t, cooldown, "closed")
-	}
-
-	// A breaker with no cooldown goes half-open on the first Allow
-	// after it trips, letting that one delivery through to test the
-	// target.
-	halfOpenID := uuid.New().String()
-	halfOpenCB := delivery.NewTestCircuitBreaker(1, 0)
-	e.ExportSetCircuitBreaker(halfOpenID, halfOpenCB)
-
-	halfOpenCB.RecordFailure()
-	require.True(t, halfOpenCB.Allow())
-
-	state, cooldown = e.StateAndCooldown(halfOpenID)
-	assert.Equal(t, delivery.CircuitHalfOpen, state)
-	assert.Zero(t, cooldown, "half-open")
-}
-
 func TestParseHTTPConfig_Valid(t *testing.T) {
 	t.Parallel()
 
@@ -1115,21 +1056,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,
 ) {
@@ -1315,33 +1241,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
@@ -1418,34 +1317,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,
 ) {

internal/delivery/export_test.go

@@ -212,14 +212,6 @@ func (e *Engine) ExportSetCircuitBreaker(
 	e.httpTarget.circuitBreakers.Store(targetID, cb)
 }
 
-// ExportSetSlackCircuitBreaker is ExportSetCircuitBreaker for the
-// slack target.
-func (e *Engine) ExportSetSlackCircuitBreaker(
-	targetID string, cb *CircuitBreaker,
-) {
-	e.slackTarget.circuitBreakers.Store(targetID, cb)
-}
-
 // ExportParseHTTPConfig exposes parseHTTPConfig.
 func (e *Engine) ExportParseHTTPConfig(
 	configJSON string,
@@ -501,32 +493,23 @@ func NewExportArchiveWriter(
 	return &ExportArchiveWriter{w: w}
 }
 
-// Write archives a row through the writer, into the file named
+// Write archives a row through the writer.
-// without a period.
 func (e *ExportArchiveWriter) Write(
 	row ExportArchivedEvent, expiry time.Duration,
 ) error {
-	return e.w.write(row, expiry, "")
+	return e.w.write(row, expiry)
-}
-
-// WritePeriod archives a row through the writer, into the file for
-// period.
-func (e *ExportArchiveWriter) WritePeriod(
-	row ExportArchivedEvent, expiry time.Duration, period string,
-) error {
-	return e.w.write(row, expiry, period)
 }
 
 // Open opens the archive file, pruning when expiry is positive.
 func (e *ExportArchiveWriter) Open(expiry time.Duration) error {
-	return e.w.open(e.w.path, expiry)
+	return e.w.open(expiry)
 }
 
 // Reopen closes and reopens the archive file.
 func (e *ExportArchiveWriter) Reopen(
 	expiry time.Duration,
 ) error {
-	return e.w.reopen(e.w.path, expiry)
+	return e.w.reopen(expiry)
 }
 
 // SetNow replaces the clock the writer measures its reopen
@@ -556,7 +539,7 @@ func (e *ExportArchiveWriter) Path() string {
 func (e *ExportArchiveWriter) OpenExisting(
 	expiry time.Duration,
 ) error {
-	return e.w.openMode(e.w.path, archiveModeExisting, expiry)
+	return e.w.openMode(archiveModeExisting, expiry)
 }
 
 // SweepExpired runs an idle sweep of the archive.

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/target.go

@@ -105,7 +105,6 @@ func (e *Engine) initTargets(client *http.Client) {
 	dbT := &databaseTarget{eng: e}
 
 	e.httpTarget = httpT
-	e.slackTarget = slackT
 	e.dbTarget = dbT
 
 	e.targets = map[database.TargetType]Target{

internal/delivery/target_config_edit.go

@@ -41,8 +41,6 @@ type TargetConfigForm struct {
 	Timeout string
 	// Expiry is the database (archive) target's row expiry.
 	Expiry string
-	// Rotation is the database (archive) target's rotation.
-	Rotation string
 }
 
 // NewTargetConfigForm parses a target's stored configuration into
@@ -87,13 +85,11 @@ func NewTargetConfigForm(
 	}
 }
 
-// databaseConfigForm parses an archive target's optional expiry and
+// databaseConfigForm parses an archive target's optional expiry.
-// rotation. An absent, empty or never expiry yields an empty expiry,
+// An absent or empty configuration is the keep-forever default and
-// on which the edit form starts at never; saving it unchanged stores
+// yields an empty field, so re-saving the form unchanged stores the
-// never, which means the same as an empty expiry. An absent rotation
+// same empty configuration it started with. An expiry that is set
-// is empty too, and the form starts at none. An expiry that is set
+// but not a valid duration is an error, not a blank field.
-// but not a valid duration, or a rotation that is not one of the
-// four, is an error, not a blank field.
 func databaseConfigForm(
 	configJSON string,
 ) (TargetConfigForm, error) {
@@ -110,15 +106,8 @@ func databaseConfigForm(
 		)
 	}
 
-	err = ValidateArchiveRotation(cfg.Rotation)
-	if err != nil {
-		return TargetConfigForm{}, err
-	}
-
-	form := TargetConfigForm{Rotation: cfg.Rotation}
-
 	if cfg.Expiry == "" || cfg.Expiry == archiveExpiryNever {
-		return form, nil
+		return TargetConfigForm{}, nil
 	}
 
 	err = ValidateArchiveExpiry(cfg.Expiry)
@@ -126,7 +115,5 @@ func databaseConfigForm(
 		return TargetConfigForm{}, err
 	}
 
-	form.Expiry = cfg.Expiry
+	return TargetConfigForm{Expiry: cfg.Expiry}, nil
-
-	return form, nil
 }

internal/delivery/target_config_view.go

@@ -1,9 +1,9 @@
 package delivery
 
 import (
+	"encoding/json"
 	"fmt"
 	"strconv"
-	"time"
 
 	"sneak.berlin/go/webhooker/internal/database"
 )
@@ -97,7 +97,7 @@ func targetConfigFields(
 ) []ConfigField {
 	switch t.Type {
 	case database.TargetTypeSlack:
-		return slackConfigFields(t)
+		return slackConfigFields(t.Config)
 	case database.TargetTypeHTTP:
 		return httpConfigFields(t)
 	case database.TargetTypeDatabase:
@@ -119,11 +119,10 @@ func unavailableConfigFields() []ConfigField {
 	}}
 }
 
-// slackConfigFields describes a Slack target: its masked
+// slackConfigFields describes a Slack target. Only the masked
-// webhook URL and its retry count. Only the masked URL is
+// webhook URL is shown; the full URL is the credential.
-// shown; the full URL is the credential.
+func slackConfigFields(configJSON string) []ConfigField {
-func slackConfigFields(t *database.Target) []ConfigField {
+	cfg, err := parseSlackConfig(configJSON)
-	cfg, err := parseSlackConfig(t.Config)
 	if err != nil {
 		return unavailableConfigFields()
 	}
@@ -131,7 +130,7 @@ func slackConfigFields(t *database.Target) []ConfigField {
 	return []ConfigField{{
 		Label: "Webhook URL",
 		Value: cfg.MaskedWebhookURL(),
-	}, maxRetriesField(t)}
+	}}
 }
 
 // httpConfigFields describes an HTTP target: its destination
@@ -171,89 +170,63 @@ func httpConfigFields(t *database.Target) []ConfigField {
 		})
 	}
 
-	fields = append(fields, maxRetriesField(t))
+	return append(fields, retryFields(t)...)
-
-	return fields
 }
 
-// maxRetriesField describes a target's retry count, which lives
+// retryFields describes a target's retry settings, which live
 // on the target row rather than in its configuration blob.
-func maxRetriesField(t *database.Target) ConfigField {
+func retryFields(t *database.Target) []ConfigField {
 	retries := strconv.Itoa(t.MaxRetries)
 	if t.MaxRetries == 0 {
 		retries += " (fire-and-forget)"
 	}
 
-	return ConfigField{
+	fields := []ConfigField{{
 		Label: "Max Retries",
 		Value: retries,
+	}}
+
+	if t.MaxQueueSize > 0 {
+		fields = append(fields, ConfigField{
+			Label: "Max Queue Size",
+			Value: strconv.Itoa(t.MaxQueueSize),
+		})
 	}
+
+	return fields
 }
 
-// databaseConfigFields describes an archive target by its
+// databaseConfigFields describes an archive target. Its
-// expiry in plain units, such as "30 days", or "never" when
+// configuration is optional, and an absent or empty expiry
-// the archive is kept forever, and by its rotation. An expiry
+// means the archive is kept forever. An expiry that is set
-// that is set but not a valid duration, or a rotation that is
+// but not a valid duration is reported as unavailable rather
-// not one of the four, is reported as unavailable rather than
+// than echoed back.
-// echoed back.
 func databaseConfigFields(configJSON string) []ConfigField {
-	expiry, err := parseArchiveExpiry(configJSON)
+	expiry := archiveExpiryNever
+
+	if configJSON != "" {
+		var cfg databaseTargetConfig
+
+		err := json.Unmarshal([]byte(configJSON), &cfg)
 		if err != nil {
 			return unavailableConfigFields()
 		}
 
-	rotation, err := parseArchiveRotation(configJSON)
+		if cfg.Expiry != "" {
-	if err != nil {
+			if ValidateArchiveExpiry(cfg.Expiry) != nil {
 				return unavailableConfigFields()
 			}
 
-	value := archiveExpiryNever
+			expiry = cfg.Expiry
-	if expiry > 0 {
+		}
-		value = plainDuration(expiry)
 	}
 
 	return []ConfigField{{
 		Label: "Archive Expiry",
-		Value: value,
+		Value: expiry,
-	}, {
-		Label: "Archive Rotation",
-		Value: rotation,
 	}}
 }
 
-// plainDuration writes a positive duration as a count of the
-// largest whole unit it divides into: "30 days", "12 hours",
-// "1 minute". A duration with a fraction of a second is
-// written as Go writes it.
-func plainDuration(d time.Duration) string {
-	const day = 24 * time.Hour
-
-	units := []struct {
-		size time.Duration
-		name string
-	}{
-		{day, "day"},
-		{time.Hour, "hour"},
-		{time.Minute, "minute"},
-		{time.Second, "second"},
-	}
-
-	for _, unit := range units {
-		if d%unit.size != 0 {
-			continue
-		}
-
-		count := int64(d / unit.size)
-		if count == 1 {
-			return "1 " + unit.name
-		}
-
-		return fmt.Sprintf("%d %ss", count, unit.name)
-	}
-
-	return d.String()
-}
-
 // MaskedWebhookURL returns the Slack webhook URL reduced to
 // its scheme and host, with the path, query and any userinfo
 // elided. The path segments are the credential, so none of

internal/delivery/target_config_view_test.go

@@ -32,7 +32,6 @@ const (
 	viewMaskedOrigin  = viewExampleOrigin + "/..."
 	viewUnavailable   = "(unavailable)"
 	viewExpiryNever   = "never"
-	viewMaxRetries    = "Max Retries"
 )
 
 func TestMaskedWebhookURL(t *testing.T) {
@@ -158,7 +157,9 @@ func TestNewTargetViews_DeletedTarget(t *testing.T) {
 		t, slackTargetName+" (deleted)", view.DisplayName(),
 	)
 	assert.Equal(
-		t, viewFor(t, slackTarget()).Config, view.Config,
+		t,
+		map[string]string{"Webhook URL": slackMaskedURL},
+		fieldMap(view.Config),
 	)
 }
 
@@ -188,30 +189,7 @@ func TestNewTargetViews_Slack(t *testing.T) {
 
 	assert.Equal(
 		t,
-		map[string]string{
+		map[string]string{"Webhook URL": slackMaskedURL},
-			"Webhook URL":  slackMaskedURL,
-			viewMaxRetries: "0 (fire-and-forget)",
-		},
-		fieldMap(view.Config),
-	)
-}
-
-// TestNewTargetViews_SlackRetries proves a Slack target shows
-// its retry count the same way an HTTP target does.
-func TestNewTargetViews_SlackRetries(t *testing.T) {
-	t.Parallel()
-
-	target := slackTarget()
-	target.MaxRetries = 2
-
-	view := viewFor(t, target)
-
-	assert.Equal(
-		t,
-		map[string]string{
-			"Webhook URL":  slackMaskedURL,
-			viewMaxRetries: "2",
-		},
 		fieldMap(view.Config),
 	)
 }
@@ -225,6 +203,7 @@ func TestNewTargetViews_HTTP(t *testing.T) {
 			`"timeout":30,` +
 			`"headers":{"Authorization":"Bearer sekrit"}}`,
 		MaxRetries:   5,
+		MaxQueueSize: 100,
 	})
 
 	fields := fieldMap(view.Config)
@@ -235,7 +214,8 @@ func TestNewTargetViews_HTTP(t *testing.T) {
 			"Destination URL": viewMaskedOrigin,
 			"Timeout":         "30s",
 			"Headers":         "1 configured",
-			viewMaxRetries:    "5",
+			"Max Retries":     "5",
+			"Max Queue Size":  "100",
 		},
 		fields,
 	)
@@ -258,7 +238,7 @@ func TestNewTargetViews_HTTPFireAndForget(t *testing.T) {
 		t,
 		map[string]string{
 			"Destination URL": viewMaskedOrigin,
-			viewMaxRetries:    "0 (fire-and-forget)",
+			"Max Retries":     "0 (fire-and-forget)",
 		},
 		fieldMap(view.Config),
 	)
@@ -301,20 +281,14 @@ func TestNewTargetViews_Database(t *testing.T) {
 	}{
 		"empty config": {config: "", want: viewExpiryNever},
 		"empty expiry": {config: `{}`, want: viewExpiryNever},
+		"explicit": {
+			config: `{"expiry":"720h"}`,
+			want:   "720h",
+		},
 		"never literal": {
 			config: `{"expiry":"` + viewExpiryNever + `"}`,
 			want:   viewExpiryNever,
 		},
-		"1h":    {config: `{"expiry":"1h"}`, want: "1 hour"},
-		"12h":   {config: `{"expiry":"12h"}`, want: "12 hours"},
-		"24h":   {config: `{"expiry":"24h"}`, want: "1 day"},
-		"720h":  {config: `{"expiry":"720h"}`, want: "30 days"},
-		"2160h": {config: `{"expiry":"2160h"}`, want: "90 days"},
-		"8760h": {config: `{"expiry":"8760h"}`, want: "365 days"},
-		"36h":   {config: `{"expiry":"36h"}`, want: "36 hours"},
-		"1h30m": {config: `{"expiry":"1h30m"}`, want: "90 minutes"},
-		"45s":   {config: `{"expiry":"45s"}`, want: "45 seconds"},
-		"1.5s":  {config: `{"expiry":"1.5s"}`, want: "1.5s"},
 	}
 
 	for name, tc := range tests {
@@ -328,49 +302,13 @@ func TestNewTargetViews_Database(t *testing.T) {
 
 			assert.Equal(
 				t,
-				map[string]string{
+				map[string]string{"Archive Expiry": tc.want},
-					"Archive Expiry":   tc.want,
-					"Archive Rotation": rotationNone,
-				},
 				fieldMap(view.Config),
 			)
 		})
 	}
 }
 
-// TestNewTargetViews_DatabaseRotation proves the target list shows a
-// database target's rotation, none when it has none stored.
-func TestNewTargetViews_DatabaseRotation(t *testing.T) {
-	t.Parallel()
-
-	// Each stored config, and the rotation the list shows for it.
-	tests := map[string]string{
-		"":                rotationNone,
-		`{"rotation":""}`: rotationNone,
-	}
-
-	for _, rotation := range []string{
-		rotationNone, rotationMonthly, rotationDaily, rotationHourly,
-	} {
-		tests[`{"rotation":"`+rotation+`"}`] = rotation
-	}
-
-	for config, want := range tests {
-		t.Run(config, func(t *testing.T) {
-			t.Parallel()
-
-			view := viewFor(t, database.Target{
-				Type:   database.TargetTypeDatabase,
-				Config: config,
-			})
-
-			assert.Equal(
-				t, want, fieldMap(view.Config)["Archive Rotation"],
-			)
-		})
-	}
-}
-
 func TestNewTargetViews_Log(t *testing.T) {
 	t.Parallel()
 
@@ -418,10 +356,6 @@ func TestNewTargetViews_Unpresentable(t *testing.T) {
 			Type:   database.TargetTypeDatabase,
 			Config: `{"expiry":"a fortnight"}`,
 		},
-		"invalid archive rotation": {
-			Type:   database.TargetTypeDatabase,
-			Config: weeklyConfig,
-		},
 	}
 
 	for name, target := range tests {

internal/delivery/target_database.go

@@ -3,6 +3,7 @@ package delivery
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 	"strings"
 	"sync"
 	"time"
@@ -20,8 +21,7 @@ const archiveNameMaxLen = 40
 // from the per-webhook event database. The event is already
 // persisted in the per-webhook event DB by the time delivery runs;
 // the database target additionally writes a durable long-term copy
-// into the file ArchiveFileName names, with a period added when the
+// into the file ArchiveFileName names and then records a single
-// target rotates (see archivePeriodPath), 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.
@@ -147,9 +147,8 @@ func (t *databaseTarget) Deliver(
 }
 
 // archive writes the full event as a row into the target's
-// archive database, honouring the optional per-target expiry and
+// archive database, honouring the optional per-target expiry
-// rotation parsed from the target config JSON. With rotation, the
+// parsed from the target config JSON.
-// event goes to the file for the period of its receive time.
 func (t *databaseTarget) archive(d *database.Delivery) error {
 	webhookID := d.Event.WebhookID
 	if webhookID == "" {
@@ -161,19 +160,6 @@ func (t *databaseTarget) archive(d *database.Delivery) error {
 		return err
 	}
 
-	rotation, err := parseArchiveRotation(d.Target.Config)
-	if err != nil {
-		return err
-	}
-
-	// An event whose stored row was gone before its delivery ran has
-	// no receive time (see Engine.hydrateEvent), and goes to the
-	// file for now.
-	receivedAt := d.Event.CreatedAt
-	if receivedAt.IsZero() {
-		receivedAt = time.Now()
-	}
-
 	w, err := t.writerFor(d.TargetID)
 	if err != nil {
 		return err
@@ -189,7 +175,7 @@ func (t *databaseTarget) archive(d *database.Delivery) error {
 		ContentType:  d.Event.ContentType,
 	}
 
-	return w.write(row, expiry, archivePeriod(rotation, receivedAt))
+	return w.write(row, expiry)
 }
 
 // writerFor returns the archive writer for a database target,
@@ -290,10 +276,11 @@ func (t *databaseTarget) releaseSweepWriter(
 	delete(t.writers, targetID)
 }
 
-// newWriter builds the writer for a database target's archive. Its
+// newWriter builds the writer for a database target's archive. The
-// path is the one ArchivePath gives for the webhook and the target as
+// file lives beside the webhook's event database in the data
-// the main database names them now; from then on only rename changes
+// directory and is named for the webhook and the target as the main
-// the name the writer uses. It does not touch the archive files.
+// database has them now; from then on only rename changes the name
+// the writer uses. It does not touch the archive file.
 func (t *databaseTarget) newWriter(
 	targetID string,
 ) (*archiveWriter, error) {
@@ -312,19 +299,21 @@ func (t *databaseTarget) newWriter(
 		)
 	}
 
-	w := newArchiveWriter(
+	dir := filepath.Dir(t.eng.dbManager.DBPath(target.WebhookID))
-		ArchivePath(t.eng.dbManager, &target.Webhook, &target),
+	name := ArchiveFileName(
-		t.eng.log,
+		target.Webhook.Name, target.Name, target.ID,
 	)
+
+	w := newArchiveWriter(filepath.Join(dir, name), t.eng.log)
 	w.webhookID = target.WebhookID
 
 	return w, nil
 }
 
-// rename moves every one of a database target's archive files to the
+// rename moves a database target's archive file to the name for
-// name for webhookName and targetName. It goes through the target's
+// webhookName and targetName. It goes through the target's writer,
-// writer, so the move holds the lock that writes and the idle sweep
+// so the move holds the lock that writes and the idle sweep take,
-// take, and later writes use the new name.
+// and later writes use the new name.
 //
 // 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

internal/delivery/target_database_archive.go

@@ -85,10 +85,6 @@ type databaseTargetConfig struct {
 	// archived rows are pruned, or "never" (the default) to
 	// keep them forever.
 	Expiry string `json:"expiry"`
-
-	// Rotation is none (the default), monthly, daily or hourly: see
-	// archivePeriod.
-	Rotation string `json:"rotation"`
 }
 
 // archivedEvent is one fully captured webhook event stored in a
@@ -182,7 +178,7 @@ func ValidateArchiveExpiry(expiry string) error {
 	return nil
 }
 
-// archiveWriter owns one database target's archive SQLite files.
+// archiveWriter owns one database target's archive SQLite file.
 // It 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
@@ -191,15 +187,7 @@ func ValidateArchiveExpiry(expiry string) error {
 // on every open.
 type archiveWriter struct {
 	mu         sync.Mutex
-
-	// path is the target's archive file as ArchivePath names it. A
-	// target that rotates writes to the files archivePeriodPath names
-	// for path and a period instead.
 	path       string
-
-	// current is the file db is open on.
-	current string
-
 	log        *slog.Logger
 	debounce   time.Duration
 	db         *gorm.DB
@@ -248,14 +236,12 @@ func newArchiveWriter(
 	}
 }
 
-// write appends the event as a row to the archive file for period
+// write appends the event as a row, then applies the debounced
-// (see archivePeriodPath), then applies the debounced close/reopen.
+// close/reopen. It recreates the archive file if it was moved
-// When period names a different file from the one open, the open one
+// or removed since the last open. A positive expiry prunes rows
-// is closed first. It recreates the archive file if it was moved or
+// older than it on each (re)open.
-// removed since the last open. A positive expiry prunes rows older
-// than it on each (re)open.
 func (w *archiveWriter) write(
-	row archivedEvent, expiry time.Duration, period string,
+	row archivedEvent, expiry time.Duration,
 ) error {
 	w.mu.Lock()
 	defer w.mu.Unlock()
@@ -266,10 +252,8 @@ func (w *archiveWriter) write(
 		)
 	}
 
-	file := archivePeriodPath(w.path, period)
+	if w.db == nil || !fileExists(w.path) {
-
+		err := w.reopen(expiry)
-	if w.db == nil || w.current != file || !fileExists(file) {
-		err := w.reopen(file, expiry)
 		if err != nil {
 			return err
 		}
@@ -280,41 +264,41 @@ func (w *archiveWriter) write(
 	err := w.db.Create(&row).Error
 	if err != nil {
 		return fmt.Errorf(
-			"archiving event to %s: %w", file, err,
+			"archiving event to %s: %w", w.path, err,
 		)
 	}
 
 	if w.now().Sub(w.lastReopen) >= w.debounce {
-		return w.reopen(file, expiry)
+		return w.reopen(expiry)
 	}
 
 	return nil
 }
 
-// open opens (creating if missing) an archive file, migrates
+// open opens (creating if missing) the archive file, migrates
 // its schema, records the reopen time, and prunes expired rows
 // when expiry is positive.
-func (w *archiveWriter) open(file string, expiry time.Duration) error {
+func (w *archiveWriter) open(expiry time.Duration) error {
-	return w.openMode(file, archiveModeCreate, expiry)
+	return w.openMode(archiveModeCreate, expiry)
 }
 
-// openMode opens an archive file with the given SQLite URI
+// openMode opens the archive file with the given SQLite URI
 // mode, migrates its schema, records the reopen time, and
 // prunes expired rows when expiry is positive. The write path
 // passes archiveModeCreate so a missing file is recreated; the
 // idle sweep passes archiveModeExisting so a missing file is an
 // error rather than a newly conjured empty archive.
 func (w *archiveWriter) openMode(
-	file, mode string, expiry time.Duration,
+	mode string, expiry time.Duration,
 ) error {
 	// Opened through database.OpenSQLite so an archive file carries
 	// the same WAL journaling, busy timeout, immediate-transaction
 	// locking, and pool bounds as every other database file. See
 	// internal/database/sqlite_open.go.
-	sqlDB, err := database.OpenSQLite(file, mode)
+	sqlDB, err := database.OpenSQLite(w.path, mode)
 	if err != nil {
 		return fmt.Errorf(
-			"opening archive database %s: %w", file, err,
+			"opening archive database %s: %w", w.path, err,
 		)
 	}
 
@@ -330,7 +314,7 @@ func (w *archiveWriter) openMode(
 
 		return fmt.Errorf(
 			"connecting to archive database %s: %w",
-			file, err,
+			w.path, err,
 		)
 	}
 
@@ -339,12 +323,11 @@ func (w *archiveWriter) openMode(
 		_ = sqlDB.Close()
 
 		return fmt.Errorf(
-			"migrating archive database %s: %w", file, err,
+			"migrating archive database %s: %w", w.path, err,
 		)
 	}
 
 	w.db = gdb
-	w.current = file
 	w.lastReopen = w.now()
 	w.reopens++
 
@@ -355,12 +338,12 @@ func (w *archiveWriter) openMode(
 	return nil
 }
 
-// reopen closes any open handle and opens file afresh. The
+// reopen closes any open handle and opens the file afresh. The
 // fresh open recreates the file if it was moved away.
-func (w *archiveWriter) reopen(file string, expiry time.Duration) error {
+func (w *archiveWriter) reopen(expiry time.Duration) error {
 	w.close()
 
-	return w.open(file, expiry)
+	return w.open(expiry)
 }
 
 // close closes the underlying handle, if any.
@@ -377,56 +360,22 @@ func (w *archiveWriter) close() {
 	w.db = nil
 }
 
-// sweepExpired prunes the target's archive files, which may have
+// sweepExpired prunes an archive that may have gone idle, with
-// gone idle, with no write to trigger the usual on-reopen prune. It
+// no write to trigger the usual on-reopen prune. It takes the
-// lists the files under the writer's own mutex, then takes the mutex
+// writer's own mutex for the whole operation, so a sweep is
-// again for one file at a time, so a write waits for at most one
+// ordered against concurrent writes rather than reaching around
-// file's prune, and each prune is ordered against concurrent writes
+// them to the file.
-// rather than reaching around them to the file.
 //
-// It never creates an archive file: it prunes only the files
+// It never creates the archive file: a missing file is skipped,
-// archiveFiles lists, skips one that is gone by the time it is
+// and the reopen uses archiveModeExisting so SQLite itself
-// reached (moved away, or renamed since the listing), and opens each
+// refuses to create one if the file disappears between the
-// with archiveModeExisting so SQLite itself refuses to create one if
+// check and the open.
-// the file disappears between the check and the open. A file named
-// for a period that the prune leaves empty is deleted.
 //
 // The archive is left CLOSED afterwards. An idle archive holding
 // no handle is what keeps the operator's move-the-file-away
 // workflow working; the next write reopens (and recreates) the
 // file as it always has.
 func (w *archiveWriter) sweepExpired(expiry time.Duration) error {
-	w.mu.Lock()
-	files, err := archiveFiles(w.path)
-	w.mu.Unlock()
-
-	if err != nil {
-		return err
-	}
-
-	var errs []error
-
-	for _, file := range files {
-		err = w.sweepFile(file, expiry)
-		if errors.Is(err, errArchiveWriterEvicted) {
-			return err
-		}
-
-		if err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	return errors.Join(errs...)
-}
-
-// sweepFile prunes one of the target's archive files for sweepExpired,
-// holding w.mu while it does. It skips a file that is gone, and deletes
-// the file, with its -wal and -shm, when it is named for a period and
-// the prune leaves it empty.
-func (w *archiveWriter) sweepFile(
-	file archiveFile, expiry time.Duration,
-) error {
 	w.mu.Lock()
 	defer w.mu.Unlock()
 
@@ -436,7 +385,7 @@ func (w *archiveWriter) sweepFile(
 		)
 	}
 
-	if !fileExists(file.path) {
+	if !fileExists(w.path) {
 		return nil
 	}
 
@@ -444,56 +393,26 @@ func (w *archiveWriter) sweepFile(
 	// freshly opened file, matching the write path's semantics.
 	w.close()
 
-	err := w.openMode(file.path, archiveModeExisting, expiry)
+	err := w.openMode(archiveModeExisting, expiry)
 	if err != nil {
 		return err
 	}
 
-	if file.period == "" {
 	w.close()
 
-		return nil
-	}
-
-	var rows int64
-
-	err = w.db.Model(&archivedEvent{}).Count(&rows).Error
-
-	w.close()
-
-	if err != nil {
-		return fmt.Errorf(
-			"counting rows in archive %s: %w", file.path, err,
-		)
-	}
-
-	if rows > 0 {
-		return nil
-	}
-
-	for _, suffix := range []string{"", "-wal", "-shm"} {
-		err = os.Remove(file.path + suffix)
-		if err != nil && !errors.Is(err, fs.ErrNotExist) {
-			return fmt.Errorf("deleting empty archive file: %w", err)
-		}
-	}
-
-	w.log.Info("deleted empty archive file", "path", file.path)
-
 	return nil
 }
 
-// rename gives every one of the target's archive files the new
+// rename gives the archive file a new name in the same directory,
-// name, keeping the period in the name of each (see
+// and the writer uses the file under that name from now on. The
-// archivePeriodPath), and the writer uses the files under that name
+// handle is closed first, which folds the -wal into the .db; any
-// from now on. The handle is closed first, which folds the -wal into
+// -wal or -shm still beside the file (left by a crash) is moved with
-// the .db; any -wal or -shm still beside a file (left by a crash) is
+// it, because SQLite finds them by name. A missing file is not an
-// moved with it, because SQLite finds them by name. A target with no
+// error: the operator may have moved it away, and the next write
-// files is not an error: the operator may have moved them away, and
+// creates it under the new name.
-// the next write creates its file under the new name.
 //
-// If a file already has one of the new names, nothing is moved and
+// If a file already has the new name, nothing is moved and the
-// the error is ErrArchiveNameTaken. If one file fails to move, those
+// 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 {
@@ -511,53 +430,38 @@ func (w *archiveWriter) rename(name string) error {
 		return nil
 	}
 
-	files, err := archiveFiles(w.path)
+	suffixes := []string{"", "-wal", "-shm"}
-	if err != nil {
-		return err
-	}
 
-	// from[i] moves to to[i].
+	for _, suffix := range suffixes {
-	var from, to []string
+		if fileExists(path + suffix) {
-
-	for _, file := range files {
-		renamed := archivePeriodPath(path, file.period)
-
-		for _, suffix := range []string{"", "-wal", "-shm"} {
-			from = append(from, file.path+suffix)
-			to = append(to, renamed+suffix)
-		}
-	}
-
-	for _, taken := range to {
-		if fileExists(taken) {
 			return fmt.Errorf(
-				"%w: %s", ErrArchiveNameTaken, filepath.Base(taken),
+				"%w: %s", ErrArchiveNameTaken, name+suffix,
 			)
 		}
 	}
 
 	w.close()
 
-	for i := range from {
+	for i, suffix := range suffixes {
-		err = os.Rename(from[i], to[i])
+		err := os.Rename(w.path+suffix, path+suffix)
 		if err == nil || errors.Is(err, fs.ErrNotExist) {
 			continue
 		}
 
-		for j := range i {
+		for _, moved := range suffixes[:i] {
-			backErr := os.Rename(to[j], from[j])
+			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", to[j],
+					"from", path+moved,
-					"to", from[j],
+					"to", w.path+moved,
 					"error", backErr,
 				)
 			}
 		}
 
 		return fmt.Errorf(
-			"renaming archive %s to %s: %w", from[i], to[i], err,
+			"renaming archive %s to %s: %w", w.path+suffix, path+suffix, err,
 		)
 	}
 
@@ -595,7 +499,7 @@ func (w *archiveWriter) prune(expiry time.Duration) {
 	if res.Error != nil {
 		w.log.Error(
 			"failed to prune expired archive rows",
-			"path", w.current,
+			"path", w.path,
 			"error", res.Error,
 		)
 
@@ -605,81 +509,12 @@ func (w *archiveWriter) prune(expiry time.Duration) {
 	if res.RowsAffected > 0 {
 		w.log.Info(
 			"pruned expired archive rows",
-			"path", w.current,
+			"path", w.path,
 			"rows_deleted", res.RowsAffected,
 		)
 	}
 }
 
-// ArchiveFileInfo is what the metadata of a database target's archive
-// files says about them.
-type ArchiveFileInfo struct {
-	// Files counts the files.
-	Files int
-
-	// Size is the bytes on disk of the files and their -wal together.
-	Size int64
-
-	// Written is when a file or a -wal was last modified, whichever is
-	// latest: a write lands in the -wal first.
-	Written time.Time
-}
-
-// StatArchive reads the metadata of a database target's archive
-// files, given the path ArchivePath gives it (see archiveFiles), and
-// of their -wal, without opening them. With no files, which is so
-// before the first write and after the operator moved them away, the
-// error wraps fs.ErrNotExist.
-func StatArchive(path string) (ArchiveFileInfo, error) {
-	files, err := archiveFiles(path)
-	if err != nil {
-		return ArchiveFileInfo{}, err
-	}
-
-	var info ArchiveFileInfo
-
-	for _, file := range files {
-		db, err := os.Stat(file.path)
-		if errors.Is(err, fs.ErrNotExist) {
-			continue
-		}
-
-		if err != nil {
-			return ArchiveFileInfo{}, err
-		}
-
-		info.Files++
-		info.Size += db.Size()
-
-		if db.ModTime().After(info.Written) {
-			info.Written = db.ModTime()
-		}
-
-		wal, err := os.Stat(file.path + "-wal")
-		if errors.Is(err, fs.ErrNotExist) {
-			continue
-		}
-
-		if err != nil {
-			return ArchiveFileInfo{}, err
-		}
-
-		info.Size += wal.Size()
-
-		if wal.ModTime().After(info.Written) {
-			info.Written = wal.ModTime()
-		}
-	}
-
-	if info.Files == 0 {
-		return ArchiveFileInfo{}, fmt.Errorf(
-			"no archive file for %s: %w", path, fs.ErrNotExist,
-		)
-	}
-
-	return info, nil
-}
-
 // fileExists reports whether a path currently exists.
 func fileExists(path string) bool {
 	_, err := os.Stat(path)

internal/delivery/target_database_export.go

@@ -1,386 +0,0 @@
-package delivery
-
-import (
-	"compress/gzip"
-	"context"
-	"database/sql"
-	"encoding/base64"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/fs"
-	"log/slog"
-	"os"
-	"path/filepath"
-	"sync"
-	"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 listed for download. It
-// opens one of the target's files at a time, only when its rows are
-// about to be written out, and closes it before it opens the next, so
-// an export holds at most one file open however many the target has.
-//
-// Each file is read on its own connection inside one read-only
-// transaction, so its rows are written out as the file stood when it
-// was opened. Archives are in WAL mode, where a reader works from a
-// snapshot and never blocks a writer: archive writes go on while a file
-// is open, and the export does not see them. SQLite cannot checkpoint
-// a -wal past an open snapshot, so the open file's -wal grows until the
-// export has written that file out.
-type ArchiveExport struct {
-	// periods are the periods of the target's files when the export
-	// was listed, "" for the file without one, in the order
-	// archiveFiles lists them.
-	periods []string
-
-	// lock is held while currentPath is called and a file is opened,
-	// so that a rename, which holds it too, cannot move the file in
-	// between.
-	lock sync.Locker
-
-	// currentPath returns the path ArchivePath gives the target under
-	// the names stored for it now, which a rename may have changed since
-	// the export was listed.
-	currentPath func() (string, error)
-
-	log *slog.Logger
-}
-
-// exportFile is one archive file opened for an export.
-type exportFile struct {
-	db *sql.DB
-	tx *gorm.DB
-
-	// period is the period in the file's name, "" for none.
-	period string
-
-	// empty is true for 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"`
-}
-
-// NewArchiveExport lists a database target's archive files for export,
-// given the path ArchivePath gives it (see archiveFiles). It opens none
-// of them. Its caller holds lock, which every rename of the target's
-// files runs under, from reading the names path is made of until it
-// returns, so the files it lists are the ones those names give.
-//
-// WriteGzipJSON, called without lock held, finds each file again by its
-// period under the path currentPath gives, holding lock while it does
-// and while it opens the file, so a rename during the export loses no
-// file. A file that is gone by then, emptied by the sweep or moved
-// away, is skipped. The export never creates a file: with no files, it
-// has no rows.
-func NewArchiveExport(
-	path string,
-	lock sync.Locker,
-	currentPath func() (string, error),
-	log *slog.Logger,
-) (*ArchiveExport, error) {
-	files, err := archiveFiles(path)
-	if err != nil {
-		return nil, err
-	}
-
-	x := &ArchiveExport{lock: lock, currentPath: currentPath, log: log}
-
-	for _, file := range files {
-		x.periods = append(x.periods, file.period)
-	}
-
-	return x, nil
-}
-
-// openExportFile opens one archive file for an export and takes its
-// snapshot. The transaction lasts as long as ctx does.
-func openExportFile(
-	ctx context.Context, file archiveFile, log *slog.Logger,
-) (*exportFile, error) {
-	db, err := database.OpenSQLite(file.path, archiveModeExisting)
-	if err != nil {
-		return nil, fmt.Errorf("opening archive %s: %w", file.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", file.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", file.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", file.path, err)
-	}
-
-	return &exportFile{
-		db: db, tx: tx, period: file.period, 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,
-// the files in the order archiveFiles lists them. A row from a file
-// named for a period has "period" beside its columns. 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, and each file is
-// closed once its rows are written, before the next is opened. When it
-// returns, no file is open. 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()
-}
-
-// openFile finds the target's archive file for period under the path
-// currentPath gives now, and opens it for the export, holding x.lock
-// for both. For a file that is gone, the error wraps fs.ErrNotExist.
-func (x *ArchiveExport) openFile(
-	ctx context.Context, period string,
-) (*exportFile, error) {
-	x.lock.Lock()
-	defer x.lock.Unlock()
-
-	path, err := x.currentPath()
-	if err != nil {
-		return nil, fmt.Errorf("finding archive file: %w", err)
-	}
-
-	file := archiveFile{path: archivePeriodPath(path, period), period: period}
-
-	_, err = os.Stat(file.path)
-	if err != nil {
-		return nil, err
-	}
-
-	return openExportFile(ctx, file, x.log)
-}
-
-// close ends the file's transaction and closes its connection.
-func (f *exportFile) close() error {
-	_ = f.tx.Rollback()
-
-	return f.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 the archived rows of each file to w, one per line,
-// separated by commas, opening each file in turn and closing it once
-// its rows are written.
-func (x *ArchiveExport) writeRows(ctx context.Context, w io.Writer) error {
-	sep := "\n"
-
-	for _, period := range x.periods {
-		f, err := x.openFile(ctx, period)
-		if errors.Is(err, fs.ErrNotExist) {
-			continue
-		}
-
-		if err != nil {
-			return err
-		}
-
-		sep, err = f.writeRows(ctx, w, sep)
-
-		err = errors.Join(err, f.close())
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// writeRows writes the file's archived rows to w, oldest first, the
-// first after sep and each other after ",\n". It returns what goes
-// before the next row: sep again when the file had no rows.
-func (f *exportFile) writeRows(
-	ctx context.Context, w io.Writer, sep string,
-) (string, error) {
-	if f.empty {
-		return sep, nil
-	}
-
-	rows, err := f.tx.WithContext(ctx).
-		Model(&archivedEvent{}).Order("id").Rows()
-	if err != nil {
-		return "", err
-	}
-
-	defer func() { _ = rows.Close() }()
-
-	for ; rows.Next(); sep = ",\n" {
-		var ev archivedEvent
-
-		err = f.tx.ScanRows(rows, &ev)
-		if err != nil {
-			return "", err
-		}
-
-		_, err = io.WriteString(w, sep)
-		if err != nil {
-			return "", err
-		}
-
-		err = writeRow(w, &ev, f.period)
-		if err != nil {
-			return "", err
-		}
-	}
-
-	return sep, 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, with
-// the period of its file beside them unless that is "".
-func writeRow(w io.Writer, ev *archivedEvent, period string) 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"
-	}
-
-	if period != "" {
-		row["period"] = period
-	}
-
-	line, err := json.Marshal(row)
-	if err != nil {
-		return err
-	}
-
-	_, err = w.Write(line)
-
-	return err
-}

internal/delivery/target_database_export_test.go

@@ -1,563 +0,0 @@
-package delivery_test
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"crypto/rand"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"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"
-)
-
-// binaryBody is a body that is not valid UTF-8.
-const binaryBody = "\xff\xfe\x00\x01binary\x80"
-
-// 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),
-	)
-}
-
-// listExport lists the archive at path for export, as the archive of a
-// target whose names do not change.
-func listExport(t *testing.T, path string) *delivery.ArchiveExport {
-	t.Helper()
-
-	return newExport(t, path, &sync.Mutex{}, func() (string, error) {
-		return path, nil
-	})
-}
-
-// newExport lists the archive at path for export, to find each file
-// again under the path currentPath gives, holding lock while it does.
-// Nothing else takes lock while it lists, so it does not hold lock.
-func newExport(
-	t *testing.T,
-	path string,
-	lock sync.Locker,
-	currentPath func() (string, error),
-) *delivery.ArchiveExport {
-	t.Helper()
-
-	export, err := delivery.NewArchiveExport(
-		path, lock, currentPath, archiveTestLogger(),
-	)
-	require.NoError(t, err)
-
-	return export
-}
-
-// 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()
-
-	return writeExport(t, listExport(t, path))
-}
-
-// 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)
-	}
-}
-
-// unlockHook is a sync.Locker that runs fn each time it is unlocked. An
-// export unlocks its lock right after it opens a file.
-type unlockHook struct {
-	sync.Mutex
-
-	fn func()
-}
-
-func (u *unlockHook) Unlock() {
-	u.Mutex.Unlock()
-	u.fn()
-}
-
-// TestArchiveExport_ReadsOneSnapshot proves an export writes a file
-// out as it was when the export opened it, and holds up no archive
-// write: a row written after the export was listed but before the file
-// was opened is in the export, and one written while the file is open
-// is stored, and is not. 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: "listed"}, 0))
-
-	opened := &unlockHook{fn: func() {
-		require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: "during"}, 0))
-	}}
-	export := newExport(t, path, opened, func() (string, error) {
-		return path, nil
-	})
-
-	require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: "before-open"}, 0))
-
-	assert.Equal(t,
-		[]string{"listed", "before-open"},
-		exportedEventIDs(t, writeExport(t, export)),
-	)
-
-	var stored int64
-
-	require.NoError(t, openArchiveDBForRead(t, path).
-		Model(&delivery.ExportArchivedEvent{}).Count(&stored).Error)
-	assert.Equal(t, int64(3), stored)
-}
-
-// TestArchiveExport_FindsFilesAfterRename proves that renaming the
-// archive after an export has listed it, as renaming its webhook or
-// target does, loses no file: the export finds each file again by its
-// period under the new name. A file moved away by then is skipped.
-func TestArchiveExport_FindsFilesAfterRename(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, "archive-old.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-
-	for _, period := range []string{"", dayPeriod, hourPeriod} {
-		require.NoError(t, w.WritePeriod(
-			delivery.ExportArchivedEvent{EventID: "in-" + period}, 0, period,
-		))
-	}
-
-	current := path
-	export := newExport(t, path, &sync.Mutex{}, func() (string, error) {
-		return current, nil
-	})
-
-	require.NoError(t, w.Rename("archive-new.db"))
-
-	current = filepath.Join(dir, "archive-new.db")
-
-	removeArchiveFiles(t, periodPath(current, dayPeriod))
-
-	assert.Equal(t,
-		[]string{"in-", "in-" + hourPeriod},
-		exportedEventIDs(t, writeExport(t, export)),
-	)
-}
-
-// TestArchiveExport_EveryFileOldestFirst writes a row to a target's
-// file without a period and to its files for a month, an hour and a
-// day, and proves the export holds every row: the file without a
-// period first, then the others oldest period first, each row from a
-// file named for a period carrying that period. A file made after the
-// export was listed is not in it.
-func TestArchiveExport_EveryFileOldestFirst(t *testing.T) {
-	t.Parallel()
-
-	path := filepath.Join(t.TempDir(), "archive-wh.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-
-	// Written in an order that is not the export's.
-	for _, period := range []string{nextDayPeriod, "", hourPeriod, "2026-03"} {
-		require.NoError(t, w.WritePeriod(
-			delivery.ExportArchivedEvent{EventID: "in-" + period}, 0, period,
-		))
-	}
-
-	export := listExport(t, path)
-
-	require.NoError(t, w.WritePeriod(
-		delivery.ExportArchivedEvent{EventID: "later"}, 0, "2026-03-06",
-	))
-
-	events := exportedEvents(t, writeExport(t, export))
-	ids := make([]string, 0, len(events))
-	periods := make([]any, 0, len(events))
-
-	for _, ev := range events {
-		ids = append(ids, fmt.Sprint(ev["event_id"]))
-		periods = append(periods, ev["period"])
-	}
-
-	assert.Equal(t,
-		[]string{"in-", "in-2026-03", "in-" + hourPeriod, "in-" + nextDayPeriod},
-		ids,
-	)
-	assert.Equal(t,
-		[]any{nil, "2026-03", hourPeriod, nextDayPeriod}, periods,
-	)
-	assert.NotContains(t, events[0], "period",
-		"a row from the file without a period has no period")
-}
-
-// openFilesPeak is an io.Writer that discards what it is given and
-// records the most archive files in dir the process had open at any
-// write, as /proc/self/fd lists the files a process has open.
-type openFilesPeak struct {
-	dir string
-	max int
-}
-
-func (p *openFilesPeak) Write(b []byte) (int, error) {
-	fds, err := os.ReadDir("/proc/self/fd")
-	if err != nil {
-		return 0, err
-	}
-
-	open := map[string]bool{}
-
-	for _, fd := range fds {
-		file, err := os.Readlink(filepath.Join("/proc/self/fd", fd.Name()))
-		if err == nil && filepath.Dir(file) == p.dir &&
-			strings.HasSuffix(file, ".db") {
-			open[file] = true
-		}
-	}
-
-	p.max = max(p.max, len(open))
-
-	return len(b), nil
-}
-
-// TestArchiveExport_OneFileOpenAtATime exports a target with a file for
-// each of 24 hours and proves the export never had more than one of
-// them open, and had one open while it wrote. Each file holds a row of
-// 48 KiB of random base64, which gzip shrinks little, so the export
-// writes output while it reads each file.
-func TestArchiveExport_OneFileOpenAtATime(t *testing.T) {
-	t.Parallel()
-
-	if runtime.GOOS != "linux" {
-		t.Skip("only Linux lists a process's open files in /proc/self/fd")
-	}
-
-	// Readlink gives each open file's path with no symbolic link in it.
-	dir, err := filepath.EvalSymlinks(t.TempDir())
-	require.NoError(t, err)
-
-	path := filepath.Join(dir, "archive-wh.db")
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-	random := make([]byte, 36<<10)
-
-	for hour := range 24 {
-		_, _ = rand.Read(random)
-
-		require.NoError(t, w.WritePeriod(delivery.ExportArchivedEvent{
-			Body: base64.StdEncoding.EncodeToString(random),
-		}, 0, fmt.Sprintf("2026-10-01-%02d", hour)))
-	}
-
-	// The writer's own handle on the last file is not the export's.
-	w.Evict()
-
-	// Through a buffer, the open files are listed once per 8 KiB of
-	// output, a few times for each file, rather than at each of gzip's
-	// small writes, which takes far longer.
-	peak := &openFilesPeak{dir: dir}
-	buffered := bufio.NewWriterSize(peak, 8<<10)
-
-	require.NoError(t, writeExportTo(t, listExport(t, path), buffered))
-	require.NoError(t, buffered.Flush())
-	assert.Equal(t, 1, peak.max)
-}
-
-// 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 := listExport(t, path)
-
-	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_rotation.go

@@ -1,198 +0,0 @@
-package delivery
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"slices"
-	"strings"
-	"time"
-
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// The archive rotations: how often a database target starts a new
-// archive file. Every rotation but none puts the period of an event's
-// receive time, in UTC, in the name of the file the event goes to,
-// written in the layout beside it.
-const (
-	archiveRotationNone    = "none"
-	archiveRotationMonthly = "monthly"
-	archiveRotationDaily   = "daily"
-	archiveRotationHourly  = "hourly"
-
-	archiveMonthLayout = "2006-01"
-	archiveDayLayout   = "2006-01-02"
-	archiveHourLayout  = "2006-01-02-15"
-)
-
-// errArchiveRotationUnknown is returned for a rotation that is not one
-// of the four.
-var errArchiveRotationUnknown = errors.New(
-	"rotation must be none, monthly, daily or hourly",
-)
-
-// archiveFile is one of a database target's archive files, and the
-// period in its name: "" for the file named without one.
-type archiveFile struct {
-	path   string
-	period string
-}
-
-// ValidateArchiveRotation checks a user-supplied archive rotation for
-// a database target: empty or none (both meaning one file), monthly,
-// daily or hourly.
-func ValidateArchiveRotation(rotation string) error {
-	switch rotation {
-	case "", archiveRotationNone, archiveRotationMonthly,
-		archiveRotationDaily, archiveRotationHourly:
-		return nil
-	default:
-		return fmt.Errorf("%w: %q", errArchiveRotationUnknown, rotation)
-	}
-}
-
-// parseArchiveRotation reads the rotation from a database target's
-// config JSON. An empty config or an empty rotation is none.
-func parseArchiveRotation(configJSON string) (string, error) {
-	if configJSON == "" {
-		return archiveRotationNone, nil
-	}
-
-	var cfg databaseTargetConfig
-
-	err := json.Unmarshal([]byte(configJSON), &cfg)
-	if err != nil {
-		return "", fmt.Errorf("parsing database target config: %w", err)
-	}
-
-	err = ValidateArchiveRotation(cfg.Rotation)
-	if err != nil {
-		return "", err
-	}
-
-	if cfg.Rotation == "" {
-		return archiveRotationNone, nil
-	}
-
-	return cfg.Rotation, nil
-}
-
-// archivePeriod returns the period, in UTC, that a rotation puts an
-// event received at receivedAt in: "2026-10" for monthly,
-// "2026-10-01" for daily, "2026-10-01-19" for hourly, and "" for none.
-func archivePeriod(rotation string, receivedAt time.Time) string {
-	switch rotation {
-	case archiveRotationMonthly:
-		return receivedAt.UTC().Format(archiveMonthLayout)
-	case archiveRotationDaily:
-		return receivedAt.UTC().Format(archiveDayLayout)
-	case archiveRotationHourly:
-		return receivedAt.UTC().Format(archiveHourLayout)
-	default:
-		return ""
-	}
-}
-
-// archivePeriodPath returns the path of a database target's archive
-// file for a period: path, as ArchivePath gives it, with "-" and the
-// period put before its ".db". The period "" gives path itself.
-func archivePeriodPath(path, period string) string {
-	if period == "" {
-		return path
-	}
-
-	return strings.TrimSuffix(path, ".db") + "-" + period + ".db"
-}
-
-// ArchivePathAt returns the archive file a database target writes an
-// event received at receivedAt to: ArchivePath's file, with the
-// period in its name when the target rotates.
-func ArchivePathAt(
-	dbMgr *database.WebhookDBManager,
-	webhook *database.Webhook,
-	target *database.Target,
-	receivedAt time.Time,
-) (string, error) {
-	rotation, err := parseArchiveRotation(target.Config)
-	if err != nil {
-		return "", err
-	}
-
-	return archivePeriodPath(
-		ArchivePath(dbMgr, webhook, target),
-		archivePeriod(rotation, receivedAt),
-	), nil
-}
-
-// archiveFiles lists the database target's archive files that exist,
-// given the path ArchivePath gives it: the file at path, then each
-// file archivePeriodPath names for path and a period, oldest period
-// first. Which rotation wrote a file does not matter, so the files of
-// an earlier rotation setting are listed too.
-func archiveFiles(path string) ([]archiveFile, error) {
-	dir := filepath.Dir(path)
-
-	entries, err := os.ReadDir(dir)
-	if err != nil {
-		return nil, fmt.Errorf("listing archive files: %w", err)
-	}
-
-	stem := strings.TrimSuffix(filepath.Base(path), ".db")
-
-	var files []archiveFile
-
-	for _, entry := range entries {
-		period, ok := archiveFilePeriod(stem, entry.Name())
-		if ok {
-			files = append(files, archiveFile{
-				path:   filepath.Join(dir, entry.Name()),
-				period: period,
-			})
-		}
-	}
-
-	// A month sorts before the days and hours in it.
-	slices.SortFunc(files, func(a, b archiveFile) int {
-		return strings.Compare(a.period, b.period)
-	})
-
-	return files, nil
-}
-
-// archiveFilePeriod reports whether name is the name of an archive
-// file of the target whose file name without a period is stem+".db",
-// and the period in it.
-func archiveFilePeriod(stem, name string) (string, bool) {
-	rest, ok := strings.CutPrefix(name, stem)
-	if !ok {
-		return "", false
-	}
-
-	rest, ok = strings.CutSuffix(rest, ".db")
-	if !ok {
-		return "", false
-	}
-
-	if rest == "" {
-		return "", true
-	}
-
-	period, ok := strings.CutPrefix(rest, "-")
-	if !ok {
-		return "", false
-	}
-
-	for _, layout := range []string{
-		archiveMonthLayout, archiveDayLayout, archiveHourLayout,
-	} {
-		_, err := time.Parse(layout, period)
-		if err == nil {
-			return period, true
-		}
-	}
-
-	return "", false
-}

internal/delivery/target_database_rotation_test.go

@@ -1,389 +0,0 @@
-package delivery_test
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"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 archive rotations, and the configs of a daily target and of one
-// whose rotation is not one of the four.
-const (
-	rotationNone    = "none"
-	rotationMonthly = "monthly"
-	rotationDaily   = "daily"
-	rotationHourly  = "hourly"
-
-	dailyConfig  = `{"rotation":"daily"}`
-	weeklyConfig = `{"rotation":"weekly"}`
-)
-
-// The periods the tests archive into most: two days, and an hour of
-// the first.
-const (
-	dayPeriod     = "2026-03-04"
-	nextDayPeriod = "2026-03-05"
-	hourPeriod    = "2026-03-04-05"
-)
-
-// periodPath returns the archive file for a period of the target whose
-// file without a period is path.
-func periodPath(path, period string) string {
-	return strings.TrimSuffix(path, ".db") + "-" + period + ".db"
-}
-
-// deliverReceivedAt delivers to a database target an event whose
-// receive time is receivedAt, and returns the event's id. The receive
-// time is what decides a rotated archive's file, so setting it is how
-// these tests move the clock across a period boundary.
-func (env *archiveEnv) deliverReceivedAt(
-	t *testing.T, tgt *database.Target, receivedAt time.Time,
-) string {
-	t.Helper()
-
-	webhookDB := testWebhookDB(t)
-	event := seedEvent(t, webhookDB, `{"n":1}`)
-	event.CreatedAt = receivedAt
-
-	env.eng.ExportDeliverDatabase(
-		webhookDB, seedDatabaseTargetDelivery(t, webhookDB, event, tgt),
-	)
-
-	return event.ID
-}
-
-// TestDeliverDatabase_RotatesAtEachPeriodBoundary delivers, for each
-// rotation, an event received in the last second of a period and one
-// received in the first second of the next, and checks each lands in
-// the file named for its own period, in UTC. Rotation none keeps both
-// in the one file.
-func TestDeliverDatabase_RotatesAtEachPeriodBoundary(t *testing.T) {
-	t.Parallel()
-
-	berlin := time.FixedZone("CEST", 2*60*60)
-
-	cases := []struct {
-		name          string
-		rotation      string
-		before, after time.Time
-		// periods are the periods of before and after.
-		periods [2]string
-	}{
-		{
-			rotationMonthly, rotationMonthly,
-			time.Date(2026, 1, 31, 23, 59, 59, 0, time.UTC),
-			time.Date(2026, 2, 1, 0, 0, 0, 0, time.UTC),
-			[2]string{"2026-01", "2026-02"},
-		},
-		{
-			rotationDaily, rotationDaily,
-			time.Date(2026, 3, 4, 23, 59, 59, 0, time.UTC),
-			time.Date(2026, 3, 5, 0, 0, 0, 0, time.UTC),
-			[2]string{dayPeriod, nextDayPeriod},
-		},
-		{
-			// The same instants, received in a zone two hours ahead
-			// of UTC, where they fall on 5 March: the period is UTC's.
-			"daily in another zone", rotationDaily,
-			time.Date(2026, 3, 5, 1, 59, 59, 0, berlin),
-			time.Date(2026, 3, 5, 2, 0, 0, 0, berlin),
-			[2]string{dayPeriod, nextDayPeriod},
-		},
-		{
-			rotationHourly, rotationHourly,
-			time.Date(2026, 3, 4, 5, 59, 59, 0, time.UTC),
-			time.Date(2026, 3, 4, 6, 0, 0, 0, time.UTC),
-			[2]string{hourPeriod, "2026-03-04-06"},
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			env := setupArchiveTest(t)
-			tgt := env.seedDatabaseTarget(t, `{"rotation":"`+tc.rotation+`"}`)
-			path := env.archivePath(tgt)
-
-			first := env.deliverReceivedAt(t, tgt, tc.before)
-			second := env.deliverReceivedAt(t, tgt, tc.after)
-
-			assert.Equal(t, []string{first},
-				archivedEventIDs(t, periodPath(path, tc.periods[0])))
-			assert.Equal(t, []string{second},
-				archivedEventIDs(t, periodPath(path, tc.periods[1])))
-			assert.NoFileExists(t, path,
-				"a rotated target never writes the file without a period")
-		})
-	}
-
-	t.Run(rotationNone, func(t *testing.T) {
-		t.Parallel()
-
-		env := setupArchiveTest(t)
-		tgt := env.seedDatabaseTarget(t, `{"rotation":"`+rotationNone+`"}`)
-
-		first := env.deliverReceivedAt(t, tgt, cases[0].before)
-		second := env.deliverReceivedAt(t, tgt, cases[0].after)
-
-		assert.ElementsMatch(t, []string{first, second},
-			archivedEventIDs(t, env.archivePath(tgt)))
-	})
-}
-
-// TestDeliverDatabase_EventWithoutReceiveTime proves an event whose
-// receive time is not known goes to the file for the time it is
-// archived, rather than to one for the year 1.
-func TestDeliverDatabase_EventWithoutReceiveTime(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(t, `{"rotation":"`+rotationMonthly+`"}`)
-	path := env.archivePath(tgt)
-
-	before := time.Now().UTC().Format("2006-01")
-	id := env.deliverReceivedAt(t, tgt, time.Time{})
-
-	file := periodPath(path, time.Now().UTC().Format("2006-01"))
-
-	_, err := os.Stat(file)
-	if err != nil {
-		// The month turned during the delivery.
-		file = periodPath(path, before)
-	}
-
-	assert.Equal(t, []string{id}, archivedEventIDs(t, file))
-	assert.NoFileExists(t, periodPath(path, "0001-01"))
-}
-
-// TestDeliverDatabase_RotationChangeKeepsOldFiles changes a target's
-// rotation from none to daily between two events, and checks the
-// second goes to the daily file while the first stays where it was.
-func TestDeliverDatabase_RotationChangeKeepsOldFiles(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(t, "")
-	path := env.archivePath(tgt)
-	at := time.Date(2026, 3, 4, 12, 0, 0, 0, time.UTC)
-
-	first := env.deliverReceivedAt(t, tgt, at)
-
-	tgt.Config = dailyConfig
-	second := env.deliverReceivedAt(t, tgt, at)
-
-	assert.Equal(t, []string{first}, archivedEventIDs(t, path))
-	assert.Equal(t, []string{second},
-		archivedEventIDs(t, periodPath(path, dayPeriod)))
-}
-
-// TestArchiveSweep_PrunesEveryFile gives a daily target three files:
-// the file without a period, left from before it rotated, and two
-// daily files. Each holds a row older than the expiry, and one daily
-// file also a newer row. The sweep prunes the old row from every file,
-// deletes the daily file it leaves empty, and keeps the file without a
-// period although it is empty too.
-func TestArchiveSweep_PrunesEveryFile(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(
-		t, `{"expiry":"1h","rotation":"`+rotationDaily+`"}`,
-	)
-	path := env.archivePath(tgt)
-	emptied := periodPath(path, dayPeriod)
-	kept := periodPath(path, nextDayPeriod)
-
-	now := time.Now()
-	old := now.Add(-48 * time.Hour)
-
-	seedArchiveFile(t, path, tgt.WebhookID, old)
-	seedArchiveFile(t, emptied, tgt.WebhookID, old)
-	seedArchiveFile(t, kept, tgt.WebhookID, old, now.Add(-time.Minute))
-
-	env.sweeper.ExportSweep(t.Context())
-
-	assert.Empty(t, archivedEventIDs(t, path))
-	assert.Equal(t, []string{sweepRowNew}, archivedEventIDs(t, kept))
-
-	for _, suffix := range archiveFileSuffixes() {
-		assert.NoFileExists(t, emptied+suffix)
-	}
-}
-
-// TestRename_MovesEveryFile renames a daily target that also has a
-// file without a period, and checks every file moves to the new name
-// with its period, rows and all, and that a later write uses the new
-// name.
-func TestRename_MovesEveryFile(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(t, "")
-	oldPath := env.archivePath(tgt)
-	day := time.Date(2026, 3, 4, 12, 0, 0, 0, time.UTC)
-
-	unrotated := env.deliverReceivedAt(t, tgt, day)
-
-	tgt.Config = dailyConfig
-	first := env.deliverReceivedAt(t, tgt, day)
-	second := env.deliverReceivedAt(t, tgt, day.Add(24*time.Hour))
-
-	require.NoError(t, env.eng.Rename(tgt.ID, "Orders", "Long Term"))
-
-	newPath := filepath.Join(
-		env.dataDir, "archive-orders-long-term-"+tgt.ID+".db",
-	)
-
-	for _, old := range []string{
-		oldPath,
-		periodPath(oldPath, dayPeriod),
-		periodPath(oldPath, nextDayPeriod),
-	} {
-		assert.NoFileExists(t, old)
-	}
-
-	assert.Equal(t, []string{unrotated}, archivedEventIDs(t, newPath))
-	assert.Equal(t, []string{first},
-		archivedEventIDs(t, periodPath(newPath, dayPeriod)))
-	assert.Equal(t, []string{second},
-		archivedEventIDs(t, periodPath(newPath, nextDayPeriod)))
-
-	third := env.deliverReceivedAt(t, tgt, day.Add(48*time.Hour))
-	assert.Equal(t, []string{third},
-		archivedEventIDs(t, periodPath(newPath, "2026-03-06")))
-}
-
-// TestRename_NeverReplacesARotatedFile plants a file at the new name
-// of a target's daily file, and proves the rename is refused and moves
-// none of the target's files.
-func TestRename_NeverReplacesARotatedFile(t *testing.T) {
-	t.Parallel()
-
-	env := setupArchiveTest(t)
-	tgt := env.seedDatabaseTarget(t, dailyConfig)
-	oldPath := env.archivePath(tgt)
-	day := time.Date(2026, 3, 4, 12, 0, 0, 0, time.UTC)
-
-	env.deliverReceivedAt(t, tgt, day)
-	env.deliverReceivedAt(t, tgt, day.Add(24*time.Hour))
-
-	newPath := filepath.Join(
-		env.dataDir, "archive-orders-long-term-"+tgt.ID+".db",
-	)
-	planted := periodPath(newPath, nextDayPeriod)
-	require.NoError(t, os.WriteFile(planted, []byte("planted"), 0o600))
-
-	require.ErrorIs(
-		t, env.eng.Rename(tgt.ID, "Orders", "Long Term"),
-		delivery.ErrArchiveNameTaken,
-	)
-
-	assert.FileExists(t, periodPath(oldPath, dayPeriod))
-	assert.FileExists(t, periodPath(oldPath, nextDayPeriod))
-	assert.NoFileExists(t, periodPath(newPath, dayPeriod))
-}
-
-// TestStatArchive_EveryFile proves StatArchive counts and adds up every
-// one of a target's files, takes the latest write of any of them, and
-// leaves out files whose names only look like the target's.
-func TestStatArchive_EveryFile(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, "archive-wh.db")
-	files := []string{
-		path, periodPath(path, "2026-03"), periodPath(path, hourPeriod),
-	}
-	written := time.Date(2026, 3, 4, 5, 6, 7, 0, time.UTC)
-
-	var size int64
-
-	for i, file := range files {
-		require.NoError(t, os.WriteFile(file, make([]byte, 100*(i+1)), 0o600))
-
-		size += int64(100 * (i + 1))
-		at := written.Add(-time.Duration(i) * time.Hour)
-		require.NoError(t, os.Chtimes(file, at, at))
-	}
-
-	for _, other := range []string{
-		"archive-wh-2026-13.db", "archive-wh-2026-3.db",
-		"archive-wh-other.db", "archive-wh-2026-03.json",
-		"archive-whx.db",
-	} {
-		require.NoError(t,
-			os.WriteFile(filepath.Join(dir, other), []byte("x"), 0o600))
-	}
-
-	got, err := delivery.StatArchive(path)
-	require.NoError(t, err)
-	assert.Equal(t, len(files), got.Files)
-	assert.Equal(t, size, got.Size)
-	assert.True(t, written.Equal(got.Written), got.Written)
-}
-
-// TestArchivePathAt names the file each rotation writes an event to.
-func TestArchivePathAt(t *testing.T) {
-	t.Parallel()
-
-	dataDir := t.TempDir()
-	dbMgr := database.NewTestWebhookDBManager(dataDir)
-	webhook := &database.Webhook{
-		BaseModel: database.BaseModel{ID: "wh-id"}, Name: "Orders",
-	}
-	at := time.Date(2026, 10, 1, 19, 30, 0, 0, time.UTC)
-
-	cases := map[string]string{
-		"":                                       "",
-		`{"rotation":"` + rotationNone + `"}`:    "",
-		`{"rotation":"` + rotationMonthly + `"}`: "-2026-10",
-		dailyConfig:                              "-2026-10-01",
-		`{"rotation":"` + rotationHourly + `"}`:  "-2026-10-01-19",
-	}
-
-	for config, period := range cases {
-		target := &database.Target{
-			BaseModel: database.BaseModel{ID: "tgt-id"},
-			Name:      "Archive",
-			Config:    config,
-		}
-
-		got, err := delivery.ArchivePathAt(dbMgr, webhook, target, at)
-		require.NoError(t, err, config)
-		assert.Equal(t,
-			filepath.Join(
-				dataDir, "archive-orders-archive-tgt-id"+period+".db",
-			),
-			got, config,
-		)
-	}
-
-	_, err := delivery.ArchivePathAt(dbMgr, webhook, &database.Target{
-		Config: weeklyConfig,
-	}, at)
-	require.Error(t, err)
-}
-
-// TestValidateArchiveRotation accepts the four rotations, and empty,
-// and refuses anything else.
-func TestValidateArchiveRotation(t *testing.T) {
-	t.Parallel()
-
-	for _, ok := range []string{
-		"", rotationNone, rotationMonthly, rotationDaily, rotationHourly,
-	} {
-		require.NoError(t, delivery.ValidateArchiveRotation(ok), ok)
-	}
-
-	for _, bad := range []string{"weekly", "Daily", "hourly "} {
-		require.Error(t, delivery.ValidateArchiveRotation(bad), bad)
-	}
-}

internal/delivery/target_database_test.go

@@ -3,7 +3,6 @@ package delivery_test
 import (
 	"database/sql"
 	"fmt"
-	"io/fs"
 	"log/slog"
 	"os"
 	"path/filepath"
@@ -18,7 +17,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 {
@@ -44,8 +42,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)
 
@@ -184,50 +181,6 @@ func TestArchiveWriter_RecreatesAfterRemoval(
 	assert.Equal(t, "b", got[0].EventID)
 }
 
-// TestStatArchive proves StatArchive finds no file before the first
-// write; after a write still held in the -wal, counts the -wal in the
-// size and takes its later time as the last write; and finds no file
-// again once the file has been moved away.
-func TestStatArchive(t *testing.T) {
-	t.Parallel()
-
-	path := filepath.Join(t.TempDir(), "archive-wh.db")
-
-	_, err := delivery.StatArchive(path)
-	require.ErrorIs(t, err, fs.ErrNotExist)
-
-	// With the clock stopped, the reopen debounce never passes, so
-	// the handle stays open after the write.
-	stopped := time.Now()
-	w := delivery.NewExportArchiveWriter(path, archiveTestLogger(), 0)
-	w.SetNow(func() time.Time { return stopped })
-
-	require.NoError(t, w.Write(delivery.ExportArchivedEvent{EventID: "a"}, 0))
-
-	written := time.Date(2026, 1, 2, 3, 4, 5, 0, time.UTC)
-	earlier := written.Add(-time.Hour)
-	require.NoError(t, os.Chtimes(path, earlier, earlier))
-	require.NoError(t, os.Chtimes(path+"-wal", written, written))
-
-	file, err := os.Stat(path)
-	require.NoError(t, err)
-
-	wal, err := os.Stat(path + "-wal")
-	require.NoError(t, err)
-	require.Positive(t, wal.Size())
-
-	got, err := delivery.StatArchive(path)
-	require.NoError(t, err)
-	assert.Equal(t, 1, got.Files)
-	assert.Equal(t, file.Size()+wal.Size(), got.Size)
-	assert.True(t, written.Equal(got.Written), got.Written)
-
-	removeArchiveFiles(t, path)
-
-	_, err = delivery.StatArchive(path)
-	require.ErrorIs(t, err, fs.ErrNotExist)
-}
-
 func TestArchiveWriter_ReopenDebounce(t *testing.T) {
 	t.Parallel()
 
@@ -721,41 +674,3 @@ func TestArchiveWriter_RenameMovesBackOnFailure(t *testing.T) {
 	assert.NoFileExists(t, filepath.Join(dir, newName))
 	assert.Equal(t, oldPath, w.Path())
 }
-
-// TestArchiveWriter_RenameMovesBackEveryFile renames a target with a
-// file without a period and a file for a month, and proves that when
-// the month's file fails to move, the file already moved is moved back:
-// both files are under the old name with their rows, and nothing is
-// under the new name. The new name is 251 bytes, so the file without a
-// period, with its -wal and -shm, can take it, but the month's file,
-// eight bytes longer, cannot.
-func TestArchiveWriter_RenameMovesBackEveryFile(t *testing.T) {
-	t.Parallel()
-
-	dir := t.TempDir()
-	oldPath := filepath.Join(dir, "archive-old.db")
-	monthPath := filepath.Join(dir, "archive-old-2026-03.db")
-	w := delivery.NewExportArchiveWriter(oldPath, archiveTestLogger(), 0)
-
-	require.NoError(t, w.WritePeriod(
-		delivery.ExportArchivedEvent{EventID: "in-none"}, 0, "",
-	))
-	require.NoError(t, w.WritePeriod(
-		delivery.ExportArchivedEvent{EventID: "in-month"}, 0, "2026-03",
-	))
-
-	require.Error(t, w.Rename(strings.Repeat("a", 248)+".db"))
-
-	assert.Equal(t, []string{"in-none"}, archivedEventIDs(t, oldPath))
-	assert.Equal(t, []string{"in-month"}, archivedEventIDs(t, monthPath))
-
-	entries, err := os.ReadDir(dir)
-	require.NoError(t, err)
-
-	for _, entry := range entries {
-		assert.True(t, strings.HasPrefix(entry.Name(), "archive-old"),
-			"%s is not under the old name", entry.Name())
-	}
-
-	assert.Equal(t, oldPath, w.Path())
-}

internal/delivery/target_headers_test.go

@@ -204,11 +204,10 @@ func TestNewTargetConfigForm(t *testing.T) {
 
 	form, err = delivery.NewTargetConfigForm(&database.Target{
 		Type:   database.TargetTypeDatabase,
-		Config: `{"expiry":"720h","rotation":"daily"}`,
+		Config: `{"expiry":"720h"}`,
 	})
 	require.NoError(t, err)
 	assert.Equal(t, "720h", form.Expiry)
-	assert.Equal(t, rotationDaily, form.Rotation)
 
 	form, err = delivery.NewTargetConfigForm(&database.Target{
 		Type: database.TargetTypeLog,
@@ -217,9 +216,8 @@ func TestNewTargetConfigForm(t *testing.T) {
 	assert.Empty(t, form.URL)
 }
 
-// A keep-forever archive target yields an empty expiry, so the edit
+// A keep-forever archive target must pre-fill as an empty field, so
-// form starts on never; saving it unchanged stores never, which means
+// saving the form back unchanged stores the same empty config.
-// the same as an empty expiry.
 func TestNewTargetConfigForm_DatabaseNeverIsBlank(t *testing.T) {
 	t.Parallel()
 
@@ -249,10 +247,6 @@ func TestNewTargetConfigForm_UnreadableConfigErrors(t *testing.T) {
 			Type:   database.TargetTypeDatabase,
 			Config: `{"expiry":"soon"}`,
 		},
-		{
-			Type:   database.TargetTypeDatabase,
-			Config: weeklyConfig,
-		},
 		{Type: database.TargetType("nope")},
 	}
 

internal/delivery/target_http.go

@@ -234,7 +234,7 @@ func (c *httpCore) handleRetry(
 		database.DeliveryStatusRetrying,
 	)
 
-	backoff := Backoff(attemptNum)
+	backoff := calcBackoff(attemptNum)
 
 	retryTask := *task
 	retryTask.AttemptNum = attemptNum + 1
@@ -301,7 +301,7 @@ func (c *httpCore) remainingBackoff(
 		return 0
 	}
 
-	backoff := Backoff(attemptNum)
+	backoff := calcBackoff(attemptNum)
 	elapsed := time.Since(lastResult.CreatedAt)
 	remaining := backoff - elapsed
 
@@ -326,14 +326,12 @@ func (c *httpCore) backoffElapsed(
 		return true
 	}
 
-	backoff := Backoff(attemptNum)
+	backoff := calcBackoff(attemptNum)
 
 	return time.Since(lastResult.CreatedAt) >= backoff
 }
 
-// Backoff is how long an http or slack target with retries waits after
+func calcBackoff(attemptNum int) time.Duration {
-// a delivery's failed attempt attemptNum before trying it again.
-func Backoff(attemptNum int) time.Duration {
 	shift := max(attemptNum-1, 0)
 	shift = min(shift, maxBackoffShift)
 

internal/delivery/terminal_state_test.go

@@ -573,8 +573,6 @@ func TestRecoverPending_TargetDeleted(t *testing.T) {
 
 	s := newISetup(t)
 
-	iCreateWebhook(t, s.MainDB, s.WebhookID, "pending-recovery")
-
 	deliveryID := tSeedDeletedTarget(
 		t, s, "gone-while-pending", "http://example.com/hook",
 		database.DeliveryStatusPending,
@@ -614,8 +612,6 @@ func TestRecoverPending_TargetDeleted_LeavesAnOwnedDeliveryAlone(
 
 	s := newISetup(t)
 
-	iCreateWebhook(t, s.MainDB, s.WebhookID, "owned-recovery")
-
 	deliveryID := tSeedDeletedTarget(
 		t, s, "gone-but-owned", "http://example.com/hook",
 		database.DeliveryStatusPending,

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/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
+	require.GreaterOrEqual(
-	// directly under cmd and internal. Each holds non-test code, so one
+		t, parsed, minNonTestFiles,
-	// the walk parsed nothing in was skipped, and a Scan there would
+		"parsed %d non-test .go files, so this check found "+
-	// pass unseen.
+			"nothing to look at", parsed,
-	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.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/archive_expiry.go

@@ -1,58 +0,0 @@
-package handlers
-
-const (
-	// archiveExpiryNever is the archive expiry that keeps archived
-	// events forever. A stored empty expiry means the same.
-	archiveExpiryNever = "never"
-
-	// tmplKeyArchiveExpiryChoices is the template data key for the
-	// entries of a page's archive expiry select.
-	tmplKeyArchiveExpiryChoices = "ArchiveExpiryChoices"
-)
-
-// archiveChoice is one entry of a database target's archive expiry
-// or archive rotation select: the value stored, the label shown, and
-// whether the select starts on it.
-type archiveChoice struct {
-	Value    string
-	Label    string
-	Selected bool
-}
-
-// archiveExpiryChoices lists the archive expiries offered by the new
-// webhook page, the add target form and the target edit form.
-func archiveExpiryChoices() []archiveChoice {
-	return []archiveChoice{
-		{Value: archiveExpiryNever, Label: archiveExpiryNever},
-		{Value: "1h", Label: "1h"},
-		{Value: "12h", Label: "12h"},
-		{Value: "24h", Label: "24h"},
-		{Value: "720h", Label: "30d"},
-		{Value: "2160h", Label: "90d"},
-		{Value: "8760h", Label: "365d"},
-	}
-}
-
-// archiveExpiryOptions returns the choices with expiry selected; an
-// empty expiry selects never. An expiry that is not one of the
-// choices comes first as its own selected entry, so saving the form
-// unchanged keeps it.
-func archiveExpiryOptions(expiry string) []archiveChoice {
-	if expiry == "" {
-		expiry = archiveExpiryNever
-	}
-
-	options := archiveExpiryChoices()
-
-	for i := range options {
-		if options[i].Value == expiry {
-			options[i].Selected = true
-
-			return options
-		}
-	}
-
-	own := archiveChoice{Value: expiry, Label: expiry, Selected: true}
-
-	return append([]archiveChoice{own}, options...)
-}

internal/handlers/archive_expiry_test.go

@@ -1,185 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"regexp"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// expiryNever is the archive expiry that keeps archived events
-// forever.
-const expiryNever = "never"
-
-// matched returns what the one group of pattern matched in page, at
-// each match.
-func matched(pattern, page string) []string {
-	matches := regexp.MustCompile(pattern).FindAllStringSubmatch(page, -1)
-	groups := make([]string, 0, len(matches))
-
-	for _, m := range matches {
-		groups = append(groups, m[1])
-	}
-
-	return groups
-}
-
-// expiryShown returns the archive expiries the webhook page's target
-// list shows.
-func expiryShown(
-	t *testing.T, env *sourceTestEnv, webhookID string,
-) []string {
-	t.Helper()
-
-	w := httptest.NewRecorder()
-	env.handlers.HandleSourceDetail().ServeHTTP(w, getRequest(
-		t, "/hook/"+webhookID, env.cookies,
-		map[string]string{sourceIDParam: webhookID},
-	))
-	require.Equal(t, http.StatusOK, w.Code)
-
-	return matched(
-		`Archive Expiry:</span>\s*<span>([^<]*)</span>`, w.Body.String(),
-	)
-}
-
-// expirySelected returns the target edit page and the expiries its
-// expiry select starts on.
-func expirySelected(
-	t *testing.T, env *sourceTestEnv, webhookID, targetID string,
-) (string, []string) {
-	t.Helper()
-
-	page := targetEditPage(t, env, webhookID, targetID)
-
-	return page, selectedIn(page, "expiry")
-}
-
-// targetEditPage returns a target's edit page.
-func targetEditPage(
-	t *testing.T, env *sourceTestEnv, webhookID, targetID string,
-) string {
-	t.Helper()
-
-	w := serveTarget(
-		env, http.MethodGet,
-		"/hook/"+webhookID+"/targets/"+targetID+"/edit", nil,
-	)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	return w.Body.String()
-}
-
-// selectedIn returns the values the select named name on page starts
-// on.
-func selectedIn(page, name string) []string {
-	_, rest, _ := strings.Cut(page, `<select id="`+name+`" name="`+name+`"`)
-	options, _, _ := strings.Cut(rest, "</select>")
-
-	return matched(`<option value="([^"]*)" selected>`, options)
-}
-
-// TestArchiveExpiryChoices adds a database target with each archive
-// expiry the forms offer, and checks that it is stored as chosen,
-// shown in plain units in the target list, and that the target edit
-// form starts on it.
-func TestArchiveExpiryChoices(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	choices := []struct{ value, shown string }{
-		{expiryNever, expiryNever},
-		{"1h", "1 hour"},
-		{"12h", "12 hours"},
-		{"24h", "1 day"},
-		{"720h", "30 days"},
-		{"2160h", "90 days"},
-		{"8760h", "365 days"},
-	}
-
-	for _, choice := range choices {
-		t.Run(choice.value, func(t *testing.T) {
-			t.Parallel()
-
-			webhook := seedWebhookWithRetention(t, env.db, 30)
-
-			form := url.Values{}
-			form.Set("name", "archive")
-			form.Set("type", string(database.TargetTypeDatabase))
-			form.Set("expiry", choice.value)
-
-			w := serveTarget(
-				env, http.MethodPost, "/hook/"+webhook.ID+"/targets", form,
-			)
-			require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-
-			targets := targetsForWebhook(t, env.db, webhook.ID)
-			require.Len(t, targets, 1)
-			assert.JSONEq(
-				t, `{"expiry":"`+choice.value+`"}`, targets[0].Config,
-			)
-
-			assert.Equal(
-				t, []string{choice.shown},
-				expiryShown(t, env, webhook.ID),
-			)
-
-			_, selected := expirySelected(t, env, webhook.ID, targets[0].ID)
-			assert.Equal(t, []string{choice.value}, selected)
-		})
-	}
-}
-
-// TestArchiveExpiryEditStartsOnStoredValue checks the edit form of a
-// database target whose stored expiry is empty, which selects never,
-// and of one whose expiry is not one of the choices, which is listed
-// first as its own selected entry and saved unchanged.
-func TestArchiveExpiryEditStartsOnStoredValue(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	webhook := seedWebhookWithRetention(t, env.db, 30)
-	empty := seedConfiguredTarget(
-		t, env.db, webhook.ID, database.TargetTypeDatabase, "",
-	)
-
-	_, selected := expirySelected(t, env, webhook.ID, empty.ID)
-	assert.Equal(t, []string{expiryNever}, selected)
-
-	webhook = seedWebhookWithRetention(t, env.db, 30)
-	unlisted := seedConfiguredTarget(
-		t, env.db, webhook.ID, database.TargetTypeDatabase,
-		`{"expiry":"36h"}`,
-	)
-
-	assert.Equal(t, []string{"36 hours"}, expiryShown(t, env, webhook.ID))
-
-	page, selected := expirySelected(t, env, webhook.ID, unlisted.ID)
-	assert.Equal(t, []string{"36h"}, selected)
-	assert.Regexp(
-		t,
-		`<select id="expiry" name="expiry" class="input">\s*`+
-			`<option value="36h" selected>36h</option>\s*`+
-			`<option value="never">never</option>`,
-		page,
-	)
-	assert.Contains(t, page, `<option value="8760h">365d</option>`)
-
-	form := url.Values{}
-	form.Set("name", unlisted.Name)
-	form.Set("expiry", "36h")
-
-	w := submitTargetEdit(env, webhook.ID, unlisted.ID, form)
-	require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-	assert.JSONEq(
-		t, `{"expiry":"36h"}`, storedTarget(t, env, unlisted.ID).Config,
-	)
-}

internal/handlers/archive_rotation.go

@@ -1,42 +0,0 @@
-package handlers
-
-const (
-	// archiveRotationNone is the archive rotation that keeps a
-	// database target's archive in one file. A stored empty rotation
-	// means the same.
-	archiveRotationNone = "none"
-
-	// tmplKeyArchiveRotationChoices is the template data key for the
-	// entries of a page's archive rotation select.
-	tmplKeyArchiveRotationChoices = "ArchiveRotationChoices"
-)
-
-// archiveRotationChoices lists the archive rotations offered by the
-// new webhook page, the add target form and the target edit form.
-func archiveRotationChoices() []archiveChoice {
-	return []archiveChoice{
-		{Value: archiveRotationNone, Label: archiveRotationNone},
-		{Value: "monthly", Label: "monthly"},
-		{Value: "daily", Label: "daily"},
-		{Value: "hourly", Label: "hourly"},
-	}
-}
-
-// archiveRotationOptions returns the choices with rotation selected;
-// an empty rotation, or one that is not a choice, selects none. A
-// stored rotation is always a choice: the forms refuse any other.
-func archiveRotationOptions(rotation string) []archiveChoice {
-	options := archiveRotationChoices()
-
-	for i := range options {
-		if options[i].Value == rotation {
-			options[i].Selected = true
-
-			return options
-		}
-	}
-
-	options[0].Selected = true
-
-	return options
-}

internal/handlers/archive_rotation_test.go

@@ -1,229 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
-)
-
-// rotationNone is the archive rotation that keeps one file.
-const rotationNone = "none"
-
-// rotationShown returns the archive rotations the webhook page's
-// target list shows.
-func rotationShown(
-	t *testing.T, env *sourceTestEnv, webhookID string,
-) []string {
-	t.Helper()
-
-	return matched(
-		`Archive Rotation:</span>\s*<span>([^<]*)</span>`,
-		renderedPage(t, env, webhookID),
-	)
-}
-
-// TestArchiveRotationChoices adds a database target with each archive
-// rotation the forms offer, and checks that it is stored as chosen,
-// shown in the target list, and that the target edit form starts on
-// it. It then edits the target to hourly, keeping its expiry.
-func TestArchiveRotationChoices(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	for _, rotation := range []string{rotationNone, "monthly", "daily", "hourly"} {
-		t.Run(rotation, func(t *testing.T) {
-			t.Parallel()
-
-			webhook := seedWebhookWithRetention(t, env.db, 30)
-
-			form := url.Values{}
-			form.Set("name", "archive")
-			form.Set("type", string(database.TargetTypeDatabase))
-			form.Set("expiry", "720h")
-			form.Set("rotation", rotation)
-
-			w := serveTarget(
-				env, http.MethodPost, "/hook/"+webhook.ID+"/targets", form,
-			)
-			require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-
-			targets := targetsForWebhook(t, env.db, webhook.ID)
-			require.Len(t, targets, 1)
-			assert.JSONEq(t,
-				`{"expiry":"720h","rotation":"`+rotation+`"}`,
-				targets[0].Config,
-			)
-
-			assert.Equal(t,
-				[]string{rotation}, rotationShown(t, env, webhook.ID))
-
-			page := targetEditPage(t, env, webhook.ID, targets[0].ID)
-			assert.Equal(t, []string{rotation}, selectedIn(page, "rotation"))
-
-			form = url.Values{}
-			form.Set("name", "archive")
-			form.Set("expiry", "720h")
-			form.Set("rotation", "hourly")
-
-			w = submitTargetEdit(env, webhook.ID, targets[0].ID, form)
-			require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-			assert.JSONEq(t,
-				`{"expiry":"720h","rotation":"hourly"}`,
-				storedTarget(t, env, targets[0].ID).Config,
-			)
-		})
-	}
-}
-
-// TestArchiveRotationEditStartsOnNone checks the edit form of a
-// database target with no rotation stored starts on none.
-func TestArchiveRotationEditStartsOnNone(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	webhook := seedWebhookWithRetention(t, env.db, 30)
-	target := seedConfiguredTarget(
-		t, env.db, webhook.ID, database.TargetTypeDatabase, "",
-	)
-
-	page := targetEditPage(t, env, webhook.ID, target.ID)
-	assert.Equal(t, []string{rotationNone}, selectedIn(page, "rotation"))
-	assert.Equal(t, []string{rotationNone}, rotationShown(t, env, webhook.ID))
-}
-
-// TestArchiveRotationRefused proves a rotation that is not one of the
-// four is refused on the add target form and the target edit form, and
-// that nothing is stored.
-func TestArchiveRotationRefused(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	webhook := seedWebhookWithRetention(t, env.db, 30)
-
-	form := url.Values{}
-	form.Set("name", "archive")
-	form.Set("type", string(database.TargetTypeDatabase))
-	form.Set("rotation", "weekly")
-
-	w := serveTarget(
-		env, http.MethodPost, "/hook/"+webhook.ID+"/targets", form,
-	)
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-	assert.Contains(t, w.Body.String(), "Invalid archive rotation")
-	assert.Empty(t, targetsForWebhook(t, env.db, webhook.ID))
-
-	target := seedConfiguredTarget(
-		t, env.db, webhook.ID, database.TargetTypeDatabase,
-		`{"rotation":"daily"}`,
-	)
-
-	form.Del("type")
-
-	w = submitTargetEdit(env, webhook.ID, target.ID, form)
-	assert.Equal(t, http.StatusBadRequest, w.Code)
-	assert.Contains(t, w.Body.String(), "Invalid archive rotation")
-	assert.JSONEq(t,
-		`{"rotation":"daily"}`, storedTarget(t, env, target.ID).Config,
-	)
-}
-
-// TestHandleSourceCreateSubmit_ArchiveRotation proves the new webhook
-// page's archive rotation is stored on the archive target it creates.
-func TestHandleSourceCreateSubmit_ArchiveRotation(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	form := url.Values{}
-	form.Set("name", "rotated")
-	form.Set("archive", "on")
-	form.Set("archive_expiry", "720h")
-	form.Set("archive_rotation", "daily")
-
-	w := submitCreateForm(env, form)
-	require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-
-	var webhook database.Webhook
-
-	require.NoError(t, env.db.DB().
-		Where("name = ?", "rotated").First(&webhook).Error)
-
-	targets := targetsForWebhook(t, env.db, webhook.ID)
-	require.Len(t, targets, 1)
-	assert.JSONEq(t,
-		`{"expiry":"720h","rotation":"daily"}`, targets[0].Config,
-	)
-}
-
-// TestArchiveFileView_Rotated describes a daily target's archive files
-// at two times. On a day that has a file, the view names that file;
-// on the next, before any event, it names the file the next event
-// will go to, not created yet. Both times the size is of every file
-// together and the last write the latest of them.
-func TestArchiveFileView_Rotated(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	webhook := seedWebhookWithRetention(t, env.db, 30)
-	target := seedConfiguredTarget(
-		t, env.db, webhook.ID, database.TargetTypeDatabase,
-		`{"rotation":"daily"}`,
-	)
-
-	path := delivery.ArchivePath(env.dbMgr, &webhook, target)
-	stem := strings.TrimSuffix(path, ".db")
-	written := time.Date(2026, 10, 2, 9, 0, 0, 0, time.UTC)
-
-	for i, day := range []string{"2026-10-01", "2026-10-02"} {
-		file := stem + "-" + day + ".db"
-		require.NoError(t, os.WriteFile(file, make([]byte, 1000), 0o600))
-
-		at := written.Add(time.Duration(i-1) * 24 * time.Hour)
-		require.NoError(t, os.Chtimes(file, at, at))
-	}
-
-	view := env.handlers.ArchiveFileViewForTest(
-		&webhook, target, time.Date(2026, 10, 2, 23, 0, 0, 0, time.UTC),
-	)
-	assert.Equal(t, filepath.Base(stem)+"-2026-10-02.db", view.Name)
-	assert.Empty(t, view.Note)
-	assert.Equal(t, 2, view.Files)
-	assert.Equal(t, "2.0 kB", view.Size)
-	assert.Equal(t, "2026-10-02 09:00:00 UTC", view.WrittenUTC)
-
-	view = env.handlers.ArchiveFileViewForTest(
-		&webhook, target, time.Date(2026, 10, 3, 0, 0, 0, 0, time.UTC),
-	)
-	assert.Equal(t, filepath.Base(stem)+"-2026-10-03.db", view.Name)
-	assert.Equal(t, "not created yet", view.Note)
-	assert.Equal(t, 2, view.Files)
-	assert.Equal(t, "2.0 kB", view.Size)
-
-	page := targetList(t, renderedPage(t, env, webhook.ID))
-	assert.Contains(t, page, "Archive Size: 2.0 kB in 2 files")
-}
-
-// renderedPage returns the webhook page.
-func renderedPage(t *testing.T, env *sourceTestEnv, webhookID string) string {
-	t.Helper()
-
-	w := httptest.NewRecorder()
-	env.handlers.HandleSourceDetail().ServeHTTP(w, getRequest(
-		t, "/hook/"+webhookID, env.cookies,
-		map[string]string{sourceIDParam: webhookID},
-	))
-	require.Equal(t, http.StatusOK, w.Code)
-
-	return w.Body.String()
-}

internal/handlers/delivery_attempts_test.go

@@ -1,89 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm/clause"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestDeliveryAttempts_ReadInTheTargetTypesOwnTerms proves, on the
-// event's page and in the event log, that an http or slack attempt
-// shows its status as before, while a database or log attempt, which
-// sends no HTTP request, says what it did and shows no status.
-func TestDeliveryAttempts_ReadInTheTargetTypesOwnTerms(t *testing.T) {
-	t.Parallel()
-
-	cases := []struct {
-		targetType database.TargetType
-		success    bool
-		statusCode int
-		errText    string
-		outcome    string
-		status     string // "" when the attempt must show no status
-	}{
-		{
-			database.TargetTypeHTTP, false, 0, "",
-			"failure", "Status: — (no response)",
-		},
-		{
-			database.TargetTypeSlack, true, http.StatusOK, "",
-			"success", "Status: 200",
-		},
-		{database.TargetTypeDatabase, true, 0, "", "archived", ""},
-		{
-			database.TargetTypeDatabase, false, 0,
-			"opening archive database: disk full", "failure", "",
-		},
-		{database.TargetTypeLog, true, 0, "", "written to the log", ""},
-	}
-
-	for _, tc := range cases {
-		t.Run(string(tc.targetType), func(t *testing.T) {
-			t.Parallel()
-
-			f := newRecentEventsFixture(t)
-			target := seedTarget(t, f.db, f.webhook.ID, tc.targetType)
-			event := f.event(t, contentTypeJSON, "{}", time.Now())
-			dlv := f.delivery(
-				t, event, target.ID, database.DeliveryStatusDelivered,
-			)
-
-			require.NoError(t, f.webhookDB.Omit(clause.Associations).Create(
-				&database.DeliveryResult{
-					DeliveryID: dlv.ID,
-					AttemptNum: 1,
-					Success:    tc.success,
-					StatusCode: tc.statusCode,
-					Error:      tc.errText,
-				},
-			).Error)
-
-			w := serveEventPage(t, f.h, f.sess, f.webhook.ID, event.ID)
-			require.Equal(t, http.StatusOK, w.Code)
-
-			pages := []string{
-				w.Body.String(),
-				renderSourceLogsPage(t, f.h, f.sess, f.webhook.ID),
-			}
-
-			for _, page := range pages {
-				assert.Contains(t, page, ">"+tc.outcome+"</span>")
-
-				if tc.errText != "" {
-					assert.Contains(t, page, "Error: "+tc.errText)
-				}
-
-				if tc.status == "" {
-					assert.NotContains(t, page, "Status:")
-				} else {
-					assert.Contains(t, page, tc.status)
-				}
-			}
-		})
-	}
-}

internal/handlers/delivery_replay.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"net/http"
+	"strconv"
 
 	"github.com/go-chi/chi"
 	"gorm.io/gorm"
@@ -20,9 +21,7 @@ const (
 	// replayTargetDeleted reports a target that once existed and has
 	// since been deleted. Deletes are soft and deliveries carry no
 	// foreign key to the target row, so the history survives its
-	// target and this is the ordinary case for an old event. The
+	// target and this is the ordinary case for an old event.
-	// event log shows no Replay button for such a delivery, so only
-	// a page loaded before the delete reaches this.
 	replayTargetDeleted noticeCode = "replay-target-deleted"
 
 	// replayTargetMissing reports a target id that names no row at
@@ -282,7 +281,6 @@ func createReplayDelivery(
 		EventID:  event.ID,
 		TargetID: target.ID,
 		Status:   database.DeliveryStatusPending,
-		Replay:   true,
 	}
 
 	err := webhookDB.Transaction(func(tx *gorm.DB) error {
@@ -329,15 +327,24 @@ func replayBody(body string) *string {
 }
 
 // redirectToEventLog redirects a replay or resubmit back to the event
-// log it was triggered from, carrying the outcome as its notice.
+// log it was triggered from, carrying the outcome as its notice and
+// the page number the form submitted.
 func redirectToEventLog(
 	w http.ResponseWriter,
 	r *http.Request,
 	webhook database.Webhook,
 	code noticeCode,
 ) {
-	http.Redirect(
+	dest := withNotice("/hook/"+webhook.ID+"/events", code)
-		w, r, withNotice("/hook/"+webhook.ID+"/events", code),
+
-		http.StatusSeeOther,
+	// The page is read from the form rather than the query string:
-	)
+	// this is a POST, and its query string is what logs and Referer
+	// headers record.
+	if page := pageOrFirst(
+		r.PostFormValue("page"),
+	); page > 1 {
+		dest += "&page=" + strconv.Itoa(page)
+	}
+
+	http.Redirect(w, r, dest, http.StatusSeeOther)
 }

internal/handlers/delivery_replay_test.go

@@ -3,7 +3,6 @@ package handlers_test
 import (
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -514,11 +513,7 @@ func TestHandleSourceLogs_RendersReplayControlAndBanner(t *testing.T) {
 	)
 
 	assert.Contains(t, refused, "alert-error")
-	assert.Contains(
+	assert.Contains(t, refused, "has been deleted")
-		t, refused,
-		"has been deleted. Use Resubmit to send the event "+
-			"to the webhook",
-	)
 
 	// An outcome code nobody issued renders no banner at all.
 	unknown := renderSourceLogsPageWithQuery(
@@ -529,58 +524,3 @@ func TestHandleSourceLogs_RendersReplayControlAndBanner(t *testing.T) {
 	assert.NotContains(t, unknown, "alert-success")
 	assert.NotContains(t, unknown, "made-up")
 }
-
-// TestHandleDeliveryReplay_LabelsTheReplay proves a delivery created
-// by Replay is labelled as a replay in the event's summary line in the
-// event log, and in the list of the event's deliveries there and on
-// the event's page, while the delivery it repeats is not.
-func TestHandleDeliveryReplay_LabelsTheReplay(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 := seedWebhook(t, db)
-	tgt := seedConfiguredTarget(
-		t, db, wh.ID, database.TargetTypeHTTP,
-		`{"url":"`+replayTargetURL+`"}`,
-	)
-
-	event, original := seedFailedDelivery(t, dbMgr, wh.ID, tgt.ID)
-
-	w := postReplay(t, h, sess, wh.ID, original.ID)
-	require.Equal(t, http.StatusSeeOther, w.Code)
-
-	eventLog := renderSourceLogsPage(t, h, sess, wh.ID)
-
-	assert.Contains(t, eventLog, tgt.Name+": failed")
-	assert.Contains(t, eventLog, tgt.Name+" (replay): pending")
-
-	w = serveEventPage(t, h, sess, wh.ID, event.ID)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	// In each delivery list a row names the target, then the label if
-	// it is a replay, then its status: the replay is still pending, the
-	// original failed.
-	replayRow := tgt.Name + `</span> ` +
-		`<span class="text-xs text-gray-500">replay</span> ` +
-		`<span class="text-xs text-gray-400">pending</span>`
-	originalRow := tgt.Name + `</span> ` +
-		`<span class="text-xs text-red-600">failed</span>`
-
-	for _, page := range []string{eventLog, w.Body.String()} {
-		page = strings.Join(strings.Fields(page), " ")
-
-		assert.Contains(t, page, replayRow)
-		assert.Contains(t, page, originalRow)
-	}
-}

internal/handlers/delivery_result_view.go

@@ -1,9 +1,6 @@
 package handlers
 
 import (
-	"time"
-
-	"github.com/dustin/go-humanize"
 	"sneak.berlin/go/webhooker/internal/delivery"
 )
 
@@ -27,8 +24,8 @@ const maxRenderedResponseBytes = 4096
 // bytes rather than characters, and they make SQLite do the
 // cut, so an oversized stored response never becomes a Go
 // string at all.
-const deliveryResultColumns = "delivery_id, attempt_num, created_at, " +
+const deliveryResultColumns = "delivery_id, attempt_num, success, " +
-	"success, status_code, error, duration, " +
+	"status_code, error, duration, " +
 	"substr(cast(response_body as blob), 1, ?) AS response_body, " +
 	"length(cast(response_body as blob)) AS response_bytes"
 
@@ -48,11 +45,6 @@ type DeliveryResultView struct {
 	AttemptNum int
 	Success    bool
 
-	// Ran is how long ago the attempt was recorded, and RanUTC the
-	// full timestamp the page shows on hover.
-	Ran    string
-	RanUTC string
-
 	// StatusCode is 0 when the attempt never got a response,
 	// which is why the page asks HasStatusCode rather than
 	// printing the number.
@@ -108,7 +100,6 @@ func (v DeliveryResultView) HasStatusCode() bool {
 type deliveryResultRow struct {
 	DeliveryID    string
 	AttemptNum    int
-	CreatedAt     time.Time
 	Success       bool
 	StatusCode    int
 	Error         string
@@ -166,8 +157,6 @@ func (r *deliveryResultRow) view(
 	return DeliveryResultView{
 		AttemptNum:         r.AttemptNum,
 		Success:            r.Success,
-		Ran:                humanize.Time(r.CreatedAt),
-		RanUTC:             r.CreatedAt.UTC().Format(time.DateTime) + " UTC",
 		StatusCode:         r.StatusCode,
 		Error:              redactor.Redact(r.Error),
 		DurationMS:         r.Duration,

internal/handlers/delivery_result_view_test.go

@@ -435,7 +435,9 @@ func TestHandleSourceLogs_BoundsRenderedAttempts(t *testing.T) {
 		}).Error)
 	}
 
-	views := h.LoadEventLogViewsForTest(httptest.NewRecorder(), *wh)
+	views := h.LoadEventLogViewsForTest(
+		httptest.NewRecorder(), *wh, 1,
+	)
 	require.Len(t, views, 1)
 	require.Len(t, views[0].Deliveries, 1)
 
@@ -487,7 +489,9 @@ func TestHandleSourceLogs_BoundsOversizeResponse(t *testing.T) {
 	stored := strings.Repeat("A", responseCap*4) + tail
 	seedFailedDeliveryWithResponse(t, dbMgr, wh.ID, tgt.ID, stored)
 
-	views := h.LoadEventLogViewsForTest(httptest.NewRecorder(), *wh)
+	views := h.LoadEventLogViewsForTest(
+		httptest.NewRecorder(), *wh, 1,
+	)
 	require.Len(t, views, 1)
 	require.Len(t, views[0].Deliveries, 1)
 	require.Len(t, views[0].Deliveries[0].Results, 1)

internal/handlers/entrypoint_toggle_test.go

@@ -1,95 +0,0 @@
-package handlers_test
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/go-chi/chi"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestHandleEntrypointToggle_DoesNotUndoAnEdit proves that a toggle
-// which loaded the entrypoint before an edit of its description was
-// saved does not write the old description back over the edit. The
-// edit is submitted from a callback on the toggle's own read of the
-// entrypoint, so it is saved after that read and before the toggle
-// writes.
-func TestHandleEntrypointToggle_DoesNotUndoAnEdit(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 30)
-	ep := seedEntrypoint(t, env.db, wh.ID)
-	require.True(t, ep.Active)
-
-	router := chi.NewRouter()
-	router.Post(
-		"/hook/{sourceID}/entrypoints/{entrypointID}/edit",
-		env.handlers.HandleEntrypointEdit(),
-	)
-	router.Post(
-		"/hook/{sourceID}/entrypoints/{entrypointID}/toggle",
-		env.handlers.HandleEntrypointToggle(),
-	)
-
-	// post submits one of the entrypoint's forms as the test user and
-	// returns the response's status code.
-	post := func(action string, form url.Values) int {
-		req := httptest.NewRequestWithContext(
-			context.Background(), http.MethodPost,
-			"/hook/"+wh.ID+"/entrypoints/"+ep.ID+"/"+action,
-			strings.NewReader(form.Encode()),
-		)
-		req.Header.Set(
-			"Content-Type", "application/x-www-form-urlencoded",
-		)
-
-		for _, c := range env.cookies {
-			req.AddCookie(c)
-		}
-
-		w := httptest.NewRecorder()
-		router.ServeHTTP(w, req)
-
-		return w.Code
-	}
-
-	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) {
-			// Only the first read of an entrypoint, the toggle's,
-			// submits the edit.
-			if tx.Statement.Table != "entrypoints" || edited {
-				return
-			}
-
-			edited = true
-			editCode = post(
-				"edit", url.Values{"description": {"Billing sender"}},
-			)
-		}),
-	)
-
-	require.Equal(t, http.StatusSeeOther, post("toggle", nil))
-	require.Equal(t, http.StatusSeeOther, editCode)
-
-	var stored database.Entrypoint
-
-	require.NoError(
-		t, env.db.DB().First(&stored, "id = ?", ep.ID).Error,
-	)
-	assert.False(t, stored.Active)
-	assert.Equal(t, "Billing sender", stored.Description)
-}

internal/handlers/entrypoint_view.go

@@ -1,11 +1,6 @@
 package handlers
 
 import (
-	"fmt"
-	"time"
-
-	"github.com/dustin/go-humanize"
-	"gorm.io/gorm"
 	"sneak.berlin/go/webhooker/internal/database"
 )
 
@@ -16,21 +11,6 @@ type EntrypointView struct {
 	Path        string
 	Description string
 	Active      bool
-
-	// Events is how many events arrived on the entrypoint's URL within
-	// the webhook's retention period. LastEvent is when the newest
-	// event ever to arrive on it did, relative, and LastEventUTC the
-	// full time; both are empty when none ever did.
-	Events       int64
-	LastEvent    string
-	LastEventUTC string
-}
-
-// entrypointEvents is one entrypoint's count read by
-// addEntrypointEvents.
-type entrypointEvents struct {
-	EntrypointID string
-	Events       int64
 }
 
 // NewEntrypointViews projects entrypoints for rendering.
@@ -52,60 +32,3 @@ func NewEntrypointViews(
 
 	return views
 }
-
-// addEntrypointEvents fills in each view's event figures from the
-// webhook's event database: when the last event arrived on its URL,
-// from its EntrypointTotals row, and how many events arrived on it
-// since the webhook's retention cutoff, counted in one query over the
-// events' entrypoint_id index. Resubmitted copies did not arrive on
-// the URL and are left out of both.
-func addEntrypointEvents(
-	webhookDB *gorm.DB,
-	webhook *database.Webhook,
-	views []EntrypointView,
-	now time.Time,
-) error {
-	ids := make([]string, len(views))
-	byID := make(map[string]*EntrypointView, len(views))
-
-	for i := range views {
-		ids[i] = views[i].ID
-		byID[views[i].ID] = &views[i]
-	}
-
-	var totals []database.EntrypointTotals
-
-	err := webhookDB.Where("entrypoint_id IN ?", ids).Find(&totals).Error
-	if err != nil {
-		return fmt.Errorf("reading entrypoint totals: %w", err)
-	}
-
-	query := webhookDB.Model(&database.Event{}).
-		Select("entrypoint_id, count(*) AS events").
-		Where("entrypoint_id IN ? AND resubmitted_from_id IS NULL", ids)
-
-	cutoff, finite := webhook.RetentionCutoff(now)
-	if finite {
-		query = query.Where("created_at >= ?", cutoff)
-	}
-
-	var counts []entrypointEvents
-
-	err = query.Group("entrypoint_id").Find(&counts).Error
-	if err != nil {
-		return fmt.Errorf("counting events by entrypoint: %w", err)
-	}
-
-	for _, row := range totals {
-		view := byID[row.EntrypointID]
-		view.LastEvent = humanize.Time(row.LastEventAt)
-		view.LastEventUTC =
-			row.LastEventAt.UTC().Format(time.DateTime) + " UTC"
-	}
-
-	for _, row := range counts {
-		byID[row.EntrypointID].Events = row.Events
-	}
-
-	return nil
-}

internal/handlers/entrypoint_view_test.go

@@ -1,197 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"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"
-)
-
-// entrypointRow returns the part of a rendered webhook page from an
-// entrypoint's URL to the next entrypoint's, which holds its figures.
-func entrypointRow(t *testing.T, page, entrypointID string) string {
-	t.Helper()
-
-	_, row, found := strings.Cut(page, `id="entrypoint-url-`+entrypointID+`"`)
-	require.True(t, found)
-
-	row, _, _ = strings.Cut(row, `id="entrypoint-url-`)
-
-	return row
-}
-
-// lastEventShown matches an entrypoint row's last event arriving at at.
-func lastEventShown(at time.Time) string {
-	return `Last Event:</span>\s*<span title="` +
-		at.UTC().Format(time.DateTime) + ` UTC">[^<]+</span>`
-}
-
-// eventsShown matches an entrypoint row's count of n events.
-func eventsShown(n int) string {
-	return `Events Within Retention:</span>\s*<span>` +
-		strconv.Itoa(n) + `</span>`
-}
-
-// TestHandleSourceDetail_ShowsEntrypointEvents proves each entrypoint
-// on the webhook page shows its own figures: how many events arrived
-// through it within the webhook's retention period, leaving out one
-// older than that, and when the newest arrived, or "never" for an
-// entrypoint with none.
-func TestHandleSourceDetail_ShowsEntrypointEvents(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 := &database.Webhook{
-		UserID: deleteTestUserID, Name: "figures", RetentionDays: 7,
-	}
-	require.NoError(t, db.DB().Omit(clause.Associations).Create(wh).Error)
-
-	webhookDB, err := dbMgr.GetDB(wh.ID)
-	require.NoError(t, err)
-
-	entrypoint := func() *database.Entrypoint {
-		ep := &database.Entrypoint{
-			WebhookID: wh.ID, Path: uuid.New().String(), Active: true,
-		}
-		require.NoError(t,
-			db.DB().Omit(clause.Associations).Create(ep).Error)
-
-		return ep
-	}
-
-	// event stores an event that arrived on ep's URL age ago and
-	// records it as ep's last event, as the receiver does.
-	event := func(ep *database.Entrypoint, age time.Duration) time.Time {
-		e := &database.Event{
-			WebhookID:    wh.ID,
-			EntrypointID: ep.ID,
-			Method:       http.MethodPost,
-		}
-		e.CreatedAt = time.Now().Add(-age)
-		require.NoError(t,
-			webhookDB.Omit(clause.Associations).Create(e).Error)
-		require.NoError(t, database.AddEntrypointTotals(webhookDB,
-			database.EntrypointTotals{
-				EntrypointID: ep.ID, LastEventAt: e.CreatedAt,
-			}))
-
-		return e.CreatedAt
-	}
-
-	busy, quiet, unused := entrypoint(), entrypoint(), entrypoint()
-
-	event(busy, 8*24*time.Hour) // older than the 7 days kept
-	event(busy, 3*time.Hour)
-	busyLast := event(busy, time.Hour)
-	quietLast := event(quiet, 2*24*time.Hour)
-
-	body := renderSourceDetailPage(t, h, sess, wh.ID)
-
-	assert.Regexp(t, lastEventShown(busyLast), entrypointRow(t, body, busy.ID))
-	assert.Regexp(t, eventsShown(2), entrypointRow(t, body, busy.ID))
-	assert.Regexp(t, lastEventShown(quietLast), entrypointRow(t, body, quiet.ID))
-	assert.Regexp(t, eventsShown(1), entrypointRow(t, body, quiet.ID))
-	assert.Regexp(t, `Last Event:</span>\s*<span>never</span>`,
-		entrypointRow(t, body, unused.ID))
-	assert.Regexp(t, eventsShown(0), entrypointRow(t, body, unused.ID))
-}
-
-// TestHandleSourceDetail_EntrypointLastEventSurvivesRetention checks
-// that once retention has removed every event that arrived on an
-// entrypoint's URL, the entrypoint still shows when the last one
-// arrived rather than "never".
-func TestHandleSourceDetail_EntrypointLastEventSurvivesRetention(
-	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: "swept", RetentionDays: 1,
-	}
-	require.NoError(t, db.DB().Omit(clause.Associations).Create(wh).Error)
-
-	ep := seedEntrypoint(t, db, wh.ID)
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, ep.Path, 1)
-	arrived := events[0].CreatedAt
-
-	statsAge(t, webhookDB, events[0].ID, time.Now().Add(-50*time.Hour))
-	statsPrune(t, db, dbMgr, log, webhookDB)
-	require.Empty(t, listEvents(t, webhookDB))
-
-	row := entrypointRow(t, renderSourceDetailPage(t, h, sess, wh.ID), ep.ID)
-	assert.Regexp(t, lastEventShown(arrived), row)
-	assert.Regexp(t, eventsShown(0), row)
-}
-
-// TestHandleSourceDetail_ResubmitLeavesEntrypointFigures checks that a
-// resubmitted copy, which did not arrive on the entrypoint's URL,
-// changes neither the entrypoint's last event nor its count.
-func TestHandleSourceDetail_ResubmitLeavesEntrypointFigures(
-	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 := seedWebhook(t, db)
-	ep := seedEntrypoint(t, db, wh.ID)
-	webhookDB, events := receiveEvents(t, h, dbMgr, wh.ID, ep.Path, 1)
-	arrived := events[0].CreatedAt
-
-	require.Equal(t, http.StatusSeeOther,
-		postResubmit(t, h, sess, wh.ID, events[0].ID).Code)
-	require.Len(t, listEvents(t, webhookDB), 2)
-
-	var totals database.EntrypointTotals
-
-	require.NoError(t, webhookDB.Take(&totals).Error)
-	assert.True(t, arrived.Equal(totals.LastEventAt))
-
-	row := entrypointRow(t, renderSourceDetailPage(t, h, sess, wh.ID), ep.ID)
-	assert.Regexp(t, lastEventShown(arrived), row)
-	assert.Regexp(t, eventsShown(1), row)
-}

internal/handlers/event_body.go

@@ -15,19 +15,16 @@ 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"
 
-// HandleEventBodyDownload serves one event's stored body byte
+// HandleEventBodyDownload serves one event's stored body in
-// for byte, which the pages do not: they show it as escaped
+// full, which the event log page cannot: it caps each rendered
-// text, cut at maxRenderedBodyBytes in the lists of events, and
+// body at maxRenderedBodyBytes.
-// leave a binary one out.
 //
 // The bytes are attacker-supplied — anyone who can reach the
 // public receiver chooses them — and this route hands them back

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_body_view.go

@@ -1,168 +0,0 @@
-package handlers
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"io"
-	"unicode"
-	"unicode/utf8"
-)
-
-// maxRenderedBodyBytes is the most of one event's body that the
-// recent events on a webhook's page and the event log show; a larger
-// body is cut there and shown whole only on the event's own page.
-// Bodies come from the unauthenticated receiver under its 1 MB cap,
-// and renderTemplate buffers a whole page before writing it, so a list
-// of events cannot show every body whole.
-const maxRenderedBodyBytes = 32 << 10
-
-// maxInlineBodyLines is the most lines a body is shown at its full
-// height with. A body with more lines, or larger than
-// maxRenderedBodyBytes, is shown in a box of fixed height that
-// scrolls, so that it does not make the page huge.
-const maxInlineBodyLines = 200
-
-// maxIndentDepth is how deeply a JSON body's objects and arrays may
-// nest for it to be indented at all; a deeper one is shown as received.
-// Each level indents every line inside it two more spaces, so 10 KB of
-// nested brackets would indent to some 50 MB; within this depth a body
-// grows at most 35 times.
-const maxIndentDepth = 16
-
-// A JSON body is shown pretty-printed only when that makes it at most
-// maxIndentGrowth times its size plus indentAllowance bytes, and
-// otherwise as received, so that indenting does not undo
-// maxRenderedBodyBytes. The allowance keeps a small nested body
-// pretty-printed.
-const (
-	maxIndentGrowth = 4
-	indentAllowance = 1 << 10
-)
-
-// jsonIndent is the indent of a pretty-printed JSON body.
-const jsonIndent = "  "
-
-// BodyView is an event's body as the pages show it. newBodyView
-// decides it and templates/event_body.html shows it, the same way in
-// the recent events on a webhook's page, in the event log and on the
-// event's own page.
-type BodyView struct {
-	// EventURL is the event's own page. The stored body downloads
-	// from EventURL/body.
-	EventURL string
-
-	// Text is the body as shown, pretty-printed when it is JSON.
-	Text string
-
-	// Size is the stored body's size in bytes, and ShownBytes how
-	// many of them Text holds when Cut.
-	Size       int64
-	ShownBytes int
-
-	// Cut reports that Text is only the start of the body.
-	Cut bool
-
-	// Binary reports a body that is not text. It is not shown.
-	Binary bool
-
-	// Scroll reports a body to show in a box that scrolls.
-	Scroll bool
-}
-
-// newBodyView decides how to show an event's body. body is the
-// stored body, or its first maxRenderedBodyBytes when only those were
-// read, and size is the stored body's size.
-func newBodyView(eventURL string, body []byte, size int64) BodyView {
-	v := BodyView{EventURL: eventURL, Size: size}
-
-	if size > int64(len(body)) {
-		v.Cut = true
-		body = trimPartialRune(body)
-		v.ShownBytes = len(body)
-	}
-
-	// html/template shows invalid UTF-8 as replacement characters,
-	// and a browser shows a control character other than tab, line
-	// feed and carriage return as a box or not at all, so a body
-	// holding either is not text.
-	isControl := func(r rune) bool {
-		return unicode.IsControl(r) && r != '\t' && r != '\n' && r != '\r'
-	}
-
-	if !utf8.Valid(body) || bytes.IndexFunc(body, isControl) >= 0 {
-		v.Binary = true
-
-		return v
-	}
-
-	// A cut JSON document is no longer valid JSON.
-	if !v.Cut {
-		body = indentJSON(body)
-	}
-
-	// The page shows a carriage return, a line feed, or the two
-	// together as one line break. A final one ends the last line
-	// rather than starting another.
-	text := bytes.TrimSuffix(body, []byte("\n"))
-	text = bytes.TrimSuffix(text, []byte("\r"))
-	breaks := bytes.Count(text, []byte("\n")) + bytes.Count(text, []byte("\r")) -
-		bytes.Count(text, []byte("\r\n"))
-	lines := breaks + 1
-
-	v.Text = string(body)
-	v.Scroll = lines > maxInlineBodyLines || size > maxRenderedBodyBytes
-
-	return v
-}
-
-// indentJSON returns body pretty-printed when it is a JSON document,
-// and unchanged when it is not, nests deeper than maxIndentDepth, or
-// would grow past maxIndentGrowth times its size plus indentAllowance
-// bytes.
-func indentJSON(body []byte) []byte {
-	if !json.Valid(body) || !indentFits(body) {
-		return body
-	}
-
-	var out bytes.Buffer
-
-	err := json.Indent(&out, body, "", jsonIndent)
-	if err != nil || out.Len() > maxIndentGrowth*len(body)+indentAllowance {
-		return body
-	}
-
-	return out.Bytes()
-}
-
-// indentFits reports whether the objects and arrays of the JSON
-// document body nest at most maxIndentDepth deep.
-func indentFits(body []byte) bool {
-	depth := 0
-
-	dec := json.NewDecoder(bytes.NewReader(body))
-
-	// A number too large for a float64 is still valid JSON.
-	dec.UseNumber()
-
-	for {
-		tok, err := dec.Token()
-		if errors.Is(err, io.EOF) {
-			return true
-		}
-
-		if err != nil {
-			return false
-		}
-
-		switch tok {
-		case json.Delim('{'), json.Delim('['):
-			depth++
-			if depth > maxIndentDepth {
-				return false
-			}
-		case json.Delim('}'), json.Delim(']'):
-			depth--
-		}
-	}
-}

internal/handlers/event_body_view_test.go

@@ -1,176 +0,0 @@
-package handlers_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"sneak.berlin/go/webhooker/internal/handlers"
-)
-
-// bodyView is how the pages would show body, stored whole.
-func bodyView(body string) handlers.BodyView {
-	return handlers.NewBodyViewForTest([]byte(body), int64(len(body)))
-}
-
-// lines is n lines of text, without a newline after the last.
-func lines(n int) string {
-	return strings.TrimSuffix(strings.Repeat("line\n", n), "\n")
-}
-
-// TestNewBodyView_FormatsValidJSON proves a JSON body is shown
-// pretty-printed, whatever its content type, with its keys in
-// the order they arrived.
-func TestNewBodyView_FormatsValidJSON(t *testing.T) {
-	t.Parallel()
-
-	v := bodyView(`{"b":1,"a":[true,null,"x"],"c":{}}`)
-
-	assert.Equal(t, []string{
-		`{`,
-		`  "b": 1,`,
-		`  "a": [`,
-		`    true,`,
-		`    null,`,
-		`    "x"`,
-		`  ],`,
-		`  "c": {}`,
-		`}`,
-	}, strings.Split(v.Text, "\n"))
-	assert.False(t, v.Scroll)
-}
-
-// TestNewBodyView_FormatsNestedJSON proves a small document with a
-// few levels of nesting is pretty-printed.
-func TestNewBodyView_FormatsNestedJSON(t *testing.T) {
-	t.Parallel()
-
-	v := bodyView(`{"data":[[1,2,3],[4,5,6]]}`)
-
-	assert.Equal(t, []string{
-		`{`,
-		`  "data": [`,
-		`    [`,
-		`      1,`,
-		`      2,`,
-		`      3`,
-		`    ],`,
-		`    [`,
-		`      4,`,
-		`      5,`,
-		`      6`,
-		`    ]`,
-		`  ]`,
-		`}`,
-	}, strings.Split(v.Text, "\n"))
-}
-
-// TestNewBodyView_InvalidJSONAsReceived proves a body that is not
-// a JSON document is shown exactly as it arrived.
-func TestNewBodyView_InvalidJSONAsReceived(t *testing.T) {
-	t.Parallel()
-
-	for _, body := range []string{
-		`{"a":1,`,
-		`{"a":1} {"b":2}`,
-		"plain text\n  indented",
-	} {
-		assert.Equal(t, body, bodyView(body).Text)
-	}
-}
-
-// TestNewBodyView_DeepJSONAsReceived proves a JSON body nested
-// more than 16 levels deep is shown as it arrived. 10 KB of nested
-// arrays would indent to some 50 MB.
-func TestNewBodyView_DeepJSONAsReceived(t *testing.T) {
-	t.Parallel()
-
-	nested := func(depth int) string {
-		return strings.Repeat("[", depth) + "1" + strings.Repeat("]", depth)
-	}
-
-	assert.NotEqual(t, nested(16), bodyView(nested(16)).Text)
-	assert.Equal(t, nested(17), bodyView(nested(17)).Text)
-
-	body := strings.Repeat("[", 5000) + strings.Repeat("]", 5000)
-
-	assert.Equal(t, body, bodyView(body).Text)
-}
-
-// TestNewBodyView_GrowingJSONAsReceived proves a JSON body that
-// pretty-printing would make more than four times its size plus 1 KiB
-// is shown as it arrived, however shallow: each short element eight
-// levels deep gets a line indented sixteen spaces.
-func TestNewBodyView_GrowingJSONAsReceived(t *testing.T) {
-	t.Parallel()
-
-	numbers := func(n int) string {
-		return strings.Repeat("[", 8) +
-			strings.TrimSuffix(strings.Repeat("1,", n), ",") +
-			strings.Repeat("]", 8)
-	}
-
-	assert.NotEqual(t, numbers(10), bodyView(numbers(10)).Text)
-	assert.Equal(t, numbers(1000), bodyView(numbers(1000)).Text)
-}
-
-// TestNewBodyView_ScrollsPast200Lines proves a body is shown at
-// its full height up to 200 lines and in the scrolling box past
-// them, counting the lines after formatting.
-func TestNewBodyView_ScrollsPast200Lines(t *testing.T) {
-	t.Parallel()
-
-	assert.False(t, bodyView(lines(200)).Scroll)
-	assert.True(t, bodyView(lines(201)).Scroll)
-
-	// A final newline ends the last line rather than starting another.
-	assert.False(t, bodyView(lines(200)+"\n").Scroll)
-	assert.True(t, bodyView(lines(201)+"\n").Scroll)
-
-	// The page shows a carriage return, a line feed, or the two
-	// together as one line break.
-	assert.True(t, bodyView(strings.Repeat("line\r", 400)).Scroll)
-	assert.False(t, bodyView(strings.Repeat("line\r\n", 200)).Scroll)
-
-	// One line as received, 201 once formatted: the brackets and
-	// 199 elements.
-	numbers := "[" + strings.TrimSuffix(strings.Repeat("1,", 199), ",") + "]"
-
-	assert.NotContains(t, numbers, "\n")
-	assert.True(t, bodyView(numbers).Scroll)
-}
-
-// TestNewBodyView_LargeBodyScrolls proves a body larger than the
-// cap of the lists of events is shown in the scrolling box
-// however few lines it has, on the event's own page as in the
-// lists.
-func TestNewBodyView_LargeBodyScrolls(t *testing.T) {
-	t.Parallel()
-
-	assert.False(t, bodyView(strings.Repeat("x", bodyCap)).Scroll)
-	assert.True(t, bodyView(strings.Repeat("x", bodyCap+1)).Scroll)
-}
-
-// TestNewBodyView_BinaryNotShown proves a body that is not text
-// is never shown: one that is not valid UTF-8, or that holds a
-// control character other than tab, line feed and carriage return.
-func TestNewBodyView_BinaryNotShown(t *testing.T) {
-	t.Parallel()
-
-	for _, body := range []string{
-		"\xff\xfe\xfd",
-		"a\x00b",
-		// A small protobuf message: valid UTF-8, but control bytes.
-		"\x08\x01\x12\x03abc",
-		"\x1b[31mred\x1b[0m",
-		"a\x7fb",
-	} {
-		v := bodyView(body)
-
-		assert.True(t, v.Binary, "%q", body)
-		assert.Empty(t, v.Text)
-	}
-
-	assert.False(t, bodyView("snow "+snowman).Binary)
-	assert.False(t, bodyView("a\tb\r\nc\n").Binary)
-}

internal/handlers/event_detail.go

@@ -1,74 +0,0 @@
-package handlers
-
-import (
-	"net/http"
-
-	"github.com/go-chi/chi"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// HandleEventDetail shows one event on its own page: its details,
-// its whole body and every delivery of it. The page reads the
-// event's body whole, which the receiver caps at 1 MB.
-func (h *Handlers) HandleEventDetail() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		webhook, ok := h.ownedWebhook(w, r)
-		if !ok {
-			return
-		}
-
-		if !h.dbMgr.DBExists(webhook.ID) {
-			h.renderError(w, r, http.StatusNotFound)
-
-			return
-		}
-
-		webhookDB, err := h.dbMgr.GetDB(webhook.ID)
-		if err != nil {
-			h.serverError(w, r, "failed to get webhook database", err)
-
-			return
-		}
-
-		var rows []eventLogRow
-
-		err = webhookDB.Model(&database.Event{}).
-			Select(eventColumns).
-			Where(
-				"id = ? AND webhook_id = ?",
-				chi.URLParam(r, "eventID"), webhook.ID,
-			).
-			Limit(1).
-			Find(&rows).Error
-		if err != nil {
-			h.serverError(w, r, "failed to load event", err)
-
-			return
-		}
-
-		if len(rows) == 0 {
-			h.renderError(w, r, http.StatusNotFound)
-
-			return
-		}
-
-		targets, err := h.loadTargetMap(webhook.ID)
-		if err != nil {
-			h.serverError(w, r, "failed to load targets", err)
-
-			return
-		}
-
-		views, ok := h.eventLogViews(
-			w, r, webhookDB, webhook.ID, rows, targets,
-		)
-		if !ok {
-			return
-		}
-
-		h.renderTemplate(w, r, "event_detail.html", map[string]any{
-			tmplKeyWebhook: &webhook,
-			"Event":        views[0],
-		})
-	}
-}

internal/handlers/event_detail_test.go

@@ -1,152 +0,0 @@
-package handlers_test
-
-import (
-	"context"
-	"net/http"
-	"net/http/httptest"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/go-chi/chi"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm/clause"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/session"
-)
-
-// serveEventPage runs the real event page handler as the test user
-// for the given webhook and event ids.
-func serveEventPage(
-	t *testing.T,
-	h *handlers.Handlers,
-	sess *session.Session,
-	webhookID, eventID string,
-) *httptest.ResponseRecorder {
-	t.Helper()
-
-	req := httptest.NewRequestWithContext(
-		context.Background(),
-		http.MethodGet,
-		"/hook/"+webhookID+"/events/"+eventID,
-		nil,
-	)
-
-	for _, c := range authenticatedCookies(
-		t, sess, deleteTestUserID, deleteTestUsername,
-	) {
-		req.AddCookie(c)
-	}
-
-	rctx := chi.NewRouteContext()
-	rctx.URLParams.Add(paramSourceID, webhookID)
-	rctx.URLParams.Add(paramEventID, eventID)
-
-	req = req.WithContext(
-		context.WithValue(req.Context(), chi.RouteCtxKey, rctx),
-	)
-
-	w := httptest.NewRecorder()
-	h.HandleEventDetail().ServeHTTP(w, req)
-
-	return w
-}
-
-// TestHandleEventDetail_ShowsEventWholeWithDeliveries proves the
-// event's page shows its details, its whole body even past the cap
-// of the lists of events, pretty-printed and in the scrolling box,
-// and each delivery with its status and attempts.
-func TestHandleEventDetail_ShowsEventWholeWithDeliveries(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	target := seedTarget(t, f.db, f.webhook.ID, database.TargetTypeHTTP)
-
-	const sentinel = "TAIL-SENTINEL-5b2e"
-
-	body := `{"pad":"` + strings.Repeat("x", 2*bodyCap) +
-		`","tail":"` + sentinel + `"}`
-	event := f.event(t, contentTypeJSON, body, time.Now())
-	f.attempt(t, f.delivery(
-		t, event, target.ID, database.DeliveryStatusFailed,
-	), http.StatusBadGateway, time.Second)
-
-	w := serveEventPage(t, f.h, f.sess, f.webhook.ID, event.ID)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	page := w.Body.String()
-
-	assert.Contains(t, page, event.ID)
-	assert.Contains(t, page, contentTypeJSON)
-	assert.Contains(t, page, strconv.Itoa(len(body))+" bytes")
-	assert.Contains(t, page, "{\n  "pad": "xxx")
-	assert.Contains(t, page, ""tail": ""+sentinel+""\n}")
-	assert.Contains(t, page, `style="max-height: 32rem; overflow-y: auto"`)
-	assert.NotContains(t, page, "Showing the first")
-	assert.Contains(t, page, target.Name)
-	assert.Contains(t, page, ">failed</span>")
-	assert.Contains(t, page, "Status: 502")
-}
-
-// TestHandleEventDetail_ResubmitLinks proves a resubmitted copy's
-// page links to its original's page, and the original's page says
-// it was resubmitted.
-func TestHandleEventDetail_ResubmitLinks(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	original := f.event(t, contentTypeJSON, "{}", time.Now())
-
-	cp := &database.Event{
-		WebhookID:         f.webhook.ID,
-		Method:            http.MethodPost,
-		Body:              "{}",
-		ContentType:       contentTypeJSON,
-		ResubmittedFromID: &original.ID,
-	}
-	require.NoError(t, f.webhookDB.Omit(clause.Associations).Create(cp).Error)
-
-	w := serveEventPage(t, f.h, f.sess, f.webhook.ID, cp.ID)
-	require.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(
-		t, w.Body.String(),
-		`href="/hook/`+f.webhook.ID+`/events/`+original.ID+`"`,
-	)
-
-	w = serveEventPage(t, f.h, f.sess, f.webhook.ID, original.ID)
-	require.Equal(t, http.StatusOK, w.Code)
-	assert.Contains(t, w.Body.String(), "as 1 new event<")
-}
-
-// TestHandleEventDetail_UnknownEventNotFound proves the page is a
-// 404 for an event that does not exist and for one that belongs to
-// another webhook.
-func TestHandleEventDetail_UnknownEventNotFound(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)
-
-	mine := seedWebhook(t, db)
-	theirs := seedWebhook(t, db)
-
-	seedEventWithBody(t, dbMgr, mine.ID, "{}")
-	elsewhere := seedEventWithBody(t, dbMgr, theirs.ID, "{}")
-
-	for _, id := range []string{"no-such-event", elsewhere.ID} {
-		w := serveEventPage(t, h, sess, mine.ID, id)
-		assert.Equal(t, http.StatusNotFound, w.Code, id)
-	}
-}

internal/handlers/event_log_times_test.go

@@ -1,52 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestEventLog_TimesCarryTheirZone proves that the event log shows
-// when an event arrived, and that it and the event's page show when
-// each delivery was created and each attempt recorded: each as how
-// long ago, with the full UTC time on hover.
-func TestEventLog_TimesCarryTheirZone(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	target := seedTarget(t, f.db, f.webhook.ID, database.TargetTypeHTTP)
-
-	now := time.Now().UTC().Truncate(time.Second)
-	receivedAt := now.Add(-3 * time.Hour)
-	createdAt := now.Add(-90 * time.Minute)
-	ranAt := now.Add(-30 * time.Minute)
-
-	event := f.event(t, contentTypeJSON, "{}", receivedAt)
-	dlv := f.deliveryQueuedAt(
-		t, event, target.ID, database.DeliveryStatusDelivered, createdAt,
-	)
-	f.attempt(t, dlv, http.StatusOK, ranAt.Sub(createdAt))
-
-	w := serveEventPage(t, f.h, f.sess, f.webhook.ID, event.ID)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	eventPage := w.Body.String()
-	eventLog := renderSourceLogsPage(t, f.h, f.sess, f.webhook.ID)
-
-	received := receivedAt.Format(time.DateTime)
-	assert.Contains(t, eventLog, `title="`+received+` UTC">3 hours ago</span>`)
-	assert.NotContains(t, eventLog, received+"</span>",
-		"an event's time must not be written without its zone")
-	assert.Contains(t, eventPage, received+" UTC")
-
-	for _, page := range []string{eventLog, eventPage} {
-		assert.Contains(t, page, `title="`+createdAt.Format(time.DateTime)+
-			` UTC">created 1 hour ago</span>`)
-		assert.Contains(t, page, `title="`+ranAt.Format(time.DateTime)+
-			` UTC">30 minutes ago</span>`)
-	}
-}

internal/handlers/event_log_view.go

@@ -3,10 +3,16 @@ package handlers
 import (
 	"time"
 	"unicode/utf8"
-
-	"github.com/dustin/go-humanize"
 )
 
+// maxRenderedBodyBytes caps how many bytes of a stored event
+// body reach the event log page. Bodies come from the
+// unauthenticated receiver under the 1 MB ingest cap and
+// renderTemplate buffers a whole page before writing it, so
+// an uncapped page of paginationPerPage events is tens of
+// megabytes of resident memory per concurrent viewer.
+const maxRenderedBodyBytes = 8192
+
 // eventLogColumns is the event log's projection. The casts to
 // blob are load-bearing: they make substr and length count
 // bytes rather than characters, so the cap bounds the page in
@@ -18,27 +24,27 @@ const eventLogColumns = "id, created_at, method, content_type, " +
 	"substr(cast(body as blob), 1, ?) AS body, " +
 	"length(cast(body as blob)) AS body_bytes"
 
-// eventColumns is eventLogColumns for the event's own page, which
-// shows the whole body.
-const eventColumns = "id, created_at, method, content_type, " +
-	"resubmitted_from_id, " +
-	"cast(body as blob) AS body, " +
-	"length(cast(body as blob)) AS body_bytes"
-
 // EventLogView is the display-safe projection of an event for
-// the event log page and the event's own page, alongside
+// the event log page, alongside DeliveryView and TargetView.
-// DeliveryView and TargetView.
+// It carries a capped body plus the true stored size, so the
+// page can mark a body as truncated without ever holding the
+// whole thing.
 type EventLogView struct {
 	ID          string
+	CreatedAt   time.Time
 	Method      string
 	ContentType string
 
-	// Received is how long ago the event arrived, and ReceivedUTC
+	// Body holds at most maxRenderedBodyBytes bytes of the
-	// the full timestamp.
+	// stored body.
-	Received    string
+	Body string
-	ReceivedUTC string
 
-	Body BodyView
+	// BodyBytes is the true size of the stored body.
+	BodyBytes int64
+
+	// BodyTruncated reports that the stored body was larger
+	// than the cap, so the page owes the reader a marker.
+	BodyTruncated bool
 
 	// ResubmittedFromID names the event this one was copied
 	// from, empty for an event that arrived on the receiver.
@@ -59,10 +65,16 @@ func (v EventLogView) ResubmittedFrom() bool {
 	return v.ResubmittedFromID != ""
 }
 
-// eventLogRow is one row of the event log projection, or of
+// BodyShownBytes is how many body bytes the page is actually
-// eventColumns. In the event log its body column arrives
+// rendering, which the truncation marker reports beside the
-// already cut to the cap by SQLite, with the true size beside
+// true size.
-// it.
+func (v EventLogView) BodyShownBytes() int {
+	return len(v.Body)
+}
+
+// eventLogRow is one row of the event log projection. Its
+// body column arrives already cut to the cap by SQLite, with
+// the true size beside it.
 type eventLogRow struct {
 	ID                string
 	CreatedAt         time.Time
@@ -73,9 +85,18 @@ type eventLogRow struct {
 	BodyBytes         int64
 }
 
-// view projects a loaded row of the webhook's events for
+// view projects a loaded row for rendering.
-// rendering.
+func (r *eventLogRow) view() EventLogView {
-func (r *eventLogRow) view(webhookID string) EventLogView {
+	body := r.Body
+	truncated := r.BodyBytes > int64(len(body))
+
+	// Only a cut body can have been left mid-sequence by
+	// this query. A whole body is passed through exactly as
+	// stored, however malformed.
+	if truncated {
+		body = trimPartialRune(body)
+	}
+
 	var from string
 	if r.ResubmittedFromID != nil {
 		from = *r.ResubmittedFromID
@@ -83,13 +104,12 @@ func (r *eventLogRow) view(webhookID string) EventLogView {
 
 	return EventLogView{
 		ID:                r.ID,
+		CreatedAt:         r.CreatedAt,
 		Method:            r.Method,
 		ContentType:       r.ContentType,
-		Received:    humanize.Time(r.CreatedAt),
+		Body:              string(body),
-		ReceivedUTC: r.CreatedAt.UTC().Format(time.DateTime) + " UTC",
+		BodyBytes:         r.BodyBytes,
-		Body: newBodyView(
+		BodyTruncated:     truncated,
-			"/hook/"+webhookID+"/events/"+r.ID, r.Body, r.BodyBytes,
-		),
 		ResubmittedFromID: from,
 	}
 }

internal/handlers/event_log_view_test.go

@@ -16,7 +16,7 @@ import (
 	"sneak.berlin/go/webhooker/internal/session"
 )
 
-// bodyCap is the number of body bytes the lists of events are
+// bodyCap is the number of body bytes the event log page is
 // allowed to render for one event.
 const bodyCap = handlers.MaxRenderedBodyBytesForTest
 
@@ -75,7 +75,9 @@ func seedAndProject(
 	wh := seedWebhook(t, db)
 	seedEventWithBody(t, dbMgr, wh.ID, body)
 
-	views := h.LoadEventLogViewsForTest(httptest.NewRecorder(), *wh)
+	views := h.LoadEventLogViewsForTest(
+		httptest.NewRecorder(), *wh, 1,
+	)
 	require.Len(t, views, 1)
 
 	return views[0]
@@ -83,7 +85,7 @@ func seedAndProject(
 
 // TestHandleSourceLogs_BoundsOversizeBody proves the rendered
 // page is bounded by the cap rather than by the stored payload:
-// the body here is 16 times the cap, and the ingest path would
+// the body here is 64 times the cap, and the ingest path would
 // accept twice as much again.
 func TestHandleSourceLogs_BoundsOversizeBody(t *testing.T) {
 	t.Parallel()
@@ -121,7 +123,7 @@ func TestHandleSourceLogs_BoundsOversizeBody(t *testing.T) {
 	// The marker states the true stored size, not the cut one.
 	assert.Contains(
 		t, page,
-		"Showing the first "+strconv.Itoa(bodyCap)+
+		"showing "+strconv.Itoa(bodyCap)+
 			" of "+strconv.Itoa(storedBytes)+" bytes",
 	)
 }
@@ -150,35 +152,34 @@ func TestHandleSourceLogs_SmallBodyRendersWhole(t *testing.T) {
 	page := renderSourceLogsPage(t, h, sess, wh.ID)
 
 	assert.Contains(t, page, ""kept"")
-	assert.NotContains(t, page, "Showing the first")
+	assert.NotContains(t, page, "Body truncated for display")
 }
 
 // TestEventLogView_CutMidRune proves a multi-byte rune severed
 // by the byte-wise cut is dropped rather than surfaced as a
-// mojibake tail, which would also make the text look binary.
+// mojibake tail.
 func TestEventLogView_CutMidRune(t *testing.T) {
 	t.Parallel()
 
-	body := strings.Repeat(snowman, bodyCap)
+	body := strings.Repeat(snowman, 4096)
 	view := seedAndProject(t, body)
 
 	// bodyCap bytes hold bodyCap/3 whole snowmen and two bytes
 	// of the next one; those two are dropped.
 	whole := bodyCap / len(snowman)
 
-	assert.True(t, view.Body.Cut)
+	assert.True(t, view.BodyTruncated)
-	assert.False(t, view.Body.Binary)
+	assert.Equal(t, int64(len(body)), view.BodyBytes)
-	assert.Equal(t, int64(len(body)), view.Body.Size)
+	assert.Equal(t, strings.Repeat(snowman, whole), view.Body)
-	assert.Equal(t, strings.Repeat(snowman, whole), view.Body.Text)
+	assert.True(t, utf8.ValidString(view.Body))
-	assert.True(t, utf8.ValidString(view.Body.Text))
+	assert.LessOrEqual(t, len(view.Body), bodyCap)
-	assert.Equal(t, len(view.Body.Text), view.Body.ShownBytes)
-	assert.LessOrEqual(t, view.Body.ShownBytes, bodyCap)
 }
 
-// TestEventLogView_BinaryBodyNotShown proves a body that is not
+// TestEventLogView_BinaryBodyLeftAsStored proves a binary
-// text is left out rather than shown as replacement characters,
+// payload is passed through byte for byte. Its tail is invalid
-// whether it is cut or not.
+// UTF-8 however the cut falls, so repairing it would misreport
-func TestEventLogView_BinaryBodyNotShown(t *testing.T) {
+// what the sender delivered.
+func TestEventLogView_BinaryBodyLeftAsStored(t *testing.T) {
 	t.Parallel()
 
 	raw := make([]byte, bodyCap+808)
@@ -187,21 +188,12 @@ func TestEventLogView_BinaryBodyNotShown(t *testing.T) {
 		raw[i] = 0x80 | byte(i%0x40)
 	}
 
-	for name, body := range map[string][]byte{
+	view := seedAndProject(t, string(raw))
-		"cut":   raw,
-		"whole": raw[:2048],
-		"NUL":   []byte("text\x00text"),
-	} {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
 
-			view := seedAndProject(t, string(body))
+	assert.True(t, view.BodyTruncated)
-
+	assert.Equal(t, int64(len(raw)), view.BodyBytes)
-			assert.True(t, view.Body.Binary)
+	assert.Equal(t, string(raw[:bodyCap]), view.Body)
-			assert.Empty(t, view.Body.Text)
+	assert.False(t, utf8.ValidString(view.Body))
-			assert.Equal(t, int64(len(body)), view.Body.Size)
-		})
-	}
 }
 
 // TestTrimPartialRune covers the distinction the cut repair

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

@@ -19,16 +19,10 @@ func (s *Handlers) SetLogForTest(log *slog.Logger) {
 	s.log = log
 }
 
-// MaxRenderedBodyBytesForTest exposes the body cap of the lists
+// MaxRenderedBodyBytesForTest exposes the event log's body cap
-// of events to the handlers_test package.
+// to the handlers_test package.
 const MaxRenderedBodyBytesForTest = maxRenderedBodyBytes
 
-// NewBodyViewForTest exposes newBodyView for use in the
-// handlers_test package.
-func NewBodyViewForTest(body []byte, size int64) BodyView {
-	return newBodyView("/hook/w/events/e", body, size)
-}
-
 // MaxRenderedResponseBytesForTest exposes the event log's
 // delivery response cap to the handlers_test package.
 const MaxRenderedResponseBytesForTest = maxRenderedResponseBytes
@@ -42,14 +36,11 @@ const MaxRenderedAttemptsForTest = maxRenderedAttempts
 // the handlers enforce rather than a number copied beside it.
 const MaxTargetRetriesForTest = maxTargetRetries
 
-// EventDBLeftMsgForTest and SidecarLeftMsgForTest expose the two
+// PageOrFirstForTest exposes pageOrFirst for use in the handlers_test
-// messages the webhook delete handler logs when a file of the event
+// package.
-// database is left on disk, so a test checking that one is absent
+func PageOrFirstForTest(s string) int {
-// checks for the handler's own wording.
+	return pageOrFirst(s)
-const (
+}
-	EventDBLeftMsgForTest = eventDBLeftMsg
-	SidecarLeftMsgForTest = sidecarLeftMsg
-)
 
 // DummyVerificationsForTest reports how many equivalent-cost
 // verifications were charged for usernames that do not exist. It
@@ -73,9 +64,10 @@ func TrimPartialRuneForTest(b []byte) []byte {
 func (s *Handlers) LoadEventLogViewsForTest(
 	w http.ResponseWriter,
 	webhook database.Webhook,
+	page int,
 ) []EventLogView {
 	views, _, _ := s.loadEventsWithDeliveries(
-		w, newRequestForTest(), webhook, nil,
+		w, newRequestForTest(), webhook, nil, page,
 	)
 
 	return views
@@ -136,20 +128,22 @@ func (s *Handlers) RenderTemplateForTest(
 // BuildSlackTargetConfigForTest exposes
 // buildSlackTargetConfig for use in the handlers_test package.
 func (s *Handlers) BuildSlackTargetConfigForTest(
-	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
 	targetURL string,
-) (string, string, error) {
+) (string, error) {
-	return s.buildSlackTargetConfig(ctx, targetURL)
+	return s.buildSlackTargetConfig(w, r, targetURL)
 }
 
 // BuildHTTPTargetConfigForTest exposes buildHTTPTargetConfig
 // for use in the handlers_test package, taking the form fields
 // an HTTP target's configuration is built from.
 func (s *Handlers) BuildHTTPTargetConfigForTest(
-	ctx context.Context,
+	w http.ResponseWriter,
+	r *http.Request,
 	targetURL, headers, timeout string,
-) (string, string, error) {
+) (string, error) {
-	return s.buildHTTPTargetConfig(ctx, targetFormInput{
+	return s.buildHTTPTargetConfig(w, r, targetFormInput{
 		URL:     targetURL,
 		Headers: headers,
 		Timeout: timeout,
@@ -159,17 +153,9 @@ func (s *Handlers) BuildHTTPTargetConfigForTest(
 // BuildDatabaseTargetConfigForTest exposes
 // buildDatabaseTargetConfig for use in the handlers_test
 // package.
-func BuildDatabaseTargetConfigForTest(
+func (s *Handlers) BuildDatabaseTargetConfigForTest(
-	expiry, rotation string,
+	w http.ResponseWriter,
-) (string, string, error) {
+	expiry string,
-	return buildDatabaseTargetConfig(expiry, rotation)
+) (string, error) {
-}
+	return s.buildDatabaseTargetConfig(w, newRequestForTest(), expiry)
-
-// ArchiveFileViewForTest exposes archiveFileView, which describes a
-// database target's archive files as the target list shows them at
-// now.
-func (s *Handlers) ArchiveFileViewForTest(
-	webhook *database.Webhook, target *database.Target, now time.Time,
-) *ArchiveFileView {
-	return s.archiveFileView(webhook, target, now)
 }

internal/handlers/handlers.go

@@ -30,9 +30,10 @@ import (
 const (
 	// maxBodyShift is the bit shift for 1 MB body limit.
 	maxBodyShift = 20
-	// recentEventLimit is the number of most recent events that a
+	// recentEventLimit is the number of recent events to show.
-	// webhook's page and its event log show.
 	recentEventLimit = 50
+	// paginationPerPage is the number of items per page.
+	paginationPerPage = 25
 
 	// tmplKeyError is the template data key for an error message.
 	tmplKeyError = "Error"
@@ -66,7 +67,6 @@ type HandlersParams struct {
 	Middleware   *middleware.Middleware
 	Notifier     delivery.Notifier
 	Archives     delivery.Archives
-	CircuitBreakers delivery.CircuitBreakers
 	SSRFGuard    *delivery.Guard
 	Metrics      *metrics.Set
 	Registry     *prometheus.Registry
@@ -84,7 +84,6 @@ type Handlers struct {
 	mw        *middleware.Middleware
 	notifier  delivery.Notifier
 	archives  delivery.Archives
-	breakers  delivery.CircuitBreakers
 	mtr       *metrics.Set
 	templates map[string]*template.Template
 
@@ -98,10 +97,7 @@ type Handlers struct {
 	// 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
+	// stored names from the other.
-	// it reads the stored names and lists the files they give, and
-	// again for each file while it finds the file under the names
-	// stored then and opens it.
 	renameMu sync.Mutex
 
 	// dummyVerifications counts the equivalent-cost verifications
@@ -113,25 +109,22 @@ type Handlers struct {
 // parsePageTemplate parses a page-specific template set from the
 // embedded FS. Each page template is combined with the shared
 // base, htmlheader, navbar and notice templates, and with any further
-// files the page includes. The set is named after the page file, so
+// files the page includes. The page file must be listed first so that
-// the page's root action ({{template "base" .}}) is its entry point.
+// its root action ({{template "base" .}}) becomes the template set's
-//
+// entry point.
-// The page file is parsed last because a later definition of a name
-// replaces an earlier one: the page's {{define "title"}} must replace
-// the {{block "title"}} fallback in htmlheader.html.
 func parsePageTemplate(
 	pageFile string, included ...string,
 ) *template.Template {
 	files := append([]string{
+		pageFile,
 		"base.html",
 		"htmlheader.html",
 		"navbar.html",
 		"notice.html",
 	}, included...)
-	files = append(files, pageFile)
 
 	return template.Must(
-		template.New(pageFile).ParseFS(templates.Templates, files...),
+		template.ParseFS(templates.Templates, files...),
 	)
 }
 
@@ -151,7 +144,6 @@ func New(
 	s.mw = params.Middleware
 	s.notifier = params.Notifier
 	s.archives = params.Archives
-	s.breakers = params.CircuitBreakers
 	s.mtr = params.Metrics
 	s.ssrf = params.SSRFGuard
 
@@ -162,18 +154,9 @@ func New(
 		"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": parsePageTemplate("source_detail.html", "webhook_stats.html"),
-			"source_detail.html", "webhook_stats.html", "event_body.html",
-		),
 		"source_edit.html":   parsePageTemplate("source_edit.html"),
-		"source_logs.html": parsePageTemplate(
+		"source_logs.html":   parsePageTemplate("source_logs.html"),
-			"source_logs.html", "event_body.html", "delivery_row.html",
-			"delivery_attempts.html",
-		),
-		"event_detail.html": parsePageTemplate(
-			"event_detail.html", "event_body.html", "delivery_row.html",
-			"delivery_attempts.html",
-		),
 		"target_edit.html":   parsePageTemplate("target_edit.html"),
 		"error.html":         parsePageTemplate("error.html"),
 	}
@@ -402,7 +385,7 @@ func (s *Handlers) pageData(
 // partial body and the status before a mid-render error can be
 // reported, leaving no way to serve a 500. Buffering makes a page's
 // rendered size resident memory per concurrent viewer, so every page
-// owes it a bound: the lists of events cap each stored body at
+// owes it a bound: the event log caps each stored body at
 // maxRenderedBodyBytes for exactly this reason.
 func (s *Handlers) executeTemplate(
 	w http.ResponseWriter,

internal/handlers/handlers_test.go

@@ -9,7 +9,6 @@ import (
 	"net/http/httptest"
 	"sync"
 	"testing"
-	"time"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -182,40 +181,6 @@ func (r *recordingArchives) Renames() []archiveRename {
 	return out
 }
 
-// testCircuitBreakers is a delivery.CircuitBreakers that reports, for
-// each target, the circuit state and cooldown a test gave it with Set,
-// and a closed breaker for any other target.
-type testCircuitBreakers struct {
-	mu        sync.Mutex
-	states    map[string]delivery.CircuitState
-	cooldowns map[string]time.Duration
-}
-
-// Set makes the target's breaker read as state, with cooldown left.
-func (b *testCircuitBreakers) Set(
-	targetID string, state delivery.CircuitState, cooldown time.Duration,
-) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	if b.states == nil {
-		b.states = map[string]delivery.CircuitState{}
-		b.cooldowns = map[string]time.Duration{}
-	}
-
-	b.states[targetID] = state
-	b.cooldowns[targetID] = cooldown
-}
-
-func (b *testCircuitBreakers) StateAndCooldown(
-	targetID string,
-) (delivery.CircuitState, time.Duration) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	return b.states[targetID], b.cooldowns[targetID]
-}
-
 // 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
@@ -266,12 +231,6 @@ func newTestAppWithConfig(
 			func(r *recordingArchives) delivery.Archives {
 				return r
 			},
-			func() *testCircuitBreakers {
-				return &testCircuitBreakers{}
-			},
-			func(b *testCircuitBreakers) delivery.CircuitBreakers {
-				return b
-			},
 			metrics.NewRegistry,
 			metrics.New,
 			middleware.New,
@@ -355,12 +314,16 @@ func TestBuildSlackTargetConfig_AcceptsPublicURL(t *testing.T) {
 
 	t.Cleanup(app.RequireStop)
 
-	cfg, errMsg, err := h.BuildSlackTargetConfigForTest(
+	req := httptest.NewRequestWithContext(
-		t.Context(), "http://93.184.216.34/services/T00/B00/xxx",
+		context.Background(), http.MethodPost, "/", nil)
+	w := httptest.NewRecorder()
+
+	cfg, err := h.BuildSlackTargetConfigForTest(
+		w, req, "http://93.184.216.34/services/T00/B00/xxx",
 	)
 
 	require.NoError(t, err)
-	assert.Empty(t, errMsg)
+	assert.Equal(t, http.StatusOK, w.Code)
 	assert.Contains(t, cfg, "webhookUrl")
 }
 
@@ -374,13 +337,17 @@ func TestBuildSlackTargetConfig_RejectsReservedURL(t *testing.T) {
 
 	t.Cleanup(app.RequireStop)
 
-	cfg, errMsg, err := h.BuildSlackTargetConfigForTest(
+	req := httptest.NewRequestWithContext(
-		t.Context(), "http://169.254.169.254/latest/meta-data/",
+		context.Background(), http.MethodPost, "/", nil)
+	w := httptest.NewRecorder()
+
+	cfg, err := h.BuildSlackTargetConfigForTest(
+		w, req, "http://169.254.169.254/latest/meta-data/",
 	)
 
-	require.NoError(t, err)
+	require.Error(t, err)
-	assert.Contains(t, errMsg, "Invalid target URL")
 	assert.Empty(t, cfg)
+	assert.Equal(t, http.StatusBadRequest, w.Code)
 }
 
 func TestRenderTemplate(t *testing.T) {
@@ -477,37 +444,30 @@ func TestRenderTemplateMidRenderErrorSendsNoPartialBody(t *testing.T) {
 func TestBuildDatabaseTargetConfig_Valid(t *testing.T) {
 	t.Parallel()
 
-	// Empty expiry and rotation: the keep-forever, one-file default,
+	var h *handlers.Handlers
-	// empty config.
+
-	cfg, errMsg, err := handlers.BuildDatabaseTargetConfigForTest("", "")
+	app := newTestApp(t, &h)
+	app.RequireStart()
+
+	t.Cleanup(app.RequireStop)
+
+	// Empty expiry: the keep-forever default, empty config.
+	w := httptest.NewRecorder()
+	cfg, err := h.BuildDatabaseTargetConfigForTest(w, "")
 	require.NoError(t, err)
-	assert.Empty(t, errMsg)
 	assert.Empty(t, cfg)
 
 	// Explicit never is stored as config.
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest("never", "")
+	w = httptest.NewRecorder()
+	cfg, err = h.BuildDatabaseTargetConfigForTest(w, "never")
 	require.NoError(t, err)
-	assert.Empty(t, errMsg)
 	assert.JSONEq(t, `{"expiry":"never"}`, cfg)
 
 	// A positive duration is stored as config.
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest("720h", "")
+	w = httptest.NewRecorder()
+	cfg, err = h.BuildDatabaseTargetConfigForTest(w, "720h")
 	require.NoError(t, err)
-	assert.Empty(t, errMsg)
 	assert.JSONEq(t, `{"expiry":"720h"}`, cfg)
-
-	// A rotation is stored as config, with or without an expiry.
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest("", "daily")
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.JSONEq(t, `{"rotation":"daily"}`, cfg)
-
-	cfg, errMsg, err = handlers.BuildDatabaseTargetConfigForTest(
-		"720h", "hourly",
-	)
-	require.NoError(t, err)
-	assert.Empty(t, errMsg)
-	assert.JSONEq(t, `{"expiry":"720h","rotation":"hourly"}`, cfg)
 }
 
 func TestBuildDatabaseTargetConfig_RejectsBadExpiry(
@@ -515,31 +475,22 @@ func TestBuildDatabaseTargetConfig_RejectsBadExpiry(
 ) {
 	t.Parallel()
 
+	var h *handlers.Handlers
+
+	app := newTestApp(t, &h)
+	app.RequireStart()
+
+	t.Cleanup(app.RequireStop)
+
 	for _, bad := range []string{"nonsense", "7d", "-5h"} {
-		cfg, errMsg, err := handlers.BuildDatabaseTargetConfigForTest(bad, "")
+		w := httptest.NewRecorder()
+		cfg, err := h.BuildDatabaseTargetConfigForTest(w, bad)
 
-		require.NoError(t, err)
+		require.Error(t, err, "expiry %q", bad)
-		assert.Contains(
-			t, errMsg, "Invalid archive expiry",
-			"expiry %q should be refused", bad,
-		)
-		assert.Empty(t, cfg)
-	}
-}
-
-func TestBuildDatabaseTargetConfig_RejectsBadRotation(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	for _, bad := range []string{"weekly", "Daily", " none"} {
-		cfg, errMsg, err := handlers.BuildDatabaseTargetConfigForTest("", bad)
-
-		require.NoError(t, err)
-		assert.Contains(
-			t, errMsg, "Invalid archive rotation",
-			"rotation %q should be refused", bad,
-		)
 		assert.Empty(t, cfg)
+		assert.Equal(
+			t, http.StatusBadRequest, w.Code,
+			"expiry %q should be rejected with 400", bad,
+		)
 	}
 }

internal/handlers/notice.go

@@ -20,7 +20,6 @@ const (
 	webhookSaved          noticeCode = "webhook-saved"
 	webhookDeleted        noticeCode = "webhook-deleted"
 	entrypointAdded       noticeCode = "entrypoint-added"
-	entrypointSaved       noticeCode = "entrypoint-saved"
 	entrypointDeleted     noticeCode = "entrypoint-deleted"
 	entrypointActivated   noticeCode = "entrypoint-activated"
 	entrypointDeactivated noticeCode = "entrypoint-deactivated"
@@ -49,7 +48,6 @@ func noticeFor(r *http.Request) *notice {
 		webhookSaved:          {Text: "Webhook saved."},
 		webhookDeleted:        {Text: "Webhook deleted."},
 		entrypointAdded:       {Text: "Entrypoint added."},
-		entrypointSaved:       {Text: "Entrypoint description saved."},
 		entrypointDeleted:     {Text: "Entrypoint deleted."},
 		entrypointActivated:   {Text: "Entrypoint activated."},
 		entrypointDeactivated: {Text: "Entrypoint deactivated."},
@@ -66,8 +64,7 @@ func noticeFor(r *http.Request) *notice {
 		},
 		replayTargetDeleted: {
 			Text: "Not replayed: the target this delivery was for " +
-				"has been deleted. Use Resubmit to send the event " +
+				"has been deleted. Recreate the target, then replay.",
-				"to the webhook's currently active targets.",
 			Failed: true,
 		},
 		replayTargetMissing: {

internal/handlers/page_title_test.go

@@ -1,111 +0,0 @@
-package handlers_test
-
-import (
-	"html/template"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/session"
-	"sneak.berlin/go/webhooker/templates"
-)
-
-// TestEveryPageRendersItsOwnTitle renders each page template and checks
-// the browser tab title is the one the page declares, not the
-// "Webhooker" fallback in htmlheader.html. A page that fails to render
-// shows the error page's title instead, and fails here too.
-func TestEveryPageRendersItsOwnTitle(t *testing.T) {
-	t.Parallel()
-
-	var h *handlers.Handlers
-
-	var sess *session.Session
-
-	app := newTestApp(t, &h, &sess)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	// A pointer, as in the handlers: some pages call
-	// Webhook.RetentionLabel, a pointer method.
-	webhook := &database.Webhook{Name: "orders", RetentionDays: 14}
-	webhook.ID = testWebhookID
-
-	pages := []struct {
-		page  string
-		data  map[string]any
-		title string
-	}{
-		{"login.html", map[string]any{}, "Login - Webhooker"},
-		{"profile.html", map[string]any{}, "Profile - Webhooker"},
-		{"settings.html", map[string]any{}, "Settings - Webhooker"},
-		{"sources_list.html", map[string]any{}, "Webhooks - Webhooker"},
-		{"sources_new.html", map[string]any{}, "New Webhook - Webhooker"},
-		{
-			"source_detail.html",
-			map[string]any{dataKeyWebhook: webhook},
-			"orders - Webhooker",
-		},
-		{
-			"source_edit.html",
-			map[string]any{dataKeyWebhook: webhook},
-			"Edit orders - Webhooker",
-		},
-		{
-			"source_logs.html",
-			map[string]any{
-				dataKeyWebhook: webhook,
-				dataKeyEvents:  []handlers.EventLogView{},
-				"TotalEvents":  int64(0),
-			},
-			"Full Event Log - orders - Webhooker",
-		},
-		{
-			"event_detail.html",
-			map[string]any{dataKeyWebhook: webhook},
-			"Event - orders - Webhooker",
-		},
-		{
-			"target_edit.html",
-			map[string]any{
-				dataKeyWebhook: webhook,
-				"Target":       map[string]any{"Name": "alerts", "Type": "slack"},
-			},
-			"Edit alerts - Webhooker",
-		},
-		{
-			"error.html",
-			map[string]any{"StatusText": http.StatusText(http.StatusNotFound)},
-			"Not Found - Webhooker",
-		},
-	}
-
-	for _, p := range pages {
-		body := renderPage(t, h, sess, p.page, p.data)
-
-		_, afterOpen, _ := strings.Cut(body, "<title>")
-		title, _, _ := strings.Cut(afterOpen, "</title>")
-
-		assert.Equal(t, p.title, title, p.page)
-	}
-}
-
-// TestTitleFallbackIsWebhooker checks the title htmlheader.html gives a
-// page that declares none. Every page declares one, so it is checked on
-// htmlheader.html alone.
-func TestTitleFallbackIsWebhooker(t *testing.T) {
-	t.Parallel()
-
-	header := template.Must(
-		template.ParseFS(templates.Templates, "htmlheader.html"),
-	)
-
-	var buf strings.Builder
-
-	require.NoError(t, header.ExecuteTemplate(&buf, "htmlheader", nil))
-	assert.Contains(t, buf.String(), "<title>Webhooker</title>")
-}

internal/handlers/recent_events.go

@@ -12,12 +12,11 @@ import (
 )
 
 // recentEventColumns is the recent events list's projection. It
-// reads the body cut to maxRenderedBodyBytes, as eventLogColumns
+// leaves out the body, for the reason maxRenderedBodyBytes gives,
-// does, and its size from body_bytes, recorded when the event was
+// and reads its size from body_bytes, recorded when the event was
 // stored.
 const recentEventColumns = "id, created_at, method, content_type, " +
-	"resubmitted_from_id, body_bytes, " +
+	"resubmitted_from_id, body_bytes"
-	"substr(cast(body as blob), 1, ?) AS body"
 
 // recentAttemptColumns is the part of a recorded attempt the list
 // uses. The event log's deliveryResultColumns also reads response
@@ -51,9 +50,6 @@ type RecentEventView struct {
 	// unless the webhook has exactly one HTTP target.
 	Status      string
 	StatusClass string
-
-	// Body is what the row shows when it is expanded.
-	Body BodyView
 }
 
 // recentEventRow is one row of recentEventColumns.
@@ -64,7 +60,6 @@ type recentEventRow struct {
 	ContentType       string
 	ResubmittedFromID *string
 	BodyBytes         uint64
-	Body              []byte
 }
 
 // recentAttemptRow is one row of recentAttemptColumns. CreatedAt is
@@ -105,7 +100,7 @@ func loadRecentEvents(
 	var rows []recentEventRow
 
 	err := webhookDB.Model(&database.Event{}).
-		Select(recentEventColumns, maxRenderedBodyBytes).
+		Select(recentEventColumns).
 		Where("webhook_id = ?", webhookID).
 		Order("created_at DESC").
 		Limit(recentEventLimit).
@@ -150,7 +145,7 @@ func loadRecentEvents(
 	views := make([]RecentEventView, len(rows))
 	for i := range rows {
 		views[i] = rows[i].view(
-			webhookID, byEvent[rows[i].ID], attempts, statusTargetID,
+			byEvent[rows[i].ID], attempts, statusTargetID,
 		)
 	}
 
@@ -187,20 +182,14 @@ func loadRecentAttempts(
 	return byDelivery, nil
 }
 
-// view projects a loaded row of the webhook's events for
+// view projects a loaded row for rendering. deliveries is the
-// rendering. deliveries is the event's deliveries, oldest first,
+// event's deliveries, oldest first, and attempts their recorded
-// and attempts their recorded attempts keyed by delivery ID.
+// attempts keyed by delivery ID.
 func (r *recentEventRow) view(
-	webhookID string,
 	deliveries []database.Delivery,
 	attempts map[string][]recentAttemptRow,
 	statusTargetID string,
 ) RecentEventView {
-	//nolint:gosec // body_bytes is at most the receiver's 1 MB cap
-	body := newBodyView(
-		"/hook/"+webhookID+"/events/"+r.ID, r.Body, int64(r.BodyBytes),
-	)
-
 	v := RecentEventView{
 		Method:         r.Method,
 		ContentType:    r.ContentType,
@@ -208,7 +197,6 @@ func (r *recentEventRow) view(
 		ReceivedUTC:    r.CreatedAt.UTC().Format(time.DateTime) + " UTC",
 		Size:           humanize.Bytes(r.BodyBytes),
 		ProcessingTime: processingTime(deliveries, attempts),
-		Body:           body,
 	}
 
 	if r.ResubmittedFromID != nil {

internal/handlers/recent_events_test.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -302,73 +301,6 @@ func TestHandleSourceDetail_NoStatusWithoutSingleHTTPTarget(
 	}
 }
 
-// TestHandleSourceDetail_RecentEventsLinkAndExpand proves each row
-// links to its event's own page and expands to show its body, and
-// that only the newest row starts expanded.
-func TestHandleSourceDetail_RecentEventsLinkAndExpand(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	now := time.Now()
-
-	older := f.event(
-		t, contentTypeJSON, `{"which":"older"}`, now.Add(-time.Minute),
-	)
-	newer := f.event(t, contentTypeJSON, `{"which":"newer"}`, now)
-
-	body := f.render(t)
-
-	for _, e := range []*database.Event{older, newer} {
-		assert.Contains(
-			t, body, `href="/hook/`+f.webhook.ID+`/events/`+e.ID+`"`,
-		)
-	}
-
-	assert.Equal(t, 2, strings.Count(body, `<div x-show="open" x-cloak class="mt-3">`))
-	assert.Equal(t, 1, strings.Count(body, " data-open>"))
-
-	open := strings.Index(body, " data-open>")
-	newerBody := strings.Index(body, "&#34;which&#34;: &#34;newer&#34;")
-	olderBody := strings.Index(body, "&#34;which&#34;: &#34;older&#34;")
-
-	assert.Less(t, open, newerBody, "the newest row is not the open one")
-	assert.Less(t, newerBody, olderBody)
-}
-
-// TestHandleSourceDetail_RecentEventBodyCut proves a body up to
-// the cap is shown whole and pretty-printed, and a larger one only
-// its first bodyCap bytes, as received, with links to the whole
-// body on the event's page and to the download.
-func TestHandleSourceDetail_RecentEventBodyCut(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	now := time.Now()
-
-	// A JSON document of n bytes.
-	document := func(n int) string {
-		return `{"pad":"` + strings.Repeat("x", n-len(`{"pad":""}`)) + `"}`
-	}
-
-	whole := f.event(
-		t, contentTypeJSON, document(bodyCap), now.Add(-time.Minute),
-	)
-	cut := f.event(t, contentTypeJSON, document(bodyCap+1), now)
-
-	body := f.render(t)
-	eventURL := `href="/hook/` + f.webhook.ID + `/events/`
-
-	assert.Equal(t, 1, strings.Count(body, "{\n  &#34;pad&#34;: "))
-	assert.Contains(t, body, "{&#34;pad&#34;:&#34;xxx")
-	assert.Contains(
-		t, body,
-		"Showing the first "+strconv.Itoa(bodyCap)+" of "+
-			strconv.Itoa(bodyCap+1)+" bytes, unformatted.",
-	)
-	assert.Contains(t, body, eventURL+cut.ID+`/body"`)
-	assert.NotContains(t, body, eventURL+whole.ID+`/body"`)
-}
-
 // TestHandleWebhook_RecordsBodySize proves the receiver records the
 // body's size in bytes, not characters, with the event it stores.
 func TestHandleWebhook_RecordsBodySize(t *testing.T) {

internal/handlers/source_create_targets_test.go

@@ -1,209 +0,0 @@
-package handlers_test
-
-import (
-	"errors"
-	"html"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"gorm.io/gorm"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// submitCreateForm posts the new webhook form and returns the
-// recorder.
-func submitCreateForm(
-	env *sourceTestEnv, form url.Values,
-) *httptest.ResponseRecorder {
-	req := formRequest("/hooks/new", env.cookies, form, nil)
-	w := httptest.NewRecorder()
-
-	env.handlers.HandleSourceCreateSubmit().ServeHTTP(w, req)
-
-	return w
-}
-
-// assertNothingCreated checks that the main database holds no webhook,
-// entrypoint or target.
-func assertNothingCreated(t *testing.T, db *database.Database) {
-	t.Helper()
-
-	for _, model := range []any{
-		&database.Webhook{}, &database.Entrypoint{}, &database.Target{},
-	} {
-		var count int64
-
-		require.NoError(t, db.DB().Model(model).Count(&count).Error)
-		assert.Zerof(t, count, "%T rows were created", model)
-	}
-}
-
-// TestHandleSourceCreateSubmit_CreatesRequestedTargets submits the new
-// webhook form with the HTTP target URL filled in or empty, and with
-// the archive checkbox off or on with each pruning choice. The webhook
-// gets an HTTP target only for a URL and a database target only for a
-// checked archive. The pruning choice is always submitted, as the
-// browser submits it while it is hidden, and is ignored when archive
-// is off.
-func TestHandleSourceCreateSubmit_CreatesRequestedTargets(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	// Each value the archive pruning choice submits, after an empty
-	// one that stands for the archive checkbox left off.
-	expiries := []string{
-		"", "never", "1h", "12h", "24h", "720h", "2160h", "8760h",
-	}
-
-	for _, httpURL := range []string{"", editOriginalURL} {
-		for _, expiry := range expiries {
-			name := "url=" + httpURL + " archive=" + expiry
-
-			t.Run(name, func(t *testing.T) {
-				t.Parallel()
-
-				form := url.Values{}
-				form.Set("name", name)
-				form.Set("http_url", httpURL)
-				form.Set("archive_expiry", "720h")
-
-				if expiry != "" {
-					form.Set("archive", "on")
-					form.Set("archive_expiry", expiry)
-				}
-
-				w := submitCreateForm(env, form)
-				require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-
-				var webhook database.Webhook
-
-				require.NoError(t, env.db.DB().
-					Where("name = ?", name).First(&webhook).Error)
-
-				byType := map[database.TargetType]database.Target{}
-				for _, target := range targetsForWebhook(t, env.db, webhook.ID) {
-					byType[target.Type] = target
-				}
-
-				wantCount := 0
-
-				if httpURL != "" {
-					wantCount++
-
-					assert.Equal(t, "HTTP", byType[database.TargetTypeHTTP].Name)
-					assert.JSONEq(t, `{"url":"`+httpURL+`"}`,
-						byType[database.TargetTypeHTTP].Config)
-				}
-
-				if expiry != "" {
-					wantCount++
-
-					assert.Equal(t, "Archive",
-						byType[database.TargetTypeDatabase].Name)
-					assert.JSONEq(t, `{"expiry":"`+expiry+`"}`,
-						byType[database.TargetTypeDatabase].Config)
-				}
-
-				assert.Len(t, byType, wantCount)
-			})
-		}
-	}
-}
-
-// TestHandleSourceCreateSubmit_RefusedFormKeepsEveryValue refuses the
-// new webhook form for an invalid HTTP target URL and for an invalid
-// retention, each with archive on. Nothing is created, and the form
-// comes back with the reason and every value entered: name,
-// description, retention, URL, the checked archive box and the pruning
-// and rotation choices.
-func TestHandleSourceCreateSubmit_RefusedFormKeepsEveryValue(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	const badURL = "Invalid target URL"
-
-	cases := []struct {
-		name      string
-		retention string
-		httpURL   string
-		reason    string
-	}{
-		{"blocked url", "7", editBlockedURL, badURL},
-		{"unsupported scheme", "7", "ftp://93.184.216.34/hook", badURL},
-		{"bad retention", "-5", editOriginalURL, "Retention must be"},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
-			env := setupSourceTest(t)
-
-			form := url.Values{}
-			form.Set("name", "kept name")
-			form.Set("description", "kept description")
-			form.Set("retention_days", tc.retention)
-			form.Set("http_url", tc.httpURL)
-			form.Set("archive", "on")
-			form.Set("archive_expiry", "2160h")
-			form.Set("archive_rotation", "hourly")
-
-			w := submitCreateForm(env, form)
-			require.Equal(t, http.StatusBadRequest, w.Code)
-
-			page := w.Body.String()
-			assert.Contains(t, page, tc.reason)
-			assert.Contains(t, page, `value="kept name"`)
-			assert.Contains(t, page, `>kept description</textarea>`)
-			assert.Contains(t, page, `value="`+tc.retention+`"`)
-			assert.Contains(t, page,
-				`value="`+html.EscapeString(tc.httpURL)+`"`)
-			assert.Contains(t, page, `name="archive" value="on" checked`)
-			assert.Contains(t, page, `x-data="collapsible" data-open`)
-			assert.Contains(t, page, `<option value="2160h" selected>`)
-			assert.Contains(t, page, `<option value="hourly" selected>`)
-
-			assertNothingCreated(t, env.db)
-		})
-	}
-}
-
-// errInjectedTargetCreate is the failure a test makes the insert of a
-// target report.
-var errInjectedTargetCreate = errors.New("injected target create failure")
-
-// TestHandleSourceCreateSubmit_FailedTargetInsertCreatesNothing makes
-// inserting a target fail after the webhook and its entrypoint were
-// inserted, and checks that neither is left behind.
-func TestHandleSourceCreateSubmit_FailedTargetInsertCreatesNothing(
-	t *testing.T,
-) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	require.NoError(t, env.db.DB().Callback().Create().
-		Before("gorm:create").
-		Register("test:fail_target_create", func(tx *gorm.DB) {
-			if tx.Statement.Table == "targets" {
-				_ = tx.AddError(errInjectedTargetCreate)
-			}
-		}),
-	)
-
-	form := url.Values{}
-	form.Set("name", "rolled back")
-	form.Set("archive", "on")
-	form.Set("archive_expiry", "never")
-
-	w := submitCreateForm(env, form)
-	require.Equal(t, http.StatusInternalServerError, w.Code)
-
-	assertNothingCreated(t, env.db)
-}

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"
@@ -86,13 +84,12 @@ var errInjectedDelete = errors.New("injected delete failure")
 // save of an existing row.
 var errInjectedSave = errors.New("injected save failure")
 
-// seedEntrypoint inserts an active entrypoint for a webhook and
+// seedEntrypoint inserts an entrypoint for a webhook.
-// returns it.
 func seedEntrypoint(
 	t *testing.T,
 	db *database.Database,
 	webhookID string,
-) *database.Entrypoint {
+) {
 	t.Helper()
 
 	ep := &database.Entrypoint{
@@ -105,8 +102,6 @@ func seedEntrypoint(
 		t,
 		db.DB().Omit(clause.Associations).Create(ep).Error,
 	)
-
-	return ep
 }
 
 // countRows counts the live (not soft-deleted) rows of a model
@@ -471,121 +466,6 @@ func TestHandleSourceDelete_RemovesConfigAndEventDatabase(
 	)
 }
 
-// TestHandleSourceDelete_LeftoverSidecar proves that when the event
-// database file is removed but a sidecar beside it is not, the
-// operator is told the events are gone, never that the event
-// database file is still there.
-func TestHandleSourceDelete_LeftoverSidecar(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h    *handlers.Handlers
-		sess *session.Session
-		db   *database.Database
-		mgr  *database.WebhookDBManager
-	)
-
-	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)
-
-	require.NoError(t, mgr.CreateDB(wh.ID))
-	// 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",
-		cookies,
-		map[string]string{paramSourceID: wh.ID},
-	)
-	w := httptest.NewRecorder()
-
-	h.HandleSourceDelete().ServeHTTP(w, req)
-
-	assert.Equal(t, http.StatusInternalServerError, w.Code)
-	assert.NoFileExists(t, eventDBPath)
-	assert.Contains(t, logs.String(), "its events are gone")
-	assert.Contains(t, logs.String(), eventDBPath+"-wal")
-	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
-// event database file itself cannot be removed, the operator is told
-// it is still on disk, never that its events are gone.
-func TestHandleSourceDelete_LeftoverDatabaseFile(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h    *handlers.Handlers
-		sess *session.Session
-		db   *database.Database
-		mgr  *database.WebhookDBManager
-	)
-
-	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.

internal/handlers/source_detail_test.go

@@ -234,7 +234,7 @@ func TestHandleSourceDetail_RendersNamedTargetFields(
 	assert.NotContains(t, body, "sekrit")
 
 	assert.Contains(t, body, "Archive Expiry")
-	assert.Contains(t, body, "30 days")
+	assert.Contains(t, body, "720h")
 
 	// An unknown type gets the neutral placeholder, never the
 	// stored blob.
@@ -275,99 +275,3 @@ func TestHandleSourceDetail_FitsWideAndNarrowWindows(t *testing.T) {
 		`<div class="flex flex-wrap justify-between items-center gap-2 mt-2">`,
 	)
 }
-
-// TestHandleSourceDetail_DeletePromptsNameWhatIsLost checks that each
-// delete prompt on the webhook page names the webhook, entrypoint or
-// target and says what deleting it loses, that the webhook's gives its
-// number of stored events (5 received, 2 removed by retention, so 3,
-// the statistics pane's "Within retention" figure), and that an
-// entrypoint with no description is named by its URL. The template
-// writes the slashes after http: as \/, which the browser reads as /.
-func TestHandleSourceDetail_DeletePromptsNameWhatIsLost(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 := seedWebhook(t, db)
-
-	webhookDB, err := dbMgr.GetDB(wh.ID)
-	require.NoError(t, err)
-	require.NoError(t, database.AddEventTotals(
-		webhookDB, database.EventTotals{Events: 5, EventsRemoved: 2},
-	))
-
-	unnamed := seedEntrypoint(t, db, wh.ID)
-	require.NoError(t, db.DB().Omit(clause.Associations).Create(
-		&database.Entrypoint{
-			WebhookID:   wh.ID,
-			Path:        "described-" + wh.ID,
-			Description: "Stripe",
-			Active:      true,
-		},
-	).Error)
-	seedTarget(t, db, wh.ID, database.TargetTypeLog)
-
-	body := renderSourceDetailPage(t, h, sess, wh.ID)
-
-	assert.Contains(t, body,
-		`Delete webhook &quot;delete-me&quot;?\n\n`+
-			`This deletes its stored events (3) and their deliveries. `+
-			`Any archive files it wrote are kept.`)
-	assert.Contains(t, body,
-		`Delete entrypoint &quot;Stripe&quot;?\n\n`+
-			`Senders using its URL get an error from now on, `+
-			`and the URL cannot be restored.`)
-	assert.Contains(t, body,
-		`Delete entrypoint &quot;http:\/\/example.com/h/`+
-			unnamed.Path+`&quot;?`)
-	assert.Contains(t, body,
-		`Delete target &quot;t-log&quot;?\n\n`+
-			`Nothing more is delivered to it. `+
-			`Its past deliveries stay in the event log.`)
-}
-
-// TestHandleSourceDetail_DeletePromptKeepsQuotesInName checks that a
-// webhook name with quotes, a backslash, a closing script tag and a
-// newline reaches its delete prompt escaped for the script, which the
-// browser reads back as the name typed: each quote and angle bracket
-// as a \u escape, the slash as \/, the newline as \n and the backslash
-// doubled. An unescaped newline would break the prompt's script, and
-// the form would then submit without asking.
-func TestHandleSourceDetail_DeletePromptKeepsQuotesInName(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h    *handlers.Handlers
-		sess *session.Session
-		db   *database.Database
-	)
-
-	app := newTestApp(t, &h, &sess, &db)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	wh := &database.Webhook{
-		UserID: deleteTestUserID,
-		Name:   "Bob's \"best\" \\ hook</script>\nline two",
-	}
-	require.NoError(
-		t, db.DB().Omit(clause.Associations).Create(wh).Error,
-	)
-
-	body := renderSourceDetailPage(t, h, sess, wh.ID)
-
-	assert.Contains(t, body,
-		"Delete webhook &quot;Bob\\u0027s \\u0022best\\u0022 \\\\ hook"+
-			"\\u003c\\/script\\u003e\\nline two&quot;?")
-}

internal/handlers/source_logs_deleted_target_test.go

@@ -94,44 +94,6 @@ func TestHandleSourceLogs_NamesDeletedTarget(t *testing.T) {
 	)
 }
 
-// TestHandleSourceLogs_OffersNoReplayForDeletedTarget proves a
-// finished delivery offers Replay while its target lives and not
-// once the target is deleted. A replay to a deleted target is always
-// refused, and recreating the target makes a new one that the old
-// delivery does not name.
-func TestHandleSourceLogs_OffersNoReplayForDeletedTarget(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 := seedWebhook(t, db)
-	tgt := seedTarget(t, db, wh.ID, database.TargetTypeLog)
-
-	_, failed := seedFailedDelivery(t, dbMgr, wh.ID, tgt.ID)
-	replayForm := `action="/hook/` + wh.ID + `/deliveries/` +
-		failed.ID + `/replay"`
-
-	before := renderSourceLogsPage(t, h, sess, wh.ID)
-	assert.Contains(t, before, replayForm)
-
-	deleteTargetThroughHandler(t, h, sess, wh.ID, tgt.ID)
-
-	after := renderSourceLogsPage(t, h, sess, wh.ID)
-	assert.NotContains(t, after, replayForm)
-	assert.NotContains(t, after, ">Replay<")
-	assert.Contains(t, after, tgt.Name+deletedMarker)
-}
-
 // TestHandleSourceLogs_MasksDeletedTargetConfig proves that
 // naming a deleted target does not widen what the page shows of
 // it: its stored configuration stays masked by exactly the rules

internal/handlers/source_logs_test.go

@@ -2,12 +2,9 @@ package handlers_test
 
 import (
 	"context"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"strings"
 	"testing"
-	"time"
 
 	"github.com/go-chi/chi"
 	"github.com/stretchr/testify/assert"
@@ -156,55 +153,3 @@ func TestHandleSourceLogs_MasksSlackWebhookURL(t *testing.T) {
 	assert.Contains(t, body, tgt.Name)
 	assert.Contains(t, body, "delivered")
 }
-
-// TestHandleSourceLogs_ShowsFiftyNewestEvents proves the event log
-// holds the 50 newest events, newest first, and not one more, and says
-// how many events there are in all.
-func TestHandleSourceLogs_ShowsFiftyNewestEvents(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	base := time.Now().Add(-time.Hour)
-
-	for i := range 51 {
-		f.event(
-			t, fmt.Sprintf("application/x-log-%02d", i), "{}",
-			base.Add(time.Duration(i)*time.Second),
-		)
-	}
-
-	body := renderSourceLogsPage(t, f.h, f.sess, f.webhook.ID)
-
-	assert.Equal(t, 50, strings.Count(body, `role="button"`))
-	assert.NotContains(t, body, "application/x-log-00")
-	assert.Contains(t, body, "application/x-log-01")
-	assert.Less(
-		t,
-		strings.Index(body, "application/x-log-50"),
-		strings.Index(body, "application/x-log-49"),
-	)
-	assert.Contains(t, body, "50 most recent of 51 events")
-}
-
-// TestHandleSourceLogs_OnlyNewestStartsExpanded proves that of the
-// events in the log only the newest starts expanded.
-func TestHandleSourceLogs_OnlyNewestStartsExpanded(t *testing.T) {
-	t.Parallel()
-
-	f := newRecentEventsFixture(t)
-	now := time.Now()
-
-	f.event(t, "application/x-older", "{}", now.Add(-time.Minute))
-	f.event(t, "application/x-newer", "{}", now)
-
-	body := renderSourceLogsPage(t, f.h, f.sess, f.webhook.ID)
-
-	assert.Equal(t, 1, strings.Count(body, " data-open>"))
-
-	open := strings.Index(body, " data-open>")
-	newer := strings.Index(body, "application/x-newer")
-	older := strings.Index(body, "application/x-older")
-
-	assert.Less(t, open, newer, "the newest event is not the open one")
-	assert.Less(t, newer, older)
-}

internal/handlers/source_management_test.go

@@ -191,7 +191,6 @@ func storedRetentionDays(
 type sourceTestEnv struct {
 	handlers *handlers.Handlers
 	db       *database.Database
-	dbMgr    *database.WebhookDBManager
 	archives *recordingArchives
 	cookies  []*http.Cookie
 }
@@ -205,11 +204,9 @@ func setupSourceTest(t *testing.T) *sourceTestEnv {
 
 	var db *database.Database
 
-	var dbMgr *database.WebhookDBManager
-
 	var archives *recordingArchives
 
-	app := newTestApp(t, &h, &sess, &db, &dbMgr, &archives)
+	app := newTestApp(t, &h, &sess, &db, &archives)
 	app.RequireStart()
 
 	t.Cleanup(app.RequireStop)
@@ -217,7 +214,6 @@ func setupSourceTest(t *testing.T) *sourceTestEnv {
 	return &sourceTestEnv{
 		handlers: h,
 		db:       db,
-		dbMgr:    dbMgr,
 		archives: archives,
 		cookies: authenticatedCookies(
 			t, sess, sourceTestUserID, "sourceuser",
@@ -509,51 +505,6 @@ func TestHandleSourceEditSubmit_InvalidRetentionIsRejected(
 	)
 }
 
-// TestHandleSourceEditSubmit_RefusedFormComesBack refuses an edit for
-// each reason the form can give and checks that the form comes back
-// with the reason and the name, description and retention submitted,
-// that the page still reports the stored retention, and that nothing
-// is saved.
-func TestHandleSourceEditSubmit_RefusedFormComesBack(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	refused := func(name, retention, reason string) {
-		t.Helper()
-
-		wh := seedWebhookWithRetention(t, env.db, 30)
-
-		submitted := wh
-		submitted.Name = name
-		submitted.Description = "a description worth keeping"
-
-		w := submitEdit(t, env, submitted, retention)
-		assert.Equal(t, http.StatusBadRequest, w.Code)
-
-		page := w.Body.String()
-		assert.Contains(t, page, `class="alert-error">`+reason)
-		assert.Contains(t, page, `name="name" value="`+name+`"`)
-		assert.Contains(t, page, ">a description worth keeping</textarea>")
-		assert.Contains(
-			t, page, `name="retention_days" value="`+retention+`"`,
-		)
-		assert.Contains(t, page, "Currently 30 days.")
-
-		var stored database.Webhook
-
-		require.NoError(
-			t, env.db.DB().First(&stored, "id = ?", wh.ID).Error,
-		)
-		assert.Equal(t, wh.Name, stored.Name)
-		assert.Empty(t, stored.Description)
-		assert.Equal(t, 30, stored.RetentionDays)
-	}
-
-	refused("", "45", "Name is required")
-	refused("kept-name", "nonsense", "Retention must be")
-}
-
 func TestHandleSourceEditSubmit_EmptyRetentionLeavesValueUnchanged(
 	t *testing.T,
 ) {
@@ -854,10 +805,6 @@ func TestHandleSourceEditSubmit_ArchiveNameTaken(t *testing.T) {
 	w := submitEdit(t, env, wh, "")
 	require.Equal(t, http.StatusConflict, w.Code)
 	assert.Contains(t, w.Body.String(), "archive-taken.db")
-	assert.Contains(
-		t, w.Body.String(), `name="name" value="`+renamedWebhookName+`"`,
-		"the form comes back with the name submitted",
-	)
 
 	var stored database.Webhook
 

internal/handlers/target_create_test.go

@@ -1,154 +0,0 @@
-package handlers_test
-
-import (
-	"html"
-	"net/http"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-)
-
-// TestHandleTargetCreate_EveryType adds a target of each type. Each
-// submission carries a url: only the http and slack types store one.
-func TestHandleTargetCreate_EveryType(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	// fields is the rest of each submission, as a query string.
-	cases := []struct {
-		targetType  database.TargetType
-		fields      string
-		wantConfig  string
-		wantRetries int
-	}{
-		{
-			database.TargetTypeHTTP, "timeout=12&max_retries=3",
-			`{"url":"` + editOriginalURL + `","timeout":12}`, 3,
-		},
-		{
-			database.TargetTypeSlack, "max_retries=4",
-			`{"webhookUrl":"` + editOriginalURL + `"}`, 4,
-		},
-		{
-			database.TargetTypeDatabase, "expiry=720h",
-			`{"expiry":"720h"}`, 0,
-		},
-		{database.TargetTypeLog, "", "", 0},
-	}
-
-	for _, tc := range cases {
-		t.Run(string(tc.targetType), func(t *testing.T) {
-			t.Parallel()
-
-			webhook := seedWebhookWithRetention(t, env.db, 30)
-
-			form, err := url.ParseQuery(tc.fields)
-			require.NoError(t, err)
-			form.Set("name", "every-type")
-			form.Set("type", string(tc.targetType))
-			form.Set("url", editOriginalURL)
-
-			w := serveTarget(
-				env, http.MethodPost,
-				"/hook/"+webhook.ID+"/targets", form,
-			)
-			require.Equal(t, http.StatusSeeOther, w.Code, w.Body.String())
-
-			targets := targetsForWebhook(t, env.db, webhook.ID)
-			require.Len(t, targets, 1)
-			assert.Equal(t, tc.targetType, targets[0].Type)
-			assert.Equal(t, tc.wantRetries, targets[0].MaxRetries)
-
-			if tc.wantConfig == "" {
-				assert.Empty(t, targets[0].Config)
-			} else {
-				assert.JSONEq(t, tc.wantConfig, targets[0].Config)
-			}
-		})
-	}
-}
-
-// TestHandleTargetCreate_RefusedFormComesBack refuses a target of each
-// type and checks that the webhook page comes back with the add target
-// form open on that type, the values entered, and the reason.
-func TestHandleTargetCreate_RefusedFormComesBack(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	// fields is what the operator typed, as a query string.
-	cases := []struct {
-		targetType database.TargetType
-		fields     string
-		reason     string
-	}{
-		{
-			database.TargetTypeHTTP,
-			"name=private&url=" + editBlockedURL +
-				"&timeout=12&max_retries=3",
-			"Invalid target URL",
-		},
-		{
-			database.TargetTypeSlack, "name=no-url&max_retries=4",
-			"Webhook URL is required for Slack targets",
-		},
-		{
-			database.TargetTypeDatabase, "name=archive&expiry=7d",
-			"Invalid archive expiry",
-		},
-		{database.TargetTypeLog, "name=", "Name is required"},
-	}
-
-	for _, tc := range cases {
-		t.Run(string(tc.targetType), func(t *testing.T) {
-			t.Parallel()
-
-			webhook := seedWebhookWithRetention(t, env.db, 30)
-
-			typed, err := url.ParseQuery(tc.fields)
-			require.NoError(t, err)
-
-			form := url.Values{}
-			form.Set("type", string(tc.targetType))
-
-			for field := range typed {
-				form.Set(field, typed.Get(field))
-			}
-
-			w := serveTarget(
-				env, http.MethodPost,
-				"/hook/"+webhook.ID+"/targets", form,
-			)
-			assert.Equal(t, http.StatusBadRequest, w.Code)
-
-			page := w.Body.String()
-			assert.Contains(
-				t, page, `data-type="`+string(tc.targetType)+`"`,
-			)
-			assert.Contains(t, page, html.EscapeString(tc.reason))
-
-			// Each value comes back in a data attribute of the targets
-			// section named after its field (max_retries as
-			// data-max-retries), except url, which comes back in
-			// data-destination; templates/source_detail.html says why.
-			for field := range typed {
-				attr := "data-" + strings.ReplaceAll(field, "_", "-")
-				if field == "url" {
-					attr = "data-destination"
-				}
-
-				assert.Contains(
-					t, page, attr+`="`+
-						html.EscapeString(typed.Get(field))+`"`,
-				)
-			}
-
-			assert.Empty(t, targetsForWebhook(t, env.db, webhook.ID))
-		})
-	}
-}

internal/handlers/target_download.go

@@ -1,147 +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.listTargetArchive(w, r)
-		if !ok {
-			return
-		}
-
-		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)
-}
-
-// listTargetArchive lists the archive files of the request's database
-// target for export. 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 lists the files, so the files it lists
-// are the ones those names give. It lets go before the export is
-// streamed, which takes renameMu again for each file only while it
-// finds the file under the names stored then and opens it.
-func (h *Handlers) listTargetArchive(
-	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.NewArchiveExport(
-		delivery.ArchivePath(h.dbMgr, &webhook, target),
-		&h.renameMu,
-		func() (string, error) {
-			return h.storedArchivePath(webhook.ID, target.ID)
-		},
-		h.log,
-	)
-	if err != nil {
-		h.serverError(w, r, "failed to list archive for export", err)
-
-		return database.Webhook{}, nil, nil, false
-	}
-
-	return webhook, target, export, true
-}
-
-// storedArchivePath returns the path delivery.ArchivePath gives a
-// database target under the names stored for it and its webhook now.
-// Its caller holds renameMu. A webhook or target deleted since is still
-// found, since deleting one leaves its archive files under their names.
-func (h *Handlers) storedArchivePath(
-	webhookID, targetID string,
-) (string, error) {
-	var webhook database.Webhook
-
-	err := h.db.DB().Unscoped().First(&webhook, "id = ?", webhookID).Error
-	if err != nil {
-		return "", err
-	}
-
-	var target database.Target
-
-	err = h.db.DB().Unscoped().First(&target, "id = ?", targetID).Error
-	if err != nil {
-		return "", err
-	}
-
-	return delivery.ArchivePath(h.dbMgr, &webhook, &target), nil
-}

internal/handlers/target_download_test.go

@@ -1,451 +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"
-	"os"
-	"strings"
-	"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 lists 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)
-}
-
-// startStalledDownload starts a download of the target and returns once
-// it is stalled at its first write, which comes before it opens any
-// archive file. Closing the writer's resume lets it go on; the returned
-// channel is closed when it has finished.
-func startStalledDownload(
-	t *testing.T, env *sourceTestEnv, webhookID, targetID string,
-) (*stalledWriter, <-chan struct{}) {
-	t.Helper()
-
-	req := httptest.NewRequestWithContext(
-		t.Context(), http.MethodGet, downloadPath(webhookID, targetID), 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
-
-	return sw, downloaded
-}
-
-// TestHandleTargetDownload_StreamsWithoutTheLock proves a download
-// lets go of the rename lock once it has listed its archive: 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)
-
-	sw, downloaded := startStalledDownload(t, env, wh.ID, archive.ID)
-
-	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)
-}
-
-// TestHandleTargetDownload_FindsFilesAfterRename proves a download
-// finds each of the target's files again under the names stored when
-// it reaches the file: the target is renamed while the download is
-// stalled before it has opened any file, and the rows of both its files
-// are in the download.
-func TestHandleTargetDownload_FindsFilesAfterRename(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-	wh := seedWebhookWithRetention(t, env.db, 7)
-	archive := seedTarget(t, env.db, wh.ID, database.TargetTypeDatabase)
-	oldPath := delivery.ArchivePath(env.dbMgr, &wh, archive)
-
-	month := func(path string) string {
-		return strings.TrimSuffix(path, ".db") + "-2026-10.db"
-	}
-
-	seedArchive(t, oldPath, 1, 16)
-	seedArchive(t, month(oldPath), 1, 16)
-
-	sw, downloaded := startStalledDownload(t, env, wh.ID, archive.ID)
-
-	require.Equal(t,
-		http.StatusSeeOther, renameTarget(env, wh.ID, archive.ID).Code,
-	)
-
-	// The test's archives record a rename without moving any file, so
-	// the files are moved here, as the delivery engine moves them.
-	var renamed database.Target
-
-	require.NoError(t, env.db.DB().First(&renamed, "id = ?", archive.ID).Error)
-
-	newPath := delivery.ArchivePath(env.dbMgr, &wh, &renamed)
-
-	require.NoError(t, os.Rename(oldPath, newPath))
-	require.NoError(t, os.Rename(month(oldPath), month(newPath)))
-
-	close(sw.resume)
-	<-downloaded
-	require.Equal(t, http.StatusOK, sw.Code)
-
-	zr, err := gzip.NewReader(sw.Body)
-	require.NoError(t, err)
-
-	var (
-		got    map[string]json.RawMessage
-		events []map[string]any
-	)
-
-	require.NoError(t, json.NewDecoder(zr).Decode(&got))
-	require.NoError(t, json.Unmarshal(got["archived_events"], &events))
-	require.Len(t, events, 2)
-	assert.NotContains(t, events[0], "period")
-	assert.Equal(t, "2026-10", events[1]["period"])
-}
-
-// 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

@@ -3,7 +3,6 @@ package handlers
 import (
 	"errors"
 	"net/http"
-	"strconv"
 
 	"github.com/go-chi/chi"
 	"sneak.berlin/go/webhooker/internal/database"
@@ -14,13 +13,10 @@ import (
 const targetEditTemplate = "target_edit.html"
 
 // tmplKeyTarget is the template data key for the target being
-// edited, tmplKeyTargetForm for the values its form shows, and
+// edited, and tmplKeyMaxTimeout for the timeout ceiling the form
-// tmplKeyMaxTimeout for the timeout ceiling the form tells the user
+// tells the user about.
-// about. The add target form on the webhook page takes its values
-// under the same key as the edit form.
 const (
 	tmplKeyTarget     = "Target"
-	tmplKeyTargetForm = "TargetForm"
 	tmplKeyMaxTimeout = "MaxTimeout"
 )
 
@@ -32,19 +28,20 @@ const configUnreadableMessage = "The stored configuration for this " +
 	"target could not be read. Enter the values below; saving " +
 	"replaces the stored configuration."
 
-// targetEditView is the display model for the target edit page: the
+// targetEditView is the display model for the target edit page.
-// target's row fields as stored. The values the form shows, the
-// UNMASKED configuration among them, come separately, as a
-// targetFormInput.
 //
-// It deliberately omits database.Target's raw Config blob: the form
+// It carries the target's row fields alongside its UNMASKED
-// renders named fields, and giving the template the blob as well
+// configuration, and deliberately omits database.Target's raw
-// would put an unreviewed second path to the credential on the page.
+// Config blob: the form renders named fields, and giving the
+// template the blob as well would put an unreviewed second path to
+// the credential on the page.
 type targetEditView struct {
 	ID         string
 	Name       string
 	Type       database.TargetType
 	Active     bool
+	MaxRetries int
+	Config     delivery.TargetConfigForm
 }
 
 // HandleTargetEdit shows the form to edit a target.
@@ -76,19 +73,7 @@ func (h *Handlers) HandleTargetEdit() http.HandlerFunc {
 			msg = configUnreadableMessage
 		}
 
-		form := targetFormInput{
+		h.renderTargetEdit(w, r, webhook, target, cfg, msg)
-			Name:       target.Name,
-			URL:        cfg.URL,
-			Headers:    cfg.Headers,
-			Timeout:    cfg.Timeout,
-			MaxRetries: strconv.Itoa(target.MaxRetries),
-			Expiry:     cfg.Expiry,
-			Rotation:   cfg.Rotation,
-		}
-
-		h.renderTargetEdit(
-			w, r, webhook, target, form, msg, http.StatusOK,
-		)
 	}
 }
 
@@ -116,12 +101,11 @@ func (h *Handlers) HandleTargetEditSubmit() http.HandlerFunc {
 	}
 }
 
-// applyTargetEdit validates and saves target edits. A refused save
+// applyTargetEdit validates and saves target edits.
-// shows the edit form again with the values submitted and the reason.
 //
-// The submission goes through setTargetFromForm, as a new target
+// The submitted configuration goes through buildTargetConfig, the
-// does, so an edited destination is SSRF-validated exactly as a new
+// same builder the create path uses, so an edited destination is
-// one is.
+// SSRF-validated exactly as a new one is.
 //
 // The target's type is not editable. Each type stores a different
 // configuration shape and its delivery history is recorded against
@@ -134,40 +118,57 @@ func (h *Handlers) applyTargetEdit(
 	webhook database.Webhook,
 	target *database.Target,
 ) {
-	in := targetFormInputFrom(r)
+	name := r.PostFormValue("name")
-
+	if name == "" {
-	// edited is the target as the submission leaves it; target stays
+		http.Error(
-	// as stored, for the page shown again when the save is refused.
+			w, "Name is required", http.StatusBadRequest,
-	edited := *target
-
-	errMsg, err := h.setTargetFromForm(r.Context(), &edited, in)
-	if err != nil {
-		h.serverError(w, r, "failed to encode target config", err)
-
-		return
-	}
-
-	if errMsg != "" {
-		h.renderTargetEdit(
-			w, r, webhook, target, in, errMsg, http.StatusBadRequest,
 		)
 
 		return
 	}
 
+	configJSON, err := h.buildTargetConfig(
+		w, r, target.Type, targetFormInputFrom(r),
+	)
+	if err != nil {
+		// buildTargetConfig has already written the response.
+		return
+	}
+
+	// Retries are offered only by the forms for target types that
+	// retry, so an absent field means "this form does not edit
+	// retries" rather than "set them to zero". Reading it
+	// unconditionally would silently disable retries on any target
+	// saved from a form that does not render the input.
+	//
+	// A field that IS submitted but does not parse is a 400, through
+	// the same validator the create path uses. It is rejected before
+	// anything is written, so a typo cannot destroy the retry count
+	// the target is already delivering with.
+	if r.PostForm.Has("max_retries") {
+		retries, ok := targetMaxRetries(w, r, target.MaxRetries)
+		if !ok {
+			return
+		}
+
+		target.MaxRetries = retries
+	}
+
+	oldName := target.Name
+	target.Name = name
+	target.Config = configJSON
+
 	// A new name renames the archive file before it is saved (see
 	// delivery.Engine.Rename). If either step fails, it goes back to
 	// the name that is still stored.
-	err = h.renameTargetArchive(
+	err = h.renameTargetArchive(target, webhook.Name, oldName, name)
-		target, webhook.Name, target.Name, edited.Name,
-	)
 	if err == nil {
-		err = h.db.DB().Save(&edited).Error
+		err = h.db.DB().Save(target).Error
 	}
 
 	if err != nil {
 		restoreErr := h.renameTargetArchive(
-			target, webhook.Name, edited.Name, target.Name,
+			target, webhook.Name, name, oldName,
 		)
 		if restoreErr != nil {
 			h.log.Error(
@@ -178,8 +179,8 @@ func (h *Handlers) applyTargetEdit(
 		}
 
 		if errors.Is(err, delivery.ErrArchiveNameTaken) {
-			h.renderTargetEdit(
+			http.Error(
-				w, r, webhook, target, in,
+				w,
 				"Not saved: "+err.Error()+
 					". Move that archive out of the data directory, "+
 					"its .db together with any -wal and -shm beside "+
@@ -216,17 +217,15 @@ func (h *Handlers) renameTargetArchive(
 	return h.archives.Rename(target.ID, webhookName, newName)
 }
 
-// renderTargetEdit renders the target edit page for the target as
+// renderTargetEdit renders the target edit page with an optional
-// stored, its form showing form's values, with an optional error
+// error message.
-// message above it.
 func (h *Handlers) renderTargetEdit(
 	w http.ResponseWriter,
 	r *http.Request,
 	webhook database.Webhook,
 	target *database.Target,
-	form targetFormInput,
+	cfg delivery.TargetConfigForm,
 	errMsg string,
-	status int,
 ) {
 	// The template calls Webhook methods, which take pointer
 	// receivers; html/template cannot address a value stored in a
@@ -238,17 +237,14 @@ func (h *Handlers) renderTargetEdit(
 			Name:       target.Name,
 			Type:       target.Type,
 			Active:     target.Active,
+			MaxRetries: target.MaxRetries,
+			Config:     cfg,
 		},
-		tmplKeyTargetForm:           form,
 		tmplKeyMaxTimeout: delivery.MaxTargetTimeoutSeconds,
 		tmplKeyError:      errMsg,
-		tmplKeyArchiveExpiryChoices: archiveExpiryOptions(form.Expiry),
-		tmplKeyArchiveRotationChoices: archiveRotationOptions(
-			form.Rotation,
-		),
 	}
 
-	h.renderTemplateStatus(w, r, targetEditTemplate, data, status)
+	h.renderTemplate(w, r, targetEditTemplate, data)
 }
 
 // ownedTarget resolves the request's sourceID and targetID

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(),
@@ -565,78 +561,6 @@ func assertEditRejectsTimeout(
 	)
 }
 
-// TestHandleTargetEditSubmit_RefusedFormComesBack refuses an edit of
-// a target of each type and checks that the edit form comes back with
-// the reason and every value submitted, and that nothing is saved.
-func TestHandleTargetEditSubmit_RefusedFormComesBack(t *testing.T) {
-	t.Parallel()
-
-	env := setupSourceTest(t)
-
-	// fields is what the operator submitted, as a query string.
-	cases := []struct {
-		targetType database.TargetType
-		fields     string
-		reason     string
-	}{
-		{
-			database.TargetTypeHTTP,
-			"name=edited&url=" + editBlockedURL +
-				"&headers=X-Edited:+kept&timeout=12&max_retries=3",
-			"Invalid target URL",
-		},
-		{
-			database.TargetTypeSlack,
-			"name=edited&url=" + editOriginalURL + "&max_retries=25",
-			"Invalid max retries",
-		},
-		{
-			database.TargetTypeDatabase,
-			"name=edited&expiry=7d&rotation=daily",
-			"Invalid archive expiry",
-		},
-		{database.TargetTypeLog, "name=", "Name is required"},
-	}
-
-	for _, tc := range cases {
-		t.Run(string(tc.targetType), func(t *testing.T) {
-			t.Parallel()
-
-			webhook := seedWebhookWithRetention(t, env.db, 30)
-			target := seedTarget(t, env.db, webhook.ID, tc.targetType)
-
-			form, err := url.ParseQuery(tc.fields)
-			require.NoError(t, err)
-
-			w := submitTargetEdit(env, webhook.ID, target.ID, form)
-			assert.Equal(t, http.StatusBadRequest, w.Code)
-
-			page := w.Body.String()
-			assert.Contains(t, page, `class="alert-error">`+tc.reason)
-
-			// headers is the form's one textarea, and expiry and
-			// rotation its selects; every other field is an input.
-			for field := range form {
-				shown := `name="` + field + `" value="` + form.Get(field) + `"`
-
-				switch field {
-				case "headers":
-					shown = ">" + form.Get(field) + "</textarea>"
-				case "expiry", "rotation":
-					shown = `<option value="` + form.Get(field) + `" selected>`
-				}
-
-				assert.Contains(t, page, shown)
-			}
-
-			assert.Equal(
-				t, target.Name, storedTarget(t, env, target.ID).Name,
-				"a refused edit must save nothing",
-			)
-		})
-	}
-}
-
 // TestHandleTargetEdit_Scoping keeps the edit routes scoped the way
 // the delete and toggle routes are: ownership is decided by the
 // webhook, and the target is then scoped to it.
@@ -772,10 +696,6 @@ func TestHandleTargetEditSubmit_RenamesArchive(t *testing.T) {
 	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.Contains(
-		t, w.Body.String(), `name="name" value="Again"`,
-		"the form comes back with the name submitted",
-	)
 	assert.Equal(
 		t, renamedTargetName, storedTarget(t, env, archive.ID).Name,
 	)

internal/handlers/target_list.go

@@ -1,290 +0,0 @@
-package handlers
-
-import (
-	"errors"
-	"fmt"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/dustin/go-humanize"
-	"gorm.io/gorm"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
-)
-
-// TargetRowView is one row of the target list on a webhook's page.
-type TargetRowView struct {
-	delivery.TargetView
-
-	// Deliveries counts the target's delivered and failed deliveries,
-	// and is nil when the webhook's event database could not be read.
-	Deliveries *TargetDeliveries
-
-	// Archive is a database target's archive files, and nil for a
-	// target of any other type.
-	Archive *ArchiveFileView
-
-	// Paused is set while the target's circuit breaker is turning its
-	// deliveries away, and nil otherwise.
-	Paused *PausedView
-}
-
-// PausedView is a target's circuit breaker turning deliveries away.
-// While the breaker is open, Until is a time in UTC, and Relative how
-// long that is from now: on the target's row, when the cooldown ends;
-// on a delivery, the earliest it can be tried next. While it is
-// half-open both are empty: the cooldown has ended, and the target's
-// deliveries are held while one delivery tests whether the target has
-// recovered.
-type PausedView struct {
-	Until    string
-	Relative string
-}
-
-// pausedView reads the target's circuit breaker for its row, and
-// returns nil when the breaker lets the target's deliveries through.
-func (h *Handlers) pausedView(targetID string) *PausedView {
-	state, cooldown := h.breakers.StateAndCooldown(targetID)
-
-	switch {
-	case state == delivery.CircuitHalfOpen:
-		return &PausedView{}
-	case state == delivery.CircuitOpen && cooldown > 0:
-		return newPausedView(time.Now().Add(cooldown))
-	default:
-		return nil
-	}
-}
-
-// deliveryPausedView reads the circuit breaker of a retrying delivery's
-// target. While it is open, it says the earliest the delivery can be
-// tried next: the later of the cooldown's end and the end of the
-// delivery's own backoff after its last attempt. It is only the
-// earliest: when the cooldown ends, one of the target's waiting
-// deliveries is sent to test it while the others wait at least one more
-// cooldown. Otherwise it returns nil, half-open included, since the
-// delivery may then be the one being sent to test the target.
-func (h *Handlers) deliveryPausedView(
-	targetID string, attempts []deliveryResultRow,
-) *PausedView {
-	state, cooldown := h.breakers.StateAndCooldown(targetID)
-	if state != delivery.CircuitOpen || cooldown <= 0 {
-		return nil
-	}
-
-	next := time.Now().Add(cooldown)
-
-	if len(attempts) > 0 {
-		last := attempts[len(attempts)-1]
-
-		backoffEnd := last.CreatedAt.Add(delivery.Backoff(last.AttemptNum))
-		if backoffEnd.After(next) {
-			next = backoffEnd
-		}
-	}
-
-	return newPausedView(next)
-}
-
-// newPausedView is a PausedView of deliveries paused until the given
-// time. A time not on the current UTC day is written with its date.
-func newPausedView(until time.Time) *PausedView {
-	until = until.UTC()
-
-	layout := time.TimeOnly
-	if until.Format(time.DateOnly) != time.Now().UTC().Format(time.DateOnly) {
-		layout = time.DateTime
-	}
-
-	return &PausedView{
-		Until:    until.Format(layout) + " UTC",
-		Relative: humanize.Time(until),
-	}
-}
-
-// TargetDeliveries is how many of a target's deliveries became
-// delivered and how many failed: in total, which retention does not
-// reduce, and in the last 24 hours. Deliveries still pending or
-// retrying count in neither.
-type TargetDeliveries struct {
-	Delivered int64
-	Failed    int64
-
-	DeliveredLast24Hours int64
-	FailedLast24Hours    int64
-}
-
-// ArchiveFileView is what a database target's row shows about its
-// archive files.
-type ArchiveFileView struct {
-	// Name is the name of the file an event received now goes to.
-	Name string
-
-	// Note says that file does not exist yet, or that the files could
-	// not be read, and is empty otherwise.
-	Note string
-
-	// Files counts the target's archive files, and is 0 when there are
-	// none, or they could not be read, and so no size or last write to
-	// show.
-	Files int
-
-	// Size is the size on disk of all the files together. Written is
-	// how long ago the latest of them was last written, and WrittenUTC
-	// the full time the page shows on hover.
-	Size       string
-	Written    string
-	WrittenUTC string
-}
-
-// targetRows projects a webhook's targets for the target list on its
-// page.
-func (h *Handlers) targetRows(
-	webhook *database.Webhook, targets []database.Target,
-) []TargetRowView {
-	views := delivery.NewTargetViews(targets)
-	rows := make([]TargetRowView, len(views))
-	now := time.Now()
-
-	deliveries, err := h.loadTargetDeliveries(webhook.ID)
-	if err != nil {
-		h.log.Error(
-			"failed to read target delivery counts",
-			"webhook_id", webhook.ID,
-			"error", err,
-		)
-	}
-
-	// NewTargetViews returns one view per target, in order.
-	for i := range views {
-		rows[i].TargetView = views[i]
-
-		if err == nil {
-			counts := deliveries[targets[i].ID]
-			rows[i].Deliveries = &counts
-		}
-
-		if targets[i].Type == database.TargetTypeDatabase {
-			rows[i].Archive = h.archiveFileView(webhook, &targets[i], now)
-		}
-
-		rows[i].Paused = h.pausedView(targets[i].ID)
-	}
-
-	return rows
-}
-
-// loadTargetDeliveries reads the delivery counts of a webhook's targets
-// from its event database, keyed by target. A target with no deliveries
-// is left out, and so is every target when the event database does not
-// exist yet, since opening it would create it.
-func (h *Handlers) loadTargetDeliveries(
-	webhookID string,
-) (map[string]TargetDeliveries, error) {
-	if !h.dbMgr.DBExists(webhookID) {
-		return map[string]TargetDeliveries{}, nil
-	}
-
-	webhookDB, err := h.dbMgr.GetDB(webhookID)
-	if err != nil {
-		return nil, err
-	}
-
-	return readTargetDeliveries(webhookDB, time.Now())
-}
-
-// readTargetDeliveries counts each target's deliveries that became
-// delivered and those that failed: in total from the targets' running
-// totals, and in the 24 hours before now from the deliveries' status
-// index. Each is one query for all the targets, and neither reads every
-// stored delivery.
-func readTargetDeliveries(
-	db *gorm.DB, now time.Time,
-) (map[string]TargetDeliveries, error) {
-	var totals []database.TargetTotals
-
-	err := db.Find(&totals).Error
-	if err != nil {
-		return nil, fmt.Errorf("reading target totals: %w", err)
-	}
-
-	lastDay, err := finishedByTarget(db, now.Add(-longWindow))
-	if err != nil {
-		return nil, err
-	}
-
-	byTarget := make(map[string]TargetDeliveries, len(totals))
-
-	for _, total := range totals {
-		byTarget[total.TargetID] = TargetDeliveries{
-			Delivered: total.Delivered,
-			Failed:    total.Failed,
-		}
-	}
-
-	for _, finished := range lastDay {
-		counts := byTarget[finished.TargetID]
-		counts.DeliveredLast24Hours = finished.Delivered
-		counts.FailedLast24Hours = finished.Failed
-		byTarget[finished.TargetID] = counts
-	}
-
-	return byTarget, nil
-}
-
-// archiveFileView describes a database target's archive files from
-// their metadata alone; the archive is never opened. It names the file
-// an event received at now goes to. The files are found by the name
-// the archive writer uses, so they follow a rename of the webhook or
-// the target.
-func (h *Handlers) archiveFileView(
-	webhook *database.Webhook, target *database.Target, now time.Time,
-) *ArchiveFileView {
-	current, err := delivery.ArchivePathAt(h.dbMgr, webhook, target, now)
-	if err != nil {
-		return h.archiveUnreadable(&ArchiveFileView{}, target, err)
-	}
-
-	view := &ArchiveFileView{Name: filepath.Base(current)}
-
-	_, statErr := os.Stat(current)
-	if errors.Is(statErr, fs.ErrNotExist) {
-		view.Note = "not created yet"
-	}
-
-	files, err := delivery.StatArchive(
-		delivery.ArchivePath(h.dbMgr, webhook, target),
-	)
-
-	switch {
-	case errors.Is(err, fs.ErrNotExist):
-		// No files: no size or last write to show.
-	case err != nil:
-		return h.archiveUnreadable(view, target, err)
-	default:
-		view.Files = files.Files
-		view.Size = humanize.Bytes(uint64(files.Size)) //nolint:gosec // never negative
-		view.Written = humanize.Time(files.Written)
-		view.WrittenUTC = files.Written.UTC().Format(time.DateTime) + " UTC"
-	}
-
-	return view
-}
-
-// archiveUnreadable logs why a database target's archive files could
-// not be described, and returns view saying so.
-func (h *Handlers) archiveUnreadable(
-	view *ArchiveFileView, target *database.Target, err error,
-) *ArchiveFileView {
-	h.log.Error(
-		"failed to read archive file metadata",
-		"target_id", target.ID,
-		"error", err,
-	)
-
-	view.Note = "could not be read"
-
-	return view
-}

internal/handlers/target_list_test.go

@@ -1,174 +0,0 @@
-package handlers_test
-
-import (
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"sneak.berlin/go/webhooker/internal/database"
-	"sneak.berlin/go/webhooker/internal/delivery"
-	"sneak.berlin/go/webhooker/internal/handlers"
-	"sneak.berlin/go/webhooker/internal/logger"
-	"sneak.berlin/go/webhooker/internal/session"
-)
-
-// TestHandleSourceDetail_ShowsArchiveFile proves a database target's
-// row names its archive file and says "not created yet" before the
-// first write, adds the file's size and last write once it has one row,
-// and says "not created yet" again once the file has been moved away.
-// A target of another type shows no archive file.
-func TestHandleSourceDetail_ShowsArchiveFile(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 := seedWebhook(t, db)
-	archive := seedTarget(t, db, wh.ID, database.TargetTypeDatabase)
-	seedTarget(t, db, wh.ID, database.TargetTypeLog)
-
-	path := delivery.ArchivePath(dbMgr, wh, archive)
-
-	body := renderSourceDetailPage(t, h, sess, wh.ID)
-	assert.Equal(t, 1, strings.Count(body, "Archive File:"))
-	assert.Contains(t, body, filepath.Base(path))
-	assert.Contains(t, body, "not created yet")
-	assert.NotContains(t, body, "Archive Size:")
-
-	seedArchive(t, path, 1, 100)
-
-	file, err := os.Stat(path)
-	require.NoError(t, err)
-
-	body = renderSourceDetailPage(t, h, sess, wh.ID)
-	assert.Contains(t, body, filepath.Base(path))
-	assert.NotContains(t, body, "not created yet")
-	assert.Regexp(t,
-		`Archive Size:</span>\s*<span>[1-9][0-9.]* [kM]?B</span>`, body,
-	)
-	assert.Contains(t, body,
-		`title="`+file.ModTime().UTC().Format(time.DateTime)+` UTC"`,
-	)
-
-	require.NoError(t, os.Rename(path, filepath.Join(t.TempDir(), "moved.db")))
-
-	body = renderSourceDetailPage(t, h, sess, wh.ID)
-	assert.Contains(t, body, filepath.Base(path))
-	assert.Contains(t, body, "not created yet")
-	assert.NotContains(t, body, "Archive Size:")
-}
-
-// targetList returns the text of the targets section in a rendered
-// webhook page, from its heading to the next heading, with the markup
-// taken out and each run of space made one space. Each target's row
-// then reads as its name, type, state and buttons, followed by the
-// lines below them.
-func targetList(t *testing.T, page string) string {
-	t.Helper()
-
-	_, list, found := strings.Cut(page, ">Targets</h2>")
-	require.True(t, found, "the page has no targets section")
-
-	list, _, _ = strings.Cut(list, "<h2")
-	list = regexp.MustCompile(`<[^>]*>`).ReplaceAllString(list, " ")
-
-	return strings.Join(strings.Fields(list), " ")
-}
-
-// TestHandleSourceDetail_ShowsTargetDeliveries checks each target row's
-// delivered and failed deliveries, in total and in the last 24 hours,
-// for the history seedStatsHistory builds, before and after the real
-// retention reaper removes the oldest event. The http target has one
-// delivered, one of them in the last 24 hours, and three failed, one of
-// them in the last 24 hours and one of them the oldest event's, which
-// retention removes without changing the total. The active log target
-// has two failed, both in the last 24 hours, and its pending and
-// retrying deliveries count in neither. The four inactive log targets
-// have none.
-func TestHandleSourceDetail_ShowsTargetDeliveries(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)
-
-	hist := seedStatsHistory(t, h, sess, db, dbMgr)
-
-	const (
-		httpRow = "Delivered: 1 in total, 1 in the last 24 hours " +
-			"Failed: 3 in total, 1 in the last 24 hours"
-		activeLogRow = "t-log log Active Edit Deactivate Delete " +
-			"Delivered: 0 in total, 0 in the last 24 hours " +
-			"Failed: 2 in total, 2 in the last 24 hours"
-		inactiveLogRow = "t-log log Inactive Edit Activate Delete " +
-			"Delivered: 0 in total, 0 in the last 24 hours " +
-			"Failed: 0 in total, 0 in the last 24 hours"
-	)
-
-	list := targetList(t, renderSourceDetailPage(t, h, sess, hist.webhook.ID))
-	assert.Equal(t, 1, strings.Count(list, httpRow))
-	assert.Equal(t, 1, strings.Count(list, activeLogRow))
-	assert.Equal(t, 4, strings.Count(list, inactiveLogRow))
-
-	statsPrune(t, db, dbMgr, log, hist.webhookDB)
-
-	list = targetList(t, renderSourceDetailPage(t, h, sess, hist.webhook.ID))
-	assert.Equal(t, 1, strings.Count(list, httpRow))
-	assert.Equal(t, 1, strings.Count(list, activeLogRow))
-	assert.Equal(t, 4, strings.Count(list, inactiveLogRow))
-}
-
-// TestHandleSourceDetail_TargetDeliveriesUnreadable checks that when the
-// webhook's event database cannot be read, each target's row says so
-// instead of showing zeros.
-func TestHandleSourceDetail_TargetDeliveriesUnreadable(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 := seedWebhook(t, db)
-	seedTarget(t, db, wh.ID, database.TargetTypeLog)
-
-	webhookDB, err := dbMgr.GetDB(wh.ID)
-	require.NoError(t, err)
-	require.NoError(t,
-		webhookDB.Migrator().DropTable(&database.TargetTotals{}))
-
-	list := targetList(t, renderSourceDetailPage(t, h, sess, wh.ID))
-	assert.Contains(t, list, "t-log log Active Edit Deactivate Delete "+
-		"The delivery counts could not be read.")
-	assert.NotContains(t, list, "Delivered:")
-}

internal/handlers/target_paused_test.go

@@ -1,219 +0,0 @@
-package handlers_test
-
-import (
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"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"
-)
-
-// cooldownEnds is how the pages write the end of a paused target's
-// breaker's cooldown: the time in UTC, with its date when that falls on
-// another UTC day, then how long that is from now.
-const cooldownEnds = `(\d{4}-\d\d-\d\d )?\d\d:\d\d:\d\d UTC ` +
-	`\(\d+ seconds from now\)`
-
-// TestPausedTarget_ShownUntilBreakerCloses takes an http target's
-// circuit breaker from open through half-open to closed.
-//
-// Open, the target's row on the webhook page says its deliveries are
-// paused and until when, and each retrying delivery says it is waiting
-// and why in the event log and on the event's page, with the earliest
-// it can be tried next: the later of the cooldown's end and the end of
-// its own backoff, with the date when that is another UTC day.
-// Half-open, the row says deliveries are held while one delivery tests
-// the target, with no time, and no delivery says it is waiting. Closed,
-// the pages say neither. The delivered delivery and the log target are
-// shown as before throughout.
-func TestPausedTarget_ShownUntilBreakerCloses(t *testing.T) {
-	t.Parallel()
-
-	var (
-		h        *handlers.Handlers
-		sess     *session.Session
-		db       *database.Database
-		dbMgr    *database.WebhookDBManager
-		breakers *testCircuitBreakers
-	)
-
-	app := newTestApp(t, &h, &sess, &db, &dbMgr, &breakers)
-	app.RequireStart()
-
-	t.Cleanup(app.RequireStop)
-
-	wh := seedWebhook(t, db)
-	target := seedTarget(t, db, wh.ID, database.TargetTypeHTTP)
-	seedTarget(t, db, wh.ID, database.TargetTypeLog)
-
-	retrying := seedStoredEvent(t, dbMgr, wh.ID, `{"n":1}`)
-	addDelivery(t, dbMgr, wh.ID, retrying.ID, target.ID,
-		database.DeliveryStatusRetrying)
-
-	delivered := seedStoredEvent(t, dbMgr, wh.ID, `{"n":2}`)
-	addDelivery(t, dbMgr, wh.ID, delivered.ID, target.ID,
-		database.DeliveryStatusDelivered)
-
-	// This delivery's 18th attempt failed a minute ago, so its own
-	// backoff ends over a day from now: long after the cooldown, and on
-	// another UTC day, so the page shows the date.
-	backedOff := seedStoredEvent(t, dbMgr, wh.ID, `{"n":3}`)
-	backedOffID := addDelivery(t, dbMgr, wh.ID, backedOff.ID, target.ID,
-		database.DeliveryStatusRetrying)
-
-	failedAt := time.Now().Add(-time.Minute).Truncate(time.Second)
-	addFailedAttempt(t, dbMgr, wh.ID, backedOffID, 18, failedAt)
-
-	backoffEnds := failedAt.Add(delivery.Backoff(18)).UTC().
-		Format("2006-01-02 15:04:05") + " UTC (1 day from now)"
-
-	const waiting = "waiting: target paused after repeated failures, " +
-		"next try no earlier than "
-
-	breakers.Set(target.ID, delivery.CircuitOpen, 30*time.Second)
-
-	list := targetList(t, renderSourceDetailPage(t, h, sess, wh.ID))
-	assert.Regexp(t, "t-http http Active Edit Deactivate Delete "+
-		"Deliveries Paused: after repeated failures, until "+cooldownEnds+
-		", then one waiting delivery is sent to test the target while "+
-		"the others wait at least one more cooldown", list)
-	assert.Equal(t, 1, strings.Count(list, "Paused"))
-
-	log := renderSourceLogsPage(t, h, sess, wh.ID)
-	assert.Equal(t, 2, strings.Count(log, "t-http: waiting"))
-	assert.Contains(t, log, "t-http: delivered")
-	assert.Regexp(t, waiting+cooldownEnds, log)
-	assert.Contains(t, log, waiting+backoffEnds)
-	assert.NotContains(t, log, "retrying")
-
-	page := eventPage(t, h, sess, wh.ID, retrying.ID)
-	assert.Regexp(t, waiting+cooldownEnds, page)
-	assert.NotContains(t, page, "retrying")
-
-	page = eventPage(t, h, sess, wh.ID, backedOff.ID)
-	assert.Contains(t, page, waiting+backoffEnds)
-	assert.NotContains(t, page, "seconds from now")
-
-	breakers.Set(target.ID, delivery.CircuitHalfOpen, 0)
-
-	list = targetList(t, renderSourceDetailPage(t, h, sess, wh.ID))
-	assert.Contains(t, list, "t-http http Active Edit Deactivate Delete "+
-		"Deliveries Paused: held while one delivery tests whether the "+
-		"target has recovered")
-	// Not the whole list: the add target form above the rows says UTC.
-	assert.NotContains(t, targetRow(list, "t-http", "t-log"), "UTC")
-
-	assertRetryingNotWaiting(t, h, sess, wh.ID, retrying, backedOff)
-
-	breakers.Set(target.ID, delivery.CircuitClosed, 0)
-
-	list = targetList(t, renderSourceDetailPage(t, h, sess, wh.ID))
-	assert.NotContains(t, list, "Paused")
-
-	assertRetryingNotWaiting(t, h, sess, wh.ID, retrying, backedOff)
-}
-
-// targetRow returns the row of the target named name in a targetList:
-// from its name to the name of the target listed after it, next.
-func targetRow(list, name, next string) string {
-	_, row, _ := strings.Cut(list, name+" ")
-	row, _, _ = strings.Cut(row, next+" ")
-
-	return row
-}
-
-// assertRetryingNotWaiting checks that the event log and each event's
-// page show the http target's delivery of the event as retrying, and
-// none of them as waiting.
-func assertRetryingNotWaiting(
-	t *testing.T,
-	h *handlers.Handlers,
-	sess *session.Session,
-	webhookID string,
-	events ...*database.Event,
-) {
-	t.Helper()
-
-	log := renderSourceLogsPage(t, h, sess, webhookID)
-	assert.Equal(t, len(events), strings.Count(log, "t-http: retrying"))
-	assert.NotContains(t, log, "waiting")
-
-	for _, event := range events {
-		page := eventPage(t, h, sess, webhookID, event.ID)
-		assert.Contains(t, page, ">retrying</span>")
-		assert.NotContains(t, page, "waiting")
-	}
-}
-
-// addDelivery records a delivery of the event to the target, with the
-// given status, in the webhook's own database, and returns its ID.
-func addDelivery(
-	t *testing.T,
-	dbMgr *database.WebhookDBManager,
-	webhookID, eventID, targetID string,
-	status database.DeliveryStatus,
-) string {
-	t.Helper()
-
-	webhookDB, err := dbMgr.GetDB(webhookID)
-	require.NoError(t, err)
-
-	dlv := &database.Delivery{
-		EventID:  eventID,
-		TargetID: targetID,
-		Status:   status,
-	}
-
-	require.NoError(t, webhookDB.Omit(clause.Associations).Create(
-		dlv,
-	).Error)
-
-	return dlv.ID
-}
-
-// addFailedAttempt records the delivery's failed attempt attemptNum,
-// made at the given time.
-func addFailedAttempt(
-	t *testing.T,
-	dbMgr *database.WebhookDBManager,
-	webhookID, deliveryID string,
-	attemptNum int,
-	at time.Time,
-) {
-	t.Helper()
-
-	webhookDB, err := dbMgr.GetDB(webhookID)
-	require.NoError(t, err)
-
-	require.NoError(t, webhookDB.Omit(clause.Associations).Create(
-		&database.DeliveryResult{
-			BaseModel:  database.BaseModel{CreatedAt: at},
-			DeliveryID: deliveryID,
-			AttemptNum: attemptNum,
-			Error:      "connection refused",
-		},
-	).Error)
-}
-
-// eventPage runs the real event page handler and returns the
-// rendered HTML.
-func eventPage(
-	t *testing.T,
-	h *handlers.Handlers,
-	sess *session.Session,
-	webhookID, eventID string,
-) string {
-	t.Helper()
-
-	w := serveEventPage(t, h, sess, webhookID, eventID)
-	require.Equal(t, http.StatusOK, w.Code)
-
-	return w.Body.String()
-}

internal/handlers/target_private_refusal_test.go

@@ -1,7 +1,6 @@
 package handlers_test
 
 import (
-	"html"
 	"net/http"
 	"net/url"
 	"testing"
@@ -44,16 +43,12 @@ func TestTargetRefusal_PrivateDestinationSaysHowToAllowIt(
 			form.Set("type", string(targetType))
 			form.Set("url", editBlockedURL)
 
-			// A refused add shows the webhook page again, and a
-			// refused edit the edit page, where the hint is
-			// HTML-escaped.
 			added := serveTarget(
 				env, http.MethodPost, targetsPath, form,
 			)
 			assert.Equal(t, http.StatusBadRequest, added.Code)
 			assert.Contains(
-				t, added.Body.String(),
+				t, added.Body.String(), privateRefusalHint,
-				html.EscapeString(privateRefusalHint),
 			)
 
 			form.Set("url", editOriginalURL)
@@ -76,8 +71,7 @@ func TestTargetRefusal_PrivateDestinationSaysHowToAllowIt(
 			)
 			assert.Equal(t, http.StatusBadRequest, edited.Code)
 			assert.Contains(
-				t, edited.Body.String(),
+				t, edited.Body.String(), privateRefusalHint,
-				html.EscapeString(privateRefusalHint),
 			)
 		})
 	}

internal/handlers/target_retries.go

@@ -2,6 +2,7 @@ package handlers
 
 import (
 	"errors"
+	"net/http"
 	"strconv"
 	"strings"
 )
@@ -88,3 +89,31 @@ func retriesErrorMessage(err error) string {
 	return errRetriesInvalid.Error() +
 		", or 0 for fire-and-forget"
 }
+
+// targetMaxRetries reads and validates max_retries from a target form
+// submission, answering the request with a 400 and reporting false
+// when the value is set but invalid.
+//
+// Both the create and the edit path go through here, so the two
+// cannot come to disagree about what a valid retry count is. The
+// wording matches the timeout control on the same submission.
+func targetMaxRetries(
+	w http.ResponseWriter,
+	r *http.Request,
+	fallback int,
+) (int, bool) {
+	retries, err := parseMaxRetries(
+		r.PostFormValue("max_retries"), fallback,
+	)
+	if err != nil {
+		http.Error(
+			w,
+			"Invalid max retries: "+retriesErrorMessage(err),
+			http.StatusBadRequest,
+		)
+
+		return 0, false
+	}
+
+	return retries, true
+}

internal/handlers/target_retries_test.go

@@ -383,3 +383,20 @@ func TestTargetRetries_CreateAndEditAgreeOnEveryCase(t *testing.T) {
 		)
 	}
 }
+
+// TestPageOrFirst_CoercesRatherThanRejects pins the one place a
+// non-numeric form value legitimately falls back. A page number says
+// where to send the browser after an action that has already
+// happened, so it is not configuration and rejecting it would report
+// a failure that did not occur.
+func TestPageOrFirst_CoercesRatherThanRejects(t *testing.T) {
+	t.Parallel()
+
+	for _, s := range []string{"", "abc", "0", "-1", "2.7", " "} {
+		assert.Equal(t, 1, handlers.PageOrFirstForTest(s),
+			"%q should fall back to the first page", s)
+	}
+
+	assert.Equal(t, 4, handlers.PageOrFirstForTest("4"))
+	assert.Equal(t, 4, handlers.PageOrFirstForTest(" 4 "))
+}

internal/handlers/ui_copy_test.go

@@ -21,7 +21,6 @@ import (
 const (
 	dataKeyWebhook = "Webhook"
 	dataKeyError   = "Error"
-	dataKeyEvents  = "Events"
 )
 
 // testWebhookID is the identifier given to the webhook under test on
@@ -145,10 +144,9 @@ func TestEventLogPageIsCalledFullEventLog(t *testing.T) {
 	t.Cleanup(app.RequireStop)
 
 	// A pointer, as in the handlers: source_detail.html calls
-	// Webhook.RetentionLabel, a pointer method. The webhook page only
+	// Webhook.RetentionLabel, a pointer method. Both pages only range
-	// ranges over its lists, and a list left out renders as empty, so
+	// over their lists, and a list left out renders as empty, so the
-	// its lists are left out. The event log also counts its events, so
+	// lists are left out.
-	// it gets an empty list.
 	webhook := &database.Webhook{Name: "wh", RetentionDays: 14}
 	webhook.ID = testWebhookID
 
@@ -171,7 +169,6 @@ func TestEventLogPageIsCalledFullEventLog(t *testing.T) {
 
 	logBody := renderPage(t, h, sess, "source_logs.html", map[string]any{
 		dataKeyWebhook: webhook,
-		dataKeyEvents:  []handlers.EventLogView{},
 		"TotalEvents":  int64(0),
 	})
 
@@ -199,6 +196,8 @@ func TestCreateFormRetentionCopyMatchesBehaviour(t *testing.T) {
 	t.Cleanup(app.RequireStop)
 
 	body := renderPage(t, h, sess, "sources_new.html", map[string]any{
+		"Name":                 "",
+		"Description":          "",
 		"DefaultRetentionDays": database.DefaultRetentionDays,
 		dataKeyError:           "",
 	})
@@ -321,7 +320,7 @@ func TestEntrypointCopyButtonIsProgressiveEnhancement(t *testing.T) {
 			[]database.Entrypoint{entrypoint},
 		),
 		"Targets": delivery.NewTargetViews(nil),
-		dataKeyEvents: []database.Event{},
+		"Events":  []database.Event{},
 		"BaseURL": "https://hooks.example.com",
 	})
 
@@ -388,7 +387,7 @@ func TestTargetFormMaxRetriesCopyMatchesBehaviour(t *testing.T) {
 				[]database.Entrypoint{entrypoint},
 			),
 			"Targets": delivery.NewTargetViews(nil),
-			dataKeyEvents: []database.Event{},
+			"Events":  []database.Event{},
 			"BaseURL": "https://hooks.example.com",
 		},
 	)
@@ -399,9 +398,9 @@ func TestTargetFormMaxRetriesCopyMatchesBehaviour(t *testing.T) {
 	)
 
 	// A slack target exercises the same max_retries field while needing
-	// only a URL from the edit template, so the test data stays
+	// only Config.URL from the edit template, so the test data stays
-	// minimal. The Target and TargetForm keys mirror the field names
+	// minimal. The Target key mirrors the field names the template reads
-	// the template reads off the handler's values.
+	// off the handler's view value.
 	editBody := renderPage(
 		t, h, sess, "target_edit.html", map[string]any{
 			dataKeyWebhook: webhook,
@@ -410,10 +409,10 @@ func TestTargetFormMaxRetriesCopyMatchesBehaviour(t *testing.T) {
 				"Name":       "t",
 				"Type":       "slack",
 				"Active":     true,
-			},
+				"MaxRetries": 3,
-			"TargetForm": map[string]any{
+				"Config": map[string]any{
 					"URL": "https://hooks.slack.com/services/x",
-				"MaxRetries": "3",
+				},
 			},
 			dataKeyError: "",
 		},

internal/handlers/webhook.go

@@ -272,12 +272,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.
@@ -326,19 +324,6 @@ func (h *Handlers) createAndFanOut(
 		return nil, nil, err
 	}
 
-	// A resubmitted copy did not arrive on its entrypoint's URL, so it
-	// leaves the entrypoint's last event as it is.
-	if src.ResubmittedFromID == nil {
-		err = database.AddEntrypointTotals(tx, database.EntrypointTotals{
-			EntrypointID: event.EntrypointID, LastEventAt: event.CreatedAt,
-		})
-		if err != nil {
-			tx.Rollback()
-
-			return nil, nil, err
-		}
-	}
-
 	err = tx.Commit().Error
 	if err != nil {
 		return nil, nil, fmt.Errorf(

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++
+	for r := range rune(denseCeiling) {
+		keep(r)
 	}
 
-	return first, count
+	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),
 			)
-			}
 
-			emitted := make([]int, len(batches))
+			for _, r := range chargeTestRunes() {
-			for i, batch := range batches {
+				got := renderedWidth(
-				emitted[i] = emittedBytes(newHandler, "", batch)
+					newHandler,
-			}
+					strings.Repeat(string(r), sampleRunes),
-
-			for i, cost := range charged() {
-				if emitted[i] <= cost {
-					continue
-				}
-
-				lo := rune(0x1000 + i*batchRunes)
-				first, count := firstUndercharged(
-					newHandler, batches[i],
 				)
-				t.Errorf(
+				charged := sampleRunes *
-					"U+%04X to U+%04X emit %d bytes but are "+
+					(logfield.EncodedBytes(r) - 1)
-						"charged %d; %d of them cost more than "+
+
-						"EncodedBytes charges, the first U+%04X",
+				require.LessOrEqual(
-					lo, lo+batchRunes-1, emitted[i], cost,
+					t, got-base, charged+quotingSlack,
-					count, first,
+					"U+%04X costs more on the line than "+
+						"EncodedBytes charges for it",
+					r,
 				)
 			}
 		})