Compare commits
27 Commits
e6af1a7866
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| b99f60c1d6 | |||
| 41c3e6e896 | |||
| c6a75ce775 | |||
| f47cf39802 | |||
| 9edb39a8ee | |||
| f517e8da41 | |||
| 2f888dc7be | |||
| 5598b62e4e | |||
| 32f5085c48 | |||
| 5601f73622 | |||
| e17b1680bd | |||
| 5b63da0e49 | |||
| e9aaed1c7b | |||
| 1bd71c10d0 | |||
| 74acf09212 | |||
| ba07decbb0 | |||
| 4fc5cff266 | |||
| ac8c2af500 | |||
| 9e3f0d0fad | |||
| 403c76d17d | |||
| d9ab7bfa45 | |||
| 18bfd148ec | |||
| e70ba9046e | |||
| 02afa0fa80 | |||
| 97a0c7e508 | |||
| efdc2d63fb | |||
| 8dfb483244 |
@@ -0,0 +1,22 @@
|
|||||||
|
---
|
||||||
|
description: Panel UI mockups use the design system primitives, not a reskin of live templates.
|
||||||
|
globs: docs/assets/panel-ui/**
|
||||||
|
alwaysApply: false
|
||||||
|
---
|
||||||
|
|
||||||
|
# Panel UI system
|
||||||
|
|
||||||
|
Source of truth: [docs/assets/panel-ui/system.html](docs/assets/panel-ui/system.html) and `system.css`.
|
||||||
|
|
||||||
|
Do not copy `internal/web/view/templates` into mockups. Do not mark `<main>` as `ops`/`form` to pick width. Do not fix empty columns, Host/Type height, or split Save/Delete with one-off CSS.
|
||||||
|
|
||||||
|
Compose screens from `stack`, `pair`, `measure`, `fill`, `field-row`, `actions-row`:
|
||||||
|
- Two peer jobs → `pair` (one child shrinks to `measure`).
|
||||||
|
- Tables/logs/DNS → `fill` (nowrap + overflow-x on the card). Add-to-list is a `measure` row inside that card, not a second card above it.
|
||||||
|
- Confirm/login/user form → `measure`.
|
||||||
|
- Host ‖ Type and two equal inputs → `field-row` (shared grid row, not two `.code` paddings).
|
||||||
|
- Save + Delete → `actions-row` inside the card; never submit inside `<form>` and danger after `</form>`.
|
||||||
|
- Danger zone is the second column of the last `pair`, never a full-width `fill`.
|
||||||
|
- Card chrome is title + optional `?` + body + actions. Help is not sprinkled later.
|
||||||
|
- Phone: `pair` stacks; `field-row` does not; tables become lists.
|
||||||
|
- One screen is one HTML file. Shared chrome is `shell.js`. Do not put every screen in one hash-SPA.
|
||||||
@@ -1,11 +1,9 @@
|
|||||||
name: release
|
name: release
|
||||||
|
|
||||||
# Publishes an immutable, version-tagged image on ghcr.io (spec 10.1).
|
# Publishes an immutable, version-tagged image on ghcr.io (spec 10.1).
|
||||||
# Ordinary commits do not publish anything — only a pushed tag matching
|
# Ordinary commits and bare git tag pushes do not publish anything. A published
|
||||||
# vX.Y.Z does. That tag is the single source the version comes from: it goes
|
# GitHub Release runs this workflow directly (same pattern as gosentry / imap-scrub).
|
||||||
# into both the image tag and the panel binary's -ldflags version, so the two
|
# You can also run it manually via workflow_dispatch with an explicit SemVer X.Y.Z.
|
||||||
# can never drift apart (the invariant restore's version check in spec 7.5.A
|
|
||||||
# depends on).
|
|
||||||
#
|
#
|
||||||
# Native per-architecture builds (see docs/development.md), not qemu:
|
# Native per-architecture builds (see docs/development.md), not qemu:
|
||||||
# running the full Postfix/OpenDKIM stack under emulation for the e2e gate
|
# running the full Postfix/OpenDKIM stack under emulation for the e2e gate
|
||||||
@@ -13,14 +11,18 @@ name: release
|
|||||||
# tag on its own native runner; a merge job then combines them into the one
|
# tag on its own native runner; a merge job then combines them into the one
|
||||||
# manifest tag documented in deploy/docker-compose.yml. "test, then push" (not
|
# manifest tag documented in deploy/docker-compose.yml. "test, then push" (not
|
||||||
# push-by-digest then test) is deliberate: it means the bytes that get tagged
|
# push-by-digest then test) is deliberate: it means the bytes that get tagged
|
||||||
# are exactly the bytes that passed e2e, at the cost of per-arch tags lingering
|
# are exactly the bytes that passed e2e. Per-arch tags are pushed only so
|
||||||
# in the registry as a side effect (harmless — the version tag's immutability,
|
# imagetools can assemble the multi-arch manifest; merge removes them from GHCR
|
||||||
# spec 10.1, is about that tag, not these).
|
# so operators see a single version tag (spec 10.1).
|
||||||
on:
|
on:
|
||||||
push:
|
release:
|
||||||
tags:
|
types: [published]
|
||||||
- "v[0-9]+.[0-9]+.[0-9]+"
|
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
inputs:
|
||||||
|
version:
|
||||||
|
description: "Image version as X.Y.Z (no v prefix)."
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
@@ -32,9 +34,25 @@ jobs:
|
|||||||
outputs:
|
outputs:
|
||||||
version: ${{ steps.version.outputs.version }}
|
version: ${{ steps.version.outputs.version }}
|
||||||
steps:
|
steps:
|
||||||
- name: Derive version from tag
|
- name: Derive a SemVer X.Y.Z version
|
||||||
id: version
|
id: version
|
||||||
run: echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT"
|
env:
|
||||||
|
INPUT_VERSION: ${{ github.event.inputs.version }}
|
||||||
|
RELEASE_TAG: ${{ github.event.release.tag_name }}
|
||||||
|
EVENT_NAME: ${{ github.event_name }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
if [ "$EVENT_NAME" = "release" ]; then
|
||||||
|
raw="${RELEASE_TAG:-}"
|
||||||
|
else
|
||||||
|
raw="${INPUT_VERSION:-}"
|
||||||
|
fi
|
||||||
|
raw="${raw#v}"
|
||||||
|
if ! [[ "$raw" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||||
|
echo "::error::release version is not SemVer X.Y.Z (event=${EVENT_NAME}; tag=${RELEASE_TAG:-} input=${INPUT_VERSION:-}). Refusing to publish ghcr.io/${{ github.repository }}:${raw:-?}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "version=${raw}" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
build:
|
build:
|
||||||
needs: prepare
|
needs: prepare
|
||||||
@@ -49,6 +67,8 @@ jobs:
|
|||||||
runs-on: ${{ matrix.runner }}
|
runs-on: ${{ matrix.runner }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: v${{ needs.prepare.outputs.version }}
|
||||||
|
|
||||||
- uses: docker/setup-buildx-action@v3
|
- uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
@@ -113,6 +133,10 @@ jobs:
|
|||||||
needs: [prepare, build]
|
needs: [prepare, build]
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
ref: v${{ needs.prepare.outputs.version }}
|
||||||
|
|
||||||
- uses: docker/setup-buildx-action@v3
|
- uses: docker/setup-buildx-action@v3
|
||||||
|
|
||||||
- name: Log in to ghcr.io
|
- name: Log in to ghcr.io
|
||||||
@@ -152,3 +176,29 @@ jobs:
|
|||||||
attempt=$((attempt + 1))
|
attempt=$((attempt + 1))
|
||||||
backoff=$((backoff * 2))
|
backoff=$((backoff * 2))
|
||||||
done
|
done
|
||||||
|
|
||||||
|
- name: Remove per-arch tags from GHCR
|
||||||
|
# Side-effect tags for imagetools assembly only — not part of the public
|
||||||
|
# version surface (deploy/docker-compose.yml pins X.Y.Z, not X.Y.Z-amd64).
|
||||||
|
# imagetools has no "rm" subcommand; delete via the GitHub Packages API.
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
version="${{ needs.prepare.outputs.version }}"
|
||||||
|
owner="${{ github.repository_owner }}"
|
||||||
|
pkg="${{ github.event.repository.name }}"
|
||||||
|
api="/users/${owner}/packages/container/${pkg}/versions"
|
||||||
|
for suffix in amd64 arm64; do
|
||||||
|
tag="${version}-${suffix}"
|
||||||
|
mapfile -t ids < <(gh api "$api" --paginate \
|
||||||
|
--jq ".[] | select([.metadata.container.tags[]] | index(\"${tag}\")) | .id")
|
||||||
|
if [ "${#ids[@]}" -eq 0 ]; then
|
||||||
|
echo "no GHCR package version for tag ${tag}"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
for id in "${ids[@]}"; do
|
||||||
|
echo "deleting GHCR package version ${id} (tag ${tag})"
|
||||||
|
gh api -X DELETE "${api}/${id}"
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|||||||
+180
-15
@@ -5,6 +5,85 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- docs: roadmap candidates **send-log-retention** (panel Settings for delivery
|
||||||
|
journal retention) and **domain-stats-auto-ratelimit** (30-day send stats per
|
||||||
|
domain/application, auto level-2 rate limit from avg × multiplier) — plans in
|
||||||
|
[docs/plans/](docs/plans/).
|
||||||
|
|
||||||
|
- Postfix queue under `/data/postfix/queue` — deferred and active mail survive
|
||||||
|
container recreate and are included in full backups.
|
||||||
|
- Full backup archives the whole operator project: `data/`, `docker-compose.yml`,
|
||||||
|
`.env`, and `certs/` (requires `.:/selfpost-deploy:ro` in compose). Restore
|
||||||
|
by unpacking into an empty project directory.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- **Breaking:** full-backup archive layout — paths are prefixed with `data/`;
|
||||||
|
deploy files sit at the archive root. Old flat archives restore with
|
||||||
|
`tar xzf backup.tar.gz -C ./data` as before.
|
||||||
|
- docs: operator guide, architecture, security, and backup UI updated for
|
||||||
|
self-contained backups and persistent queue.
|
||||||
|
|
||||||
|
- docs: HTML mockups for a full panel UI refresh
|
||||||
|
([docs/assets/panel-ui/](docs/assets/panel-ui/index.html)) — current screens,
|
||||||
|
agreed and candidate roadmap surfaces (queue-retries, inbound-relay,
|
||||||
|
dmarc-reports, panel-docs), a hybrid width (ops pages use the window, forms
|
||||||
|
keep a reading measure), and a 390px emergency layout. The stamp and brick
|
||||||
|
palette stay; extra nav icons are proposals only. Design artefact; the
|
||||||
|
running panel is unchanged.
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- docs: panel UI mockups after review — Status restored to live readings
|
||||||
|
(queue line, PTR, machine/process tables, Configuration); inbound MX DNS
|
||||||
|
check, recipient mode (list or any), and Danger zone beside recipients;
|
||||||
|
Backup and Settings as two-column ops pages; Save and Delete user on one
|
||||||
|
row; help «?» on domain cards; Host/name ‖ Type height matched to the live
|
||||||
|
panel (`b0ebe06`).
|
||||||
|
|
||||||
|
- docs: panel UI design system and mockups rebuilt as separate pages
|
||||||
|
(`system.html`, `status.html`, `domain.html`, …), not one hash sheet.
|
||||||
|
Regions are `stack` / `pair` / `measure` / `fill`; Host ‖ Type is
|
||||||
|
`field-row`; Save + Delete is `actions-row`. Shared chrome is `shell.js`.
|
||||||
|
|
||||||
|
- docs: panel UI mockups — add-domain sits in the list card (Domains and
|
||||||
|
Inbound); DMARC candidate screens drill into a domain roll-up and a
|
||||||
|
parsed aggregate report (aligned vs third-party fail), not a hub-only
|
||||||
|
summary.
|
||||||
|
|
||||||
|
## [1.3.0] - 2026-08-14
|
||||||
|
|
||||||
|
Security and quality after 1.2.5: domain-admin send-log authorization,
|
||||||
|
fail-closed sign-in and application delete, level-2 rate-limit race fix,
|
||||||
|
restore Resync, expanded tests, operator docs, release CI, and OFL for IBM
|
||||||
|
Plex. Upgrading from 1.2.x is a tag bump; no migration.
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- licence: the SIL Open Font License 1.1 text now travels with the IBM Plex
|
||||||
|
WOFF2 files (`internal/web/view/static/OFL.txt`). The image copies it next
|
||||||
|
to LICENSE and NOTICE under `/usr/share/doc/selfpost/`; the panel serves it
|
||||||
|
at `/static/OFL.txt`. OFL requires the licence to accompany the font.
|
||||||
|
|
||||||
|
- docs: agreed roadmap item **queue-retries** — show this Postfix's retry
|
||||||
|
policy (first delay, backoff cap, queue lifetime) on Mail queue and on a
|
||||||
|
delivery's history, reading `postconf -h` once at panel start so a manual
|
||||||
|
override is visible. Plan: [docs/plans/queue-retries.md](docs/plans/queue-retries.md).
|
||||||
|
Explanation only; no attempt counter and no panel knobs. Not yet
|
||||||
|
implemented.
|
||||||
|
|
||||||
|
### Security
|
||||||
|
|
||||||
|
- The independent security review of the send-log authorization and
|
||||||
|
fail-closed fixes below (code-review plan § P7; reviewer model ≠ author
|
||||||
|
model) found no further issues: the domain scope holds on every query path,
|
||||||
|
a rate-limit refusal cannot consume window budget, and each failure residue
|
||||||
|
of the reordered application delete fails safe. Nothing was added to
|
||||||
|
[docs/security.md](docs/security.md) § Accepted risks; the review is
|
||||||
|
recorded in that file's header.
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
- test (e2e): send-log status scrapers follow the badge markup in
|
- test (e2e): send-log status scrapers follow the badge markup in
|
||||||
@@ -50,8 +129,78 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version
|
|||||||
through a confirmation page, the same pattern as domain deletion, instead of
|
through a confirmation page, the same pattern as domain deletion, instead of
|
||||||
a plain submit button next to Save with no confirmation at all.
|
a plain submit button next to Save with no confirmation at all.
|
||||||
|
|
||||||
|
- panel (restore): after a backup is extracted and the version guard passes,
|
||||||
|
the panel runs one mail-path Resync on the first boot — OpenDKIM's tables
|
||||||
|
and Postfix's sender map are re-derived from SQLite and the daemons are
|
||||||
|
reloaded, so drift between the archive and the database is healed before
|
||||||
|
mail flows. Later starts skip that step; the Status page Reload button runs
|
||||||
|
the same Resync on demand. The `internal/backup` package comment now matches
|
||||||
|
this behaviour.
|
||||||
|
|
||||||
|
- ci (GHCR): per-arch package tags (`X.Y.Z-amd64`, `X.Y.Z-arm64`) are dropped
|
||||||
|
after the manifest merge via the GitHub Packages API. The merge job had called
|
||||||
|
`docker buildx imagetools rm`, which is not a valid subcommand — cleanup failed
|
||||||
|
with a warning and the side-effect tags stayed in the registry.
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|
||||||
|
- docs: operator and as-built docs aligned with the code after a full
|
||||||
|
pass — [architecture.md](docs/architecture.md) route table now marks
|
||||||
|
**global** routes (404 for domain administrators) and documents the
|
||||||
|
one-time restore Resync in Persistence; session/password and restore-session
|
||||||
|
wording corrected in [guide.md](docs/guide.md) and architecture (own-password
|
||||||
|
change vs admin reset, no "logout everywhere", immediate session restore on
|
||||||
|
the next request, PTR cache ≈1 min, decrypt has no version check, restore
|
||||||
|
Resync on first boot, domain add/delete/import and `POST /reload` global-only,
|
||||||
|
Settings DMARC global-only); [README.md](README.md) port-587 and quick-start
|
||||||
|
volume wording fixed; [security.md](docs/security.md) CSRF ADR points at
|
||||||
|
`authz.go` for route gating. No behaviour change.
|
||||||
|
|
||||||
|
- docs: [guide.md](docs/guide.md) reorganised into **Installation**, **Instance
|
||||||
|
administration**, and **Domain administration** — DNS setup, operations,
|
||||||
|
rate limiting, and backup sections follow the instance/domain boundary
|
||||||
|
instead of mixing them. **Installation** now reads Ports → Local trial →
|
||||||
|
Initial setup → Full deployment (with the fixed image tag nested under it) →
|
||||||
|
Environment variables → Reverse proxy; the step-by-step production deploy and
|
||||||
|
per-proxy TLS commands move here from README's "Reference deploy" (README
|
||||||
|
keeps a short pointer). Internal (non-operator) environment variables move
|
||||||
|
to [architecture.md](docs/architecture.md) § Configuration; the guide keeps
|
||||||
|
a one-line pointer. **Full backup and restore** gains worked commands for
|
||||||
|
in-place restore, move-to-a-new-host, and encrypted-backup decrypt-first,
|
||||||
|
plus the version-mismatch error text. README anchors updated for the new
|
||||||
|
headings. No behaviour change.
|
||||||
|
|
||||||
|
- docs: the 2026-08-13 full-tree review plan is complete — every phase (P0–P7)
|
||||||
|
is closed — and `docs/plans/code-review.md` is deleted per its own exit
|
||||||
|
criteria (history in git and in this file). The plan covered architecture,
|
||||||
|
quality, GUI, tests, and licence work; P0 was domain-admin send-log
|
||||||
|
authorization. The [roadmap](docs/roadmap.md)'s recommended order returns to
|
||||||
|
**queue-retries** and then **inbound-relay**; it still records
|
||||||
|
**schema-squash** (replace the 1.x SQLite migration chain with a 2.x baseline;
|
||||||
|
not a reason to cut a major on its own).
|
||||||
|
|
||||||
|
- licence: [NOTICE](NOTICE) tells modifiers to update `SourceURL` in
|
||||||
|
`internal/legal/legal.go` (the value the panel footer actually injects), not
|
||||||
|
`layout.html`. Per-file `SPDX-License-Identifier` headers on the two command
|
||||||
|
packages were dropped so the tree is consistent; AGPL-3.0 does not require
|
||||||
|
them ([development.md](docs/development.md) § External libraries). Deleted the
|
||||||
|
completed `docs/plans/logrotate-mode.md` (history in git and
|
||||||
|
[1.2.3](#123---2026-08-12)).
|
||||||
|
|
||||||
|
- ci: the release image is published only for a **published** GitHub Release
|
||||||
|
(`vX.Y.Z`) or a manual `workflow_dispatch` with an explicit SemVer version — a
|
||||||
|
bare git tag push no longer starts the build. `release.yml` listens for
|
||||||
|
`release: published`, checks out that tag (not `main` HEAD), e2e-gates each
|
||||||
|
native arch build, merges `X.Y.Z-amd64` and `X.Y.Z-arm64` into one manifest,
|
||||||
|
then removes the per-arch tags from GHCR via the GitHub Packages API so
|
||||||
|
operators see only `ghcr.io/mixeme/selfpost:X.Y.Z` (what
|
||||||
|
`deploy/docker-compose.yml` pins). A dispatch whose version input is missing
|
||||||
|
or not `X.Y.Z` fails in `prepare`. [development.md](docs/development.md)
|
||||||
|
documents draft vs published releases, why deleting a release tag converts
|
||||||
|
it back to draft, and Gitea → GitHub tag-mirror pitfalls (do not prune release
|
||||||
|
tags on GitHub; a mirrored `v1.0.0` still runs that tag's `on: push: tags`
|
||||||
|
workflow).
|
||||||
|
|
||||||
- test: the authorization and sign-in surfaces that had no tests now have them.
|
- test: the authorization and sign-in surfaces that had no tests now have them.
|
||||||
The login limiter is covered for its ceiling, its per-address scope, the reset
|
The login limiter is covered for its ceiling, its per-address scope, the reset
|
||||||
at the end of a window and the sweep that keeps finished buckets out of
|
at the end of a window and the sweep that keeps finished buckets out of
|
||||||
@@ -64,6 +213,21 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version
|
|||||||
reload) is checked to answer a domain administrator — and a request with no
|
reload) is checked to answer a domain administrator — and a request with no
|
||||||
principal — with 404, the check that would have caught the send-log leak.
|
principal — with 404, the check that would have caught the send-log leak.
|
||||||
|
|
||||||
|
- test: restore is covered as the operator performs it, in process. A backup is
|
||||||
|
downloaded from a running panel through `POST /backup` (plain and encrypted),
|
||||||
|
unpacked the way `tar -xzf` unpacks it onto the `/data` bind mount, and a
|
||||||
|
second panel is booted on the result through the startup order the panel
|
||||||
|
itself uses — version guard, database, one Resync when restoring, then
|
||||||
|
services and the HTTP application. The restored panel shows the domain and
|
||||||
|
journal the archive carried, finds the DKIM key, SASL database and Postfix
|
||||||
|
sender map where its configuration says they are, does not reopen the
|
||||||
|
one-time setup link, and still honours a session that predates the backup.
|
||||||
|
Drifted on-disk maps are healed by that Resync step
|
||||||
|
(`TestResyncAfterRestoreHealsDriftedMaps`). A data directory left by another
|
||||||
|
version is refused with both versions named and the manifest kept. `serveHTTP`
|
||||||
|
is split in two so that composition can be started without binding a port; no
|
||||||
|
behaviour change.
|
||||||
|
|
||||||
- test (e2e): the CoreDNS image is pinned to `1.14.6` instead of `latest`, so
|
- test (e2e): the CoreDNS image is pinned to `1.14.6` instead of `latest`, so
|
||||||
the release gate cannot change under a commit between two runs. The level-1
|
the release gate cannot change under a commit between two runs. The level-1
|
||||||
rate-limit failure message quoted `RATE_LIMIT_MESSAGES_PER_IP=5` while the
|
rate-limit failure message quoted `RATE_LIMIT_MESSAGES_PER_IP=5` while the
|
||||||
@@ -91,12 +255,6 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version
|
|||||||
prompts existed — and why that is acceptable (the prompt is a mis-click
|
prompts existed — and why that is acceptable (the prompt is a mis-click
|
||||||
guard, not an authorization boundary).
|
guard, not an authorization boundary).
|
||||||
|
|
||||||
- docs: full-tree review plan ([docs/plans/code-review.md](docs/plans/code-review.md))
|
|
||||||
— architecture, quality, GUI, tests, licence; P0 is domain-admin send-log
|
|
||||||
authorization. Roadmap queues that plan ahead of inbound-relay and records
|
|
||||||
`schema-squash` (replace the 1.x SQLite migration chain with a 2.x baseline;
|
|
||||||
not a reason to cut a major on its own).
|
|
||||||
|
|
||||||
- docs: security and operator docs updated for the panel that has shipped
|
- docs: security and operator docs updated for the panel that has shipped
|
||||||
global administrators and domain-admins since 1.2.0. The CSRF ADR in
|
global administrators and domain-admins since 1.2.0. The CSRF ADR in
|
||||||
[security.md](docs/security.md) no longer argues from "single-user"; it now
|
[security.md](docs/security.md) no longer argues from "single-user"; it now
|
||||||
@@ -104,19 +262,26 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version
|
|||||||
check defends against, and gives a new revisit trigger. Dropped the
|
check defends against, and gives a new revisit trigger. Dropped the
|
||||||
unimplemented "or argon2" alternative for the password hash.
|
unimplemented "or argon2" alternative for the password hash.
|
||||||
[guide.md](docs/guide.md) documents the Users page and the two roles,
|
[guide.md](docs/guide.md) documents the Users page and the two roles,
|
||||||
the Settings page's default DMARC report address, level-2 rate limiting's
|
level-2 rate limiting's fail-open behaviour, and that a domain-admin can
|
||||||
fail-open behaviour, that restoring an older backup can resurrect sessions,
|
export working SASL passwords for domains assigned to them.
|
||||||
and that a domain-admin can export working SASL passwords for domains
|
[architecture.md](docs/architecture.md) gains `/license` and the
|
||||||
assigned to them. [architecture.md](docs/architecture.md)'s route table now
|
`/account` → `/settings` redirect in the route table (later expanded for
|
||||||
lists `/license` and the `/account` → `/settings` redirect. Fixed the
|
RBAC in the doc-alignment pass above). Corrected stale
|
||||||
`internal/backup` package comment, which claimed the panel regenerates
|
`admin.dmarc_report_email` references in
|
||||||
Postfix/OpenDKIM state from SQLite on every restore boot (it only runs the
|
|
||||||
version guard; drifted daemon state is healed by the Status page's Reload
|
|
||||||
button). Corrected stale `admin.dmarc_report_email` references in
|
|
||||||
[roadmap.md](docs/roadmap.md) and
|
[roadmap.md](docs/roadmap.md) and
|
||||||
[docs/plans/dmarc-reports.md](docs/plans/dmarc-reports.md) to the setting's
|
[docs/plans/dmarc-reports.md](docs/plans/dmarc-reports.md) to the setting's
|
||||||
actual home after migration `0005`. No behaviour change.
|
actual home after migration `0005`. No behaviour change.
|
||||||
|
|
||||||
|
- panel: code-review P6 cleanup — the unused `auth.RequireGlobal` middleware is
|
||||||
|
gone (handlers already call `requireGlobal`); the settings route handler is
|
||||||
|
named `HandleSettings` in `handlers_settings.go`; domain lists for a
|
||||||
|
domain-admin now come from `ListDomainsForUser` in SQL instead of loading
|
||||||
|
every domain and filtering in Go; the login and setup rate limiters sweep
|
||||||
|
expired buckets on a timer and cap the map at 4096 keys; the five
|
||||||
|
show/hide field helpers in `panel.js` are one rule table; DMARC copy no
|
||||||
|
longer promises in-panel report reception in a future release — SelfPost
|
||||||
|
does not receive inbound mail.
|
||||||
|
|
||||||
## [1.2.5] - 2026-08-13
|
## [1.2.5] - 2026-08-13
|
||||||
|
|
||||||
Rate-limit form polish after 1.2.4. Upgrading is a tag bump; no migration.
|
Rate-limit form polish after 1.2.4. Upgrading is a tag bump; no migration.
|
||||||
|
|||||||
@@ -10,8 +10,8 @@ Corresponding Source for the published releases is at:
|
|||||||
|
|
||||||
If you modify SelfPost and let users interact with it over a network,
|
If you modify SelfPost and let users interact with it over a network,
|
||||||
AGPL-3.0 §13 requires you to offer them the Corresponding Source of
|
AGPL-3.0 §13 requires you to offer them the Corresponding Source of
|
||||||
your modified version. Update the Source link in the panel footer
|
your modified version. Update SourceURL in internal/legal/legal.go
|
||||||
(internal/web/view/templates/layout.html) so it points at your sources.
|
so the panel footer points at your sources.
|
||||||
|
|
||||||
Third-party software included in this distribution
|
Third-party software included in this distribution
|
||||||
----------------------------------------------------
|
----------------------------------------------------
|
||||||
@@ -24,6 +24,9 @@ htmx 2.0.4 (internal/web/view/static/htmx.min.js)
|
|||||||
IBM Plex Sans / IBM Plex Mono
|
IBM Plex Sans / IBM Plex Mono
|
||||||
Copyright © 2017 IBM Corp., with Reserved Font Name "Plex"
|
Copyright © 2017 IBM Corp., with Reserved Font Name "Plex"
|
||||||
Licence: SIL Open Font License 1.1
|
Licence: SIL Open Font License 1.1
|
||||||
|
Full text: internal/web/view/static/OFL.txt
|
||||||
|
(also /usr/share/doc/selfpost/OFL.txt in the image, and
|
||||||
|
/static/OFL.txt from the control panel)
|
||||||
https://github.com/IBM/plex
|
https://github.com/IBM/plex
|
||||||
Distributed unmodified as three latin-subset WOFF2 files served by the
|
Distributed unmodified as three latin-subset WOFF2 files served by the
|
||||||
control panel:
|
control panel:
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ send log and DNS checks in the panel, encrypted backups.
|
|||||||
- DNS status checks (PTR, SPF, DKIM, DMARC) with in-panel re-check
|
- DNS status checks (PTR, SPF, DKIM, DMARC) with in-panel re-check
|
||||||
- Two-level rate limiting — IP backstop (Postfix), per-domain ceilings, and trusted-IP app overrides
|
- Two-level rate limiting — IP backstop (Postfix), per-domain ceilings, and trusted-IP app overrides
|
||||||
- Full-server backup and single-domain export/import (optional password encryption)
|
- Full-server backup and single-domain export/import (optional password encryption)
|
||||||
- Single Docker image; data in a `./data` bind mount
|
- Single Docker image; production data in a `./data` bind mount (the quick start below uses a named Docker volume instead)
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|
||||||
@@ -76,14 +76,15 @@ For every domain you add in the panel:
|
|||||||
- [ ] DKIM TXT record (value shown on the domain page)
|
- [ ] DKIM TXT record (value shown on the domain page)
|
||||||
- [ ] DMARC `_dmarc` TXT record
|
- [ ] DMARC `_dmarc` TXT record
|
||||||
|
|
||||||
See [DNS setup](docs/guide.md#dns-setup) in the operator guide.
|
See [Domain-level DNS](docs/guide.md#domain-level-dns-spf-dkim-dmarc) in the operator guide.
|
||||||
|
|
||||||
## Quick start
|
## Quick start
|
||||||
|
|
||||||
> **First boot — create the admin account.** On a fresh container SelfPost prints
|
> **First boot — create the admin account.** On a fresh container SelfPost prints
|
||||||
> a **one-time setup URL** (valid ten minutes). Open it in a browser to choose
|
> a **one-time setup URL** (valid ten minutes). Open it in a browser to choose
|
||||||
> the administrator username and password. Until you do, the panel has no login.
|
> the administrator username and password. Until you do, the panel has no login.
|
||||||
> Production deploy: [step 3](#3-start-selfpost).
|
> Production deploy: [Full deployment](docs/guide.md#full-deployment) in the
|
||||||
|
> operator guide.
|
||||||
|
|
||||||
One container, panel at `http://127.0.0.1:8080` — no reverse proxy, no TLS
|
One container, panel at `http://127.0.0.1:8080` — no reverse proxy, no TLS
|
||||||
files, no compose files. Good for clicking through the UI on your machine;
|
files, no compose files. Good for clicking through the UI on your machine;
|
||||||
@@ -95,7 +96,7 @@ docker run --rm -d --name selfpost-try \
|
|||||||
-e SELFPOST_HOSTNAME=mail.local.test \
|
-e SELFPOST_HOSTNAME=mail.local.test \
|
||||||
-e PANEL_COOKIE_SECURE=false \
|
-e PANEL_COOKIE_SECURE=false \
|
||||||
-v selfpost-try-data:/data \
|
-v selfpost-try-data:/data \
|
||||||
ghcr.io/mixeme/selfpost:1.2.5
|
ghcr.io/mixeme/selfpost:1.3.0
|
||||||
```
|
```
|
||||||
|
|
||||||
**Get the setup URL** (pick one):
|
**Get the setup URL** (pick one):
|
||||||
@@ -129,136 +130,17 @@ TLS PEM files at `./certs` (read by Postfix on 465/587). The panel is reached
|
|||||||
only through a reverse proxy on 443 — port 8080 is bound to localhost in the
|
only through a reverse proxy on 443 — port 8080 is bound to localhost in the
|
||||||
default compose file.
|
default compose file.
|
||||||
|
|
||||||
| Artefact | Path |
|
Full walkthrough — fetching the base files, setting up a reverse proxy and
|
||||||
|---|---|
|
TLS (Apache/nginx/Caddy/Traefik), starting the container, and wiring up
|
||||||
| Compose file (fixed image tag) | [deploy/docker-compose.yml](deploy/docker-compose.yml) |
|
DNS — lives in the operator guide's [Full
|
||||||
| Environment template | [deploy/.env.example](deploy/.env.example) |
|
deployment](docs/guide.md#full-deployment) section, with proxy-specific
|
||||||
| Apache vhost (recommended) | [deploy/apache/selfpost-vhost.conf](deploy/apache/selfpost-vhost.conf) |
|
commands under [Reverse proxy](docs/guide.md#reverse-proxy-mandatory).
|
||||||
| nginx | [deploy/nginx/](deploy/nginx/) |
|
|
||||||
| Caddy | [deploy/caddy/](deploy/caddy/) |
|
|
||||||
| Traefik | [deploy/traefik/](deploy/traefik/) |
|
|
||||||
|
|
||||||
### 1. Fetch the base files
|
The compose file always publishes **465** and **587**; Postfix listens on 587
|
||||||
|
only when `SUBMISSION_ENABLE=true` (see [Ports](docs/guide.md#ports)). Bump the
|
||||||
```sh
|
pinned image tag deliberately when upgrading, never `:latest` ([why](docs/guide.md#fixed-image-tag)). Optional
|
||||||
mkdir -p selfpost/data selfpost/certs && cd selfpost
|
variables (`TRUSTED_PROXY_CIDR`, rate limits, retention): see [Environment
|
||||||
curl -O https://raw.githubusercontent.com/mixeme/selfpost/main/deploy/docker-compose.yml
|
variables](docs/guide.md#environment-variables).
|
||||||
curl -O https://raw.githubusercontent.com/mixeme/selfpost/main/deploy/.env.example
|
|
||||||
cp .env.example .env
|
|
||||||
```
|
|
||||||
|
|
||||||
Edit `.env` — at minimum set `SELFPOST_HOSTNAME` to your mail hostname (bare
|
|
||||||
FQDN, e.g. `mail.example.com`). It must match the PTR record you request from
|
|
||||||
your provider and the certificate your proxy will obtain.
|
|
||||||
|
|
||||||
### 2. Reverse proxy and TLS
|
|
||||||
|
|
||||||
Pick one proxy. In every case the proxy terminates HTTPS for the panel; the
|
|
||||||
same certificate must end up under `./certs` as `fullchain.pem` and
|
|
||||||
`privkey.pem` so Postfix can serve it on 465 (and 587 if enabled). The proxy
|
|
||||||
must **pass the original `Host` header** — details and rationale:
|
|
||||||
[Reverse proxy](docs/guide.md#reverse-proxy-mandatory).
|
|
||||||
|
|
||||||
**Apache (recommended, on the host).** Install Apache with `ssl`, `proxy`, and
|
|
||||||
`proxy_http` enabled. Copy
|
|
||||||
[deploy/apache/selfpost-vhost.conf](deploy/apache/selfpost-vhost.conf) into your
|
|
||||||
vhost directory, replace `mail.example.com` with your hostname, enable the site,
|
|
||||||
then issue a certificate:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
sudo certbot --apache -d mail.example.com
|
|
||||||
```
|
|
||||||
|
|
||||||
Point `./certs` at the PEM files certbot wrote (symlink is fine):
|
|
||||||
|
|
||||||
```sh
|
|
||||||
ln -s /etc/letsencrypt/live/mail.example.com certs
|
|
||||||
```
|
|
||||||
|
|
||||||
**nginx (containerised).** From the `deploy/` directory, merge the nginx
|
|
||||||
fragment and issue the first certificate before nginx can serve HTTPS:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker compose -f docker-compose.yml -f nginx/docker-compose.nginx.yml \
|
|
||||||
run --rm certbot certonly --webroot -w /var/www/certbot \
|
|
||||||
-d mail.example.com --email you@example.com --agree-tos --no-eff-email
|
|
||||||
|
|
||||||
docker compose -f docker-compose.yml -f nginx/docker-compose.nginx.yml up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
Edit [deploy/nginx/nginx.conf.example](deploy/nginx/nginx.conf.example) and
|
|
||||||
replace `mail.example.com` first. The fragment bind-mounts certbot's output into
|
|
||||||
both nginx and SelfPost.
|
|
||||||
|
|
||||||
**Caddy (containerised, automatic ACME).** Edit
|
|
||||||
[deploy/caddy/Caddyfile](deploy/caddy/Caddyfile) and the `<hostname>` placeholders
|
|
||||||
in [deploy/caddy/docker-compose.caddy.yml](deploy/caddy/docker-compose.caddy.yml),
|
|
||||||
then:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker compose -f docker-compose.yml -f caddy/docker-compose.caddy.yml up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
Verify Caddy's on-disk cert path for your version before relying on the
|
|
||||||
default mount — see the comment at the top of the Caddy compose fragment.
|
|
||||||
|
|
||||||
**Traefik (containerised).** Edit the `Host(...)` label and ACME email in
|
|
||||||
[deploy/traefik/docker-compose.traefik.yml](deploy/traefik/docker-compose.traefik.yml),
|
|
||||||
start the stack, then extract PEM files for Postfix whenever Traefik issues or
|
|
||||||
renews a certificate:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker compose -f docker-compose.yml -f traefik/docker-compose.traefik.yml up -d
|
|
||||||
./traefik/extract-cert.sh ./traefik/letsencrypt/acme.json mail.example.com ./traefik/extracted-certs
|
|
||||||
```
|
|
||||||
|
|
||||||
Schedule `extract-cert.sh` (cron or a timer) alongside Traefik's renewals.
|
|
||||||
|
|
||||||
### 3. Start SelfPost
|
|
||||||
|
|
||||||
If you used Apache on the host (step 2, first option), start only the base
|
|
||||||
compose file from your `selfpost/` directory:
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker compose up -d
|
|
||||||
```
|
|
||||||
|
|
||||||
The nginx/Caddy/Traefik fragments from step 2 already include `docker compose up
|
|
||||||
-d` — skip this if you ran one of those.
|
|
||||||
|
|
||||||
**Get the setup URL** — open it in a browser to create the admin account
|
|
||||||
([first boot](#quick-start)):
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker compose logs selfpost 2>&1 | grep -m1 'http'
|
|
||||||
```
|
|
||||||
|
|
||||||
```sh
|
|
||||||
cat ./data/setup-token
|
|
||||||
```
|
|
||||||
|
|
||||||
The file is deleted as soon as setup completes. If logs are shipped to a
|
|
||||||
central aggregator, prefer `cat ./data/setup-token` so the bearer token does
|
|
||||||
not enter the log pipeline.
|
|
||||||
|
|
||||||
### 4. DNS and sending
|
|
||||||
|
|
||||||
Before sending real mail:
|
|
||||||
|
|
||||||
1. Confirm PTR/rDNS for the server IP points at `SELFPOST_HOSTNAME` (Status
|
|
||||||
page → *Re-check*).
|
|
||||||
2. For each domain you add in the panel, publish SPF, DKIM, and DMARC at the
|
|
||||||
same time ([DNS setup](docs/guide.md#dns-setup)).
|
|
||||||
3. Warm up a new IP gradually ([IP warmup](docs/guide.md#ip-warmup)).
|
|
||||||
|
|
||||||
### Ports and upgrades
|
|
||||||
|
|
||||||
The compose file maps **465** (always) and **587** (when
|
|
||||||
`SUBMISSION_ENABLE=true`). Bump the pinned image tag deliberately when
|
|
||||||
upgrading — never use `:latest` ([why](docs/guide.md#fixed-image-tag)).
|
|
||||||
|
|
||||||
Optional variables (`TRUSTED_PROXY_CIDR`, rate limits, retention): see
|
|
||||||
[Environment variables](docs/guide.md#environment-variables).
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
|
|||||||
+6
-2
@@ -87,12 +87,16 @@ COPY --from=build /out/panel /usr/local/bin/panel
|
|||||||
COPY --from=build /out/selfpost-backup /usr/local/bin/selfpost-backup
|
COPY --from=build /out/selfpost-backup /usr/local/bin/selfpost-backup
|
||||||
|
|
||||||
# Licence text shipped with the image (AGPL-3.0 conveyance). The panel also
|
# Licence text shipped with the image (AGPL-3.0 conveyance). The panel also
|
||||||
# serves the same text at /license from an embedded copy.
|
# serves the same text at /license from an embedded copy. OFL.txt is the SIL
|
||||||
|
# Open Font License 1.1 that must travel with the IBM Plex WOFF2 files
|
||||||
|
# embedded in the panel binary (NOTICE).
|
||||||
COPY --chmod=0644 LICENSE NOTICE /usr/share/doc/selfpost/
|
COPY --chmod=0644 LICENSE NOTICE /usr/share/doc/selfpost/
|
||||||
|
COPY --chmod=0644 internal/web/view/static/OFL.txt /usr/share/doc/selfpost/OFL.txt
|
||||||
|
|
||||||
# File modes are pinned here so a build context copied from a checkout without
|
# File modes are pinned here so a build context copied from a checkout without
|
||||||
# POSIX permissions (e.g. Windows tar sync) cannot land group-writable config
|
# POSIX permissions (e.g. Windows tar sync) cannot land group-writable config
|
||||||
# that logrotate would silently ignore — see docs/plans/logrotate-mode.md.
|
# that logrotate would silently ignore — see docs/development.md § Building
|
||||||
|
# binaries and the image.
|
||||||
COPY --chmod=0644 build/opendkim.conf /etc/opendkim.conf
|
COPY --chmod=0644 build/opendkim.conf /etc/opendkim.conf
|
||||||
COPY --chmod=0644 build/logrotate-mail.conf /etc/logrotate.d/mail
|
COPY --chmod=0644 build/logrotate-mail.conf /etc/logrotate.d/mail
|
||||||
COPY --chmod=0755 build/postfix-wrapper.sh /usr/local/bin/postfix-wrapper.sh
|
COPY --chmod=0755 build/postfix-wrapper.sh /usr/local/bin/postfix-wrapper.sh
|
||||||
|
|||||||
+13
-6
@@ -69,7 +69,7 @@ chmod 755 /data
|
|||||||
# later phase deliberately hands to another service. /data/log is exempt: it is
|
# later phase deliberately hands to another service. /data/log is exempt: it is
|
||||||
# deliberately owned by postfix (postlogd writes the delivery log there) and is
|
# deliberately owned by postfix (postlogd writes the delivery log there) and is
|
||||||
# normalised on its own below.
|
# normalised on its own below.
|
||||||
find /data -mindepth 1 -maxdepth 1 ! -user panel ! -name log -exec chown -R panel:panel {} +
|
find /data -mindepth 1 -maxdepth 1 ! -user panel ! -name log ! -name postfix -exec chown -R panel:panel {} +
|
||||||
|
|
||||||
# DKIM key tree (spec 6, 9). The panel (user `panel`) generates keys and writes
|
# DKIM key tree (spec 6, 9). The panel (user `panel`) generates keys and writes
|
||||||
# the OpenDKIM tables; OpenDKIM (user `opendkim`) must read them. Normalise the
|
# the OpenDKIM tables; OpenDKIM (user `opendkim`) must read them. Normalise the
|
||||||
@@ -99,13 +99,13 @@ chown -R panel:selfpost /data/sasl
|
|||||||
chmod 2750 /data/sasl
|
chmod 2750 /data/sasl
|
||||||
[ -e /data/sasl/sasldb2 ] && chmod 0640 /data/sasl/sasldb2
|
[ -e /data/sasl/sasldb2 ] && chmod 0640 /data/sasl/sasldb2
|
||||||
|
|
||||||
# Postfix sender_login_maps (spec 5.1). The panel writes it; Postfix reads it.
|
# Postfix state under /data (spec 5.1, architecture.md § Persistence). The panel
|
||||||
# Ensure the file exists (empty is fine) before Postfix starts so a reload that
|
# writes sender_login_maps; Postfix owns the on-disk queue tree under queue/.
|
||||||
# references it never fails on a missing file, and keep it group-readable.
|
mkdir -p /data/postfix/queue
|
||||||
mkdir -p /data/postfix
|
|
||||||
[ -e /data/postfix/sender_login_maps ] || : > /data/postfix/sender_login_maps
|
[ -e /data/postfix/sender_login_maps ] || : > /data/postfix/sender_login_maps
|
||||||
chown -R panel:selfpost /data/postfix
|
chown panel:selfpost /data/postfix
|
||||||
chmod 2750 /data/postfix
|
chmod 2750 /data/postfix
|
||||||
|
chown panel:selfpost /data/postfix/sender_login_maps
|
||||||
chmod 0640 /data/postfix/sender_login_maps
|
chmod 0640 /data/postfix/sender_login_maps
|
||||||
|
|
||||||
# Delivery log (architecture.md § Log tailer). postlogd writes it as user
|
# Delivery log (architecture.md § Log tailer). postlogd writes it as user
|
||||||
@@ -144,4 +144,11 @@ chmod 2750 /run/opendkim /run/selfpost
|
|||||||
# start the same way the /data normalisation above is.
|
# start the same way the /data normalisation above is.
|
||||||
/usr/local/bin/postfix-config.sh
|
/usr/local/bin/postfix-config.sh
|
||||||
|
|
||||||
|
# Initialise the persistent queue tree on first start or after restore. postfix
|
||||||
|
# set-permissions reads queue_directory from main.cf (set by postfix-config.sh).
|
||||||
|
if [ ! -d /data/postfix/queue/active ]; then
|
||||||
|
postfix set-permissions
|
||||||
|
fi
|
||||||
|
chown -R postfix:postfix /data/postfix/queue
|
||||||
|
|
||||||
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
|
exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf
|
||||||
|
|||||||
@@ -57,6 +57,9 @@ JOURNAL_SOCK="${JOURNAL_MILTER_SOCKET:-/run/selfpost/journal.sock}"
|
|||||||
# Persistent panel-managed sender map (spec 5.1); texthash needs no postmap, so
|
# Persistent panel-managed sender map (spec 5.1); texthash needs no postmap, so
|
||||||
# the unprivileged panel can rewrite it and just ask for a reload.
|
# the unprivileged panel can rewrite it and just ask for a reload.
|
||||||
SENDER_LOGIN_MAPS="${POSTFIX_SENDER_LOGIN_MAPS:-/data/postfix/sender_login_maps}"
|
SENDER_LOGIN_MAPS="${POSTFIX_SENDER_LOGIN_MAPS:-/data/postfix/sender_login_maps}"
|
||||||
|
# Transit mail queue under /data so deferred/active messages survive container
|
||||||
|
# recreate (architecture.md § Persistence). Distinct from sender_login_maps.
|
||||||
|
QUEUE_DIR="${POSTFIX_QUEUE_DIR:-/data/postfix/queue}"
|
||||||
SASLDB_PATH="${SASL_DB_PATH:-/data/sasl/sasldb2}"
|
SASLDB_PATH="${SASL_DB_PATH:-/data/sasl/sasldb2}"
|
||||||
|
|
||||||
# Optional submission service on 587 (spec 5 p.1: off by default, enabled only
|
# Optional submission service on 587 (spec 5 p.1: off by default, enabled only
|
||||||
@@ -128,7 +131,8 @@ postconf -e \
|
|||||||
# resolves the full address first, then the "@domain" wildcard, so both address
|
# resolves the full address first, then the "@domain" wildcard, so both address
|
||||||
# modes work from the same map.
|
# modes work from the same map.
|
||||||
postconf -e \
|
postconf -e \
|
||||||
"smtpd_sender_login_maps=texthash:${SENDER_LOGIN_MAPS}"
|
"smtpd_sender_login_maps=texthash:${SENDER_LOGIN_MAPS}" \
|
||||||
|
"queue_directory=${QUEUE_DIR}"
|
||||||
|
|
||||||
# Restrictions: authenticated clients only, no relay to foreign destinations,
|
# Restrictions: authenticated clients only, no relay to foreign destinations,
|
||||||
# and every authenticated sender address must be owned by its login. NO
|
# and every authenticated sender address must be owned by its login. NO
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ var documentedPublic = []string{
|
|||||||
"TRUSTED_PROXY_CIDR",
|
"TRUSTED_PROXY_CIDR",
|
||||||
}
|
}
|
||||||
|
|
||||||
// documentedInternal matches guide.md "Internal variables (not part of the operator interface)".
|
// documentedInternal matches architecture.md § Configuration "Internal env vars".
|
||||||
var documentedInternal = []string{
|
var documentedInternal = []string{
|
||||||
"SELFPOST_DATA_DIR",
|
"SELFPOST_DATA_DIR",
|
||||||
"SELFPOST_DB_PATH",
|
"SELFPOST_DB_PATH",
|
||||||
@@ -33,6 +33,8 @@ var documentedInternal = []string{
|
|||||||
"SASL_REALM",
|
"SASL_REALM",
|
||||||
"POSTFIX_DIR",
|
"POSTFIX_DIR",
|
||||||
"POSTFIX_SENDER_LOGIN_MAPS",
|
"POSTFIX_SENDER_LOGIN_MAPS",
|
||||||
|
"POSTFIX_QUEUE_DIR",
|
||||||
|
"SELFPOST_DEPLOY_ROOT",
|
||||||
"MILTER_CONNECT_TIMEOUT",
|
"MILTER_CONNECT_TIMEOUT",
|
||||||
"MILTER_COMMAND_TIMEOUT",
|
"MILTER_COMMAND_TIMEOUT",
|
||||||
"MILTER_CONTENT_TIMEOUT",
|
"MILTER_CONTENT_TIMEOUT",
|
||||||
@@ -70,6 +72,7 @@ var loadConfigKeys = []string{
|
|||||||
"SASL_DB_PATH",
|
"SASL_DB_PATH",
|
||||||
"SASL_REALM",
|
"SASL_REALM",
|
||||||
"POSTFIX_DIR",
|
"POSTFIX_DIR",
|
||||||
|
"SELFPOST_DEPLOY_ROOT",
|
||||||
}
|
}
|
||||||
|
|
||||||
// buildScriptKeys is every ${VAR:-…} / os.Getenv used in build/*.sh and entrypoint.sh
|
// buildScriptKeys is every ${VAR:-…} / os.Getenv used in build/*.sh and entrypoint.sh
|
||||||
@@ -84,6 +87,7 @@ var buildScriptKeys = []string{
|
|||||||
"JOURNAL_MILTER_SOCKET",
|
"JOURNAL_MILTER_SOCKET",
|
||||||
"MAIL_LOG",
|
"MAIL_LOG",
|
||||||
"POSTFIX_SENDER_LOGIN_MAPS",
|
"POSTFIX_SENDER_LOGIN_MAPS",
|
||||||
|
"POSTFIX_QUEUE_DIR",
|
||||||
"SASL_DB_PATH",
|
"SASL_DB_PATH",
|
||||||
"SUBMISSION_ENABLE",
|
"SUBMISSION_ENABLE",
|
||||||
"MILTER_CONNECT_TIMEOUT",
|
"MILTER_CONNECT_TIMEOUT",
|
||||||
|
|||||||
+59
-10
@@ -3,6 +3,7 @@ package main
|
|||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"log"
|
"log"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
@@ -15,23 +16,64 @@ import (
|
|||||||
"github.com/mixeme/selfpost/internal/web"
|
"github.com/mixeme/selfpost/internal/web"
|
||||||
)
|
)
|
||||||
|
|
||||||
// serveHTTP runs the control-panel HTTP server until ctx is cancelled, using
|
// mailStack is the panel's domain and application services plus the on-disk
|
||||||
// the database handle shared by all roles: setup, login and the authenticated
|
// mail-path adapters they write through.
|
||||||
// panel surface (security.md).
|
type mailStack struct {
|
||||||
func serveHTTP(ctx context.Context, cfg config, st *store.Store) error {
|
Domains *domain.Service
|
||||||
// Applications own the SASL accounts and the Postfix sender map; the domain
|
Apps *app.Service
|
||||||
// service delegates to them when a domain (and its applications) is deleted.
|
pf *postfix.Postfix
|
||||||
pf := postfix.New(cfg.postfixDir)
|
odk *domain.OpenDKIM
|
||||||
apps := app.NewService(st, app.NewSASLDB(cfg.saslDBPath, cfg.saslRealm), pf)
|
}
|
||||||
domains := domain.NewService(st, domain.NewOpenDKIM(cfg.opendkimDir), apps, cfg.dkimSelectorDef)
|
|
||||||
|
|
||||||
srvApp, err := web.New(st, domains, apps, web.Config{
|
func newMailStack(cfg config, st *store.Store) *mailStack {
|
||||||
|
pf := postfix.New(cfg.postfixDir)
|
||||||
|
odk := domain.NewOpenDKIM(cfg.opendkimDir)
|
||||||
|
apps := app.NewService(st, app.NewSASLDB(cfg.saslDBPath, cfg.saslRealm), pf)
|
||||||
|
domains := domain.NewService(st, odk, apps, cfg.dkimSelectorDef)
|
||||||
|
return &mailStack{Domains: domains, Apps: apps, pf: pf, odk: odk}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resync rebuilds OpenDKIM's tables and Postfix's sender map from SQLite and
|
||||||
|
// reloads both daemons — the same work as the Status page's Reload button.
|
||||||
|
func (m *mailStack) Resync() error {
|
||||||
|
if err := m.Domains.Resync(); err != nil {
|
||||||
|
return fmt.Errorf("opendkim resync: %w", err)
|
||||||
|
}
|
||||||
|
if err := m.Apps.Resync(); err != nil {
|
||||||
|
return fmt.Errorf("postfix resync: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *mailStack) skipReloadForTest() {
|
||||||
|
m.pf.SetReloadHook(func() error { return nil })
|
||||||
|
m.odk.SetReloadHook(func() error { return nil })
|
||||||
|
}
|
||||||
|
|
||||||
|
// resyncAfterRestore runs one mail-path Resync on the first boot after a
|
||||||
|
// backup restore. testNoReload skips the supervisord reload step so restore
|
||||||
|
// tests can verify file regeneration without a running mail stack.
|
||||||
|
func resyncAfterRestore(cfg config, st *store.Store, testNoReload bool) error {
|
||||||
|
ms := newMailStack(cfg, st)
|
||||||
|
if testNoReload {
|
||||||
|
ms.skipReloadForTest()
|
||||||
|
}
|
||||||
|
return ms.Resync()
|
||||||
|
}
|
||||||
|
|
||||||
|
// newPanel wires the panel's services over the shared database handle and
|
||||||
|
// builds the HTTP application from cfg. It is the composition of the panel as
|
||||||
|
// the environment describes it, with nothing bound to a port yet.
|
||||||
|
func newPanel(cfg config, st *store.Store) (*web.Server, error) {
|
||||||
|
ms := newMailStack(cfg, st)
|
||||||
|
return web.New(st, ms.Domains, ms.Apps, web.Config{
|
||||||
Hostname: cfg.hostname,
|
Hostname: cfg.hostname,
|
||||||
CookieSecure: cfg.cookieSecure,
|
CookieSecure: cfg.cookieSecure,
|
||||||
SubmissionEnabled: cfg.submissionEnabled,
|
SubmissionEnabled: cfg.submissionEnabled,
|
||||||
MailLogPath: cfg.mailLog,
|
MailLogPath: cfg.mailLog,
|
||||||
DataDir: cfg.dataDir,
|
DataDir: cfg.dataDir,
|
||||||
DBPath: cfg.dbPath,
|
DBPath: cfg.dbPath,
|
||||||
|
DeployRoot: cfg.deployRoot,
|
||||||
Version: buildinfo.Version,
|
Version: buildinfo.Version,
|
||||||
TrustedProxyCIDRs: cfg.trustedProxies,
|
TrustedProxyCIDRs: cfg.trustedProxies,
|
||||||
TLSCertFile: cfg.tlsCertFile,
|
TLSCertFile: cfg.tlsCertFile,
|
||||||
@@ -42,6 +84,13 @@ func serveHTTP(ctx context.Context, cfg config, st *store.Store) error {
|
|||||||
RateLimitMessagesPerIP: cfg.rateLimitMessagesPerIP,
|
RateLimitMessagesPerIP: cfg.rateLimitMessagesPerIP,
|
||||||
RateLimitWindowSeconds: cfg.rateLimitWindowSeconds,
|
RateLimitWindowSeconds: cfg.rateLimitWindowSeconds,
|
||||||
}, cfg.setupTokenPath)
|
}, cfg.setupTokenPath)
|
||||||
|
}
|
||||||
|
|
||||||
|
// serveHTTP runs the control-panel HTTP server until ctx is cancelled, using
|
||||||
|
// the database handle shared by all roles: setup, login and the authenticated
|
||||||
|
// panel surface (security.md).
|
||||||
|
func serveHTTP(ctx context.Context, cfg config, st *store.Store) error {
|
||||||
|
srvApp, err := newPanel(cfg, st)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-2
@@ -4,7 +4,6 @@
|
|||||||
// the rate-limit checks.
|
// the rate-limit checks.
|
||||||
//
|
//
|
||||||
// Copyright (C) 2026 Mikhail Yenuchenko
|
// Copyright (C) 2026 Mikhail Yenuchenko
|
||||||
// SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -79,6 +78,7 @@ type config struct {
|
|||||||
saslDBPath string
|
saslDBPath string
|
||||||
saslRealm string
|
saslRealm string
|
||||||
postfixDir string
|
postfixDir string
|
||||||
|
deployRoot string
|
||||||
}
|
}
|
||||||
|
|
||||||
func loadConfig() config {
|
func loadConfig() config {
|
||||||
@@ -139,6 +139,7 @@ func loadConfig() config {
|
|||||||
saslDBPath: envDefault("SASL_DB_PATH", filepath.Join(dataDir, "sasl", "sasldb2")),
|
saslDBPath: envDefault("SASL_DB_PATH", filepath.Join(dataDir, "sasl", "sasldb2")),
|
||||||
saslRealm: saslRealm(),
|
saslRealm: saslRealm(),
|
||||||
postfixDir: envDefault("POSTFIX_DIR", filepath.Join(dataDir, "postfix")),
|
postfixDir: envDefault("POSTFIX_DIR", filepath.Join(dataDir, "postfix")),
|
||||||
|
deployRoot: envDefault("SELFPOST_DEPLOY_ROOT", "/selfpost-deploy"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,7 +224,8 @@ func run() error {
|
|||||||
// touch the database, so schema/format skew between versions cannot corrupt
|
// touch the database, so schema/format skew between versions cannot corrupt
|
||||||
// the restored state. A match consumes the manifest; its absence is the
|
// the restored state. A match consumes the manifest; its absence is the
|
||||||
// normal (non-restore) case.
|
// normal (non-restore) case.
|
||||||
if err := backup.CheckRestore(cfg.manifestPath, buildinfo.Version); err != nil {
|
restored, err := backup.CheckRestore(cfg.manifestPath, buildinfo.Version)
|
||||||
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -236,6 +238,13 @@ func run() error {
|
|||||||
}
|
}
|
||||||
defer st.Close()
|
defer st.Close()
|
||||||
|
|
||||||
|
if restored {
|
||||||
|
log.Printf("restore manifest accepted; regenerating mail-path maps from SQLite")
|
||||||
|
if err := resyncAfterRestore(cfg, st, false); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var wg sync.WaitGroup
|
var wg sync.WaitGroup
|
||||||
errc := make(chan error, 3)
|
errc := make(chan error, 3)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,490 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"archive/tar"
|
||||||
|
"bytes"
|
||||||
|
"compress/gzip"
|
||||||
|
"encoding/json"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/mixeme/selfpost/internal/backup"
|
||||||
|
"github.com/mixeme/selfpost/internal/buildinfo"
|
||||||
|
"github.com/mixeme/selfpost/internal/secretfile"
|
||||||
|
"github.com/mixeme/selfpost/internal/store"
|
||||||
|
"golang.org/x/crypto/bcrypt"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Restoring a SelfPost backup is not a code path in the panel: the operator
|
||||||
|
// extracts the archive into a project directory and starts the image, and the
|
||||||
|
// panel is expected to come up on it (architecture.md § Persistence). Nothing
|
||||||
|
// below stubs that story out — the archive is downloaded from a running panel
|
||||||
|
// through /backup, unpacked the way `tar -xzf` unpacks it, and a second panel
|
||||||
|
// is started on the result through the same startup sequence run() uses:
|
||||||
|
// CheckRestore, store.Open, newPanel, Start.
|
||||||
|
|
||||||
|
const (
|
||||||
|
restorePassword = "correct-horse-battery"
|
||||||
|
restoreDomain = "bs.example.ru"
|
||||||
|
restoreSubject = "Order confirmation"
|
||||||
|
)
|
||||||
|
|
||||||
|
// restored is the outcome of a full backup-and-restore round trip.
|
||||||
|
type restored struct {
|
||||||
|
panel http.Handler // panel booted on the restored data directory
|
||||||
|
deployRoot string // the restored project directory
|
||||||
|
dataDir string // the restored /data
|
||||||
|
session *http.Cookie // a session opened before the backup was taken
|
||||||
|
}
|
||||||
|
|
||||||
|
// restoreFromOwnBackup runs the operator's path end to end: seed a panel that
|
||||||
|
// has been in use, sign in, download a backup from it, extract that archive
|
||||||
|
// into an empty directory and boot a second panel there. A non-empty password
|
||||||
|
// takes the encrypted download and decrypts it on the way in, which is what an
|
||||||
|
// operator does with a .spbk file.
|
||||||
|
func restoreFromOwnBackup(t *testing.T, password string) restored {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
live := seedPanelProject(t)
|
||||||
|
panel := bootPanel(t, live)
|
||||||
|
session := signIn(t, panel)
|
||||||
|
archive := downloadBackup(t, panel, session, password)
|
||||||
|
|
||||||
|
target := t.TempDir()
|
||||||
|
extract(t, archive, target)
|
||||||
|
|
||||||
|
return restored{
|
||||||
|
panel: bootPanel(t, target),
|
||||||
|
deployRoot: target,
|
||||||
|
dataDir: filepath.Join(target, "data"),
|
||||||
|
session: session,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The panel has to come up on the restored directory and show the state that
|
||||||
|
// was in the archive, without the operator touching anything else: the domain
|
||||||
|
// and its journal are in the database the archive carried, and the credentials
|
||||||
|
// that worked before the restore still work after it.
|
||||||
|
func TestPanelBootsOnADataDirectoryRestoredFromItsOwnBackup(t *testing.T) {
|
||||||
|
r := restoreFromOwnBackup(t, "")
|
||||||
|
|
||||||
|
body := getPage(t, r.panel, "/deliveries", signIn(t, r.panel))
|
||||||
|
for _, want := range []string{restoreDomain, restoreSubject} {
|
||||||
|
if !strings.Contains(body, want) {
|
||||||
|
t.Errorf("the restored panel's send log does not show %q:\n%s", want, body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The archive carries the daemon files, and the first boot after restore
|
||||||
|
// re-derives the maps from SQLite so they stay aligned with the database.
|
||||||
|
for path, want := range map[string]string{
|
||||||
|
filepath.Join("opendkim", "keys", restoreDomain, "selfpost.private"): "PRIVATE KEY",
|
||||||
|
filepath.Join("sasl", "sasldb2"): "SASLDB",
|
||||||
|
filepath.Join("postfix", "sender_login_maps"): "@" + restoreDomain + " shop\n",
|
||||||
|
} {
|
||||||
|
got, err := os.ReadFile(filepath.Join(r.dataDir, path))
|
||||||
|
if err != nil {
|
||||||
|
t.Errorf("the restored data directory has no %s: %v", path, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if string(got) != want {
|
||||||
|
t.Errorf("%s = %q, want %q", path, got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, name := range []string{backup.ComposeFileName, backup.EnvFileName} {
|
||||||
|
if _, err := os.Stat(filepath.Join(r.deployRoot, name)); err != nil {
|
||||||
|
t.Errorf("the restored project directory has no %s: %v", name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The one-time setup link is closed by the presence of a panel user, and the
|
||||||
|
// restored database has one. A restore that reopened it would publish a link
|
||||||
|
// that creates a second global administrator on a server holding live mail
|
||||||
|
// credentials (security.md).
|
||||||
|
func TestARestoreDoesNotReopenTheSetupLink(t *testing.T) {
|
||||||
|
r := restoreFromOwnBackup(t, "")
|
||||||
|
|
||||||
|
if _, err := os.Stat(filepath.Join(r.dataDir, "setup-token")); !os.IsNotExist(err) {
|
||||||
|
t.Errorf("the restored panel wrote a setup token (stat err = %v)", err)
|
||||||
|
}
|
||||||
|
body := getPage(t, r.panel, "/login", nil)
|
||||||
|
if strings.Contains(body, "No administrator has been created yet") {
|
||||||
|
t.Errorf("the restored panel offers first-run setup:\n%s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sessions live in the database, so they travel in the archive: a cookie that
|
||||||
|
// was valid when the backup was taken is valid again on the restored panel.
|
||||||
|
// That is the documented consequence of restoring an older backup (guide §
|
||||||
|
// Backup and restore) — stated here so it cannot change by accident.
|
||||||
|
func TestARestoredPanelHonoursSessionsFromTheArchive(t *testing.T) {
|
||||||
|
r := restoreFromOwnBackup(t, "")
|
||||||
|
|
||||||
|
rec := request(t, r.panel, http.MethodGet, "/deliveries", nil, r.session)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Errorf("a session from before the backup = %d on the restored panel, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// An encrypted download is the same archive inside an envelope, so it restores
|
||||||
|
// the same way once the password is supplied. The archive is never written to
|
||||||
|
// disk in the clear by the panel, so this is the only place the two paths can
|
||||||
|
// be shown to agree.
|
||||||
|
func TestAnEncryptedBackupRestoresTheSameWay(t *testing.T) {
|
||||||
|
r := restoreFromOwnBackup(t, "a-long-enough-password")
|
||||||
|
|
||||||
|
body := getPage(t, r.panel, "/deliveries", signIn(t, r.panel))
|
||||||
|
if !strings.Contains(body, restoreSubject) {
|
||||||
|
t.Errorf("the panel restored from an encrypted backup lost the send log:\n%s", body)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// A restore boot runs one Resync from SQLite. If the archive's Postfix map
|
||||||
|
// drifted from the database, that step puts it back before mail flows.
|
||||||
|
func TestResyncAfterRestoreHealsDriftedMaps(t *testing.T) {
|
||||||
|
deployRoot := seedPanelProject(t)
|
||||||
|
dataDir := filepath.Join(deployRoot, "data")
|
||||||
|
cfg := panelConfig(t, deployRoot)
|
||||||
|
|
||||||
|
mapPath := filepath.Join(dataDir, "postfix", "sender_login_maps")
|
||||||
|
if err := os.WriteFile(mapPath, []byte("stale map\n"), 0o640); err != nil {
|
||||||
|
t.Fatalf("write stale map: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
manifest, err := json.Marshal(backup.Manifest{
|
||||||
|
Format: backup.FormatFull,
|
||||||
|
Version: buildinfo.Version,
|
||||||
|
CreatedAt: "2026-08-14T00:00:00Z",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("marshal manifest: %v", err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(cfg.manifestPath, manifest, 0o644); err != nil {
|
||||||
|
t.Fatalf("write manifest: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
restored, err := backup.CheckRestore(cfg.manifestPath, buildinfo.Version)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("CheckRestore: %v", err)
|
||||||
|
}
|
||||||
|
if !restored {
|
||||||
|
t.Fatal("CheckRestore did not report a restore")
|
||||||
|
}
|
||||||
|
|
||||||
|
st, err := store.Open(cfg.dbPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open store: %v", err)
|
||||||
|
}
|
||||||
|
defer st.Close()
|
||||||
|
|
||||||
|
if err := resyncAfterRestore(cfg, st, true); err != nil {
|
||||||
|
t.Fatalf("resync after restore: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
got, err := os.ReadFile(mapPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read sender map: %v", err)
|
||||||
|
}
|
||||||
|
want := "@" + restoreDomain + " shop\n"
|
||||||
|
if string(got) != want {
|
||||||
|
t.Errorf("sender map = %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The version guard is what stops a restore from being silently corrupted by
|
||||||
|
// schema skew, and it runs before anything opens the database. The manifest
|
||||||
|
// stays put on a mismatch: the operator's next move is to start the image the
|
||||||
|
// backup names, and it has to be there when they do.
|
||||||
|
func TestPanelRefusesADataDirectoryRestoredFromAnotherVersion(t *testing.T) {
|
||||||
|
deployRoot := seedPanelProject(t)
|
||||||
|
dataDir := filepath.Join(deployRoot, "data")
|
||||||
|
var archive bytes.Buffer
|
||||||
|
if err := backup.Create(&archive, backup.Params{
|
||||||
|
DataDir: dataDir,
|
||||||
|
DBPath: filepath.Join(dataDir, "selfpost.db"),
|
||||||
|
Version: "9.9.9",
|
||||||
|
DeployRoot: deployRoot,
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("create backup: %v", err)
|
||||||
|
}
|
||||||
|
target := t.TempDir()
|
||||||
|
extract(t, archive.Bytes(), target)
|
||||||
|
|
||||||
|
cfg := panelConfig(t, target)
|
||||||
|
_, err := backup.CheckRestore(cfg.manifestPath, buildinfo.Version)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("the panel booted on a data directory left by another version")
|
||||||
|
}
|
||||||
|
for _, want := range []string{"9.9.9", buildinfo.Version} {
|
||||||
|
if !strings.Contains(err.Error(), want) {
|
||||||
|
t.Errorf("the refusal does not name %q, so the operator cannot tell which image to run: %v", want, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if _, statErr := os.Stat(cfg.manifestPath); statErr != nil {
|
||||||
|
t.Errorf("the manifest was consumed by a refused restore: %v", statErr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// seedPanelProject builds an operator project tree: data/ with a panel that has
|
||||||
|
// been in use, plus docker-compose.yml, .env, and certs/ for full backups.
|
||||||
|
func seedPanelProject(t *testing.T) string {
|
||||||
|
t.Helper()
|
||||||
|
deployRoot := t.TempDir()
|
||||||
|
dataDir := filepath.Join(deployRoot, "data")
|
||||||
|
if err := os.MkdirAll(dataDir, 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir data: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
st, err := store.Open(filepath.Join(dataDir, "selfpost.db"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open store: %v", err)
|
||||||
|
}
|
||||||
|
hash, err := bcrypt.GenerateFromPassword([]byte(restorePassword), bcrypt.MinCost)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("hash password: %v", err)
|
||||||
|
}
|
||||||
|
if err := st.CreateGlobalUser("admin", string(hash)); err != nil {
|
||||||
|
t.Fatalf("create user: %v", err)
|
||||||
|
}
|
||||||
|
dom, err := st.AddDomain(restoreDomain, "selfpost")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("add domain: %v", err)
|
||||||
|
}
|
||||||
|
if _, err := st.AddApplication(dom.ID, "shop", store.AddressModeWildcard, nil); err != nil {
|
||||||
|
t.Fatalf("add application: %v", err)
|
||||||
|
}
|
||||||
|
if err := st.InsertQueued(store.SendLogEntry{
|
||||||
|
QueueID: "4A1B2C3D", Domain: restoreDomain, AppLogin: "shop",
|
||||||
|
From: "noreply@" + restoreDomain, To: "customer@example.net", Subject: restoreSubject,
|
||||||
|
}); err != nil {
|
||||||
|
t.Fatalf("insert send-log row: %v", err)
|
||||||
|
}
|
||||||
|
if err := st.Close(); err != nil {
|
||||||
|
t.Fatalf("close store: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
for path, content := range map[string]string{
|
||||||
|
filepath.Join("opendkim", "keys", restoreDomain, "selfpost.private"): "PRIVATE KEY",
|
||||||
|
filepath.Join("sasl", "sasldb2"): "SASLDB",
|
||||||
|
filepath.Join("postfix", "sender_login_maps"): "@" + restoreDomain + " shop\n",
|
||||||
|
filepath.Join("log", "mail.log"): "postfix/smtp[1]: 4A1B2C3D: status=sent",
|
||||||
|
} {
|
||||||
|
full := filepath.Join(dataDir, path)
|
||||||
|
if err := os.MkdirAll(filepath.Dir(full), 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir %s: %v", full, err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(full, []byte(content), 0o640); err != nil {
|
||||||
|
t.Fatalf("write %s: %v", full, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
writeDeployFile(t, filepath.Join(deployRoot, backup.ComposeFileName), "services:\n selfpost:\n image: test\n")
|
||||||
|
writeDeployFile(t, filepath.Join(deployRoot, backup.EnvFileName), "SELFPOST_HOSTNAME=mail.example.ru\n")
|
||||||
|
writeDeployFile(t, filepath.Join(deployRoot, backup.CertsDirName, "fullchain.pem"), "CERT")
|
||||||
|
writeDeployFile(t, filepath.Join(deployRoot, backup.CertsDirName, "privkey.pem"), "KEY")
|
||||||
|
return deployRoot
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeDeployFile(t *testing.T, path, content string) {
|
||||||
|
t.Helper()
|
||||||
|
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(path, []byte(content), 0o640); err != nil {
|
||||||
|
t.Fatalf("write %s: %v", path, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// panelConfig resolves the panel's own configuration for a project directory, so
|
||||||
|
// the test finds the files where the running binary would look for them rather
|
||||||
|
// than where it put them. Cookies are marked insecure for the same reason the
|
||||||
|
// e2e stand does it: the test client speaks plain HTTP.
|
||||||
|
func panelConfig(t *testing.T, deployRoot string) config {
|
||||||
|
t.Helper()
|
||||||
|
dataDir := filepath.Join(deployRoot, "data")
|
||||||
|
t.Setenv("SELFPOST_DATA_DIR", dataDir)
|
||||||
|
t.Setenv("SELFPOST_DEPLOY_ROOT", deployRoot)
|
||||||
|
t.Setenv("PANEL_COOKIE_SECURE", "false")
|
||||||
|
t.Setenv("SELFPOST_HOSTNAME", "mail.example.ru")
|
||||||
|
// MAIL_LOG's default is an absolute path, not one derived from the data
|
||||||
|
// directory; without this the panel would read the host's /data.
|
||||||
|
t.Setenv("MAIL_LOG", filepath.Join(dataDir, "log", "mail.log"))
|
||||||
|
return loadConfig()
|
||||||
|
}
|
||||||
|
|
||||||
|
// bootPanel performs the startup sequence run() performs, in the same order,
|
||||||
|
// and returns the panel's HTTP handler.
|
||||||
|
func bootPanel(t *testing.T, deployRoot string) http.Handler {
|
||||||
|
t.Helper()
|
||||||
|
cfg := panelConfig(t, deployRoot)
|
||||||
|
|
||||||
|
restored, err := backup.CheckRestore(cfg.manifestPath, buildinfo.Version)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the panel refused to start on %s: %v", deployRoot, err)
|
||||||
|
}
|
||||||
|
if restored {
|
||||||
|
if _, err := os.Stat(cfg.manifestPath); err == nil {
|
||||||
|
t.Errorf("the restore manifest was not consumed, so the next start is gated by it too")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
st, err := store.Open(cfg.dbPath)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open the restored database: %v", err)
|
||||||
|
}
|
||||||
|
t.Cleanup(func() { _ = st.Close() })
|
||||||
|
|
||||||
|
if restored {
|
||||||
|
if err := resyncAfterRestore(cfg, st, true); err != nil {
|
||||||
|
t.Fatalf("resync after restore: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
panel, err := newPanel(cfg, st)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("build the panel: %v", err)
|
||||||
|
}
|
||||||
|
if err := panel.Start(); err != nil {
|
||||||
|
t.Fatalf("start the panel: %v", err)
|
||||||
|
}
|
||||||
|
return panel.Handler()
|
||||||
|
}
|
||||||
|
|
||||||
|
// signIn signs in as the seeded administrator and returns the session cookie.
|
||||||
|
func signIn(t *testing.T, h http.Handler) *http.Cookie {
|
||||||
|
t.Helper()
|
||||||
|
form := url.Values{"username": {"admin"}, "password": {restorePassword}}
|
||||||
|
rec := request(t, h, http.MethodPost, "/login", strings.NewReader(form.Encode()), nil)
|
||||||
|
if rec.Code != http.StatusSeeOther {
|
||||||
|
t.Fatalf("sign in = %d, want 303:\n%s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
cookies := rec.Result().Cookies()
|
||||||
|
if len(cookies) == 0 {
|
||||||
|
t.Fatal("sign in issued no session cookie")
|
||||||
|
}
|
||||||
|
return cookies[0]
|
||||||
|
}
|
||||||
|
|
||||||
|
// downloadBackup takes a backup through the panel's own /backup route, the way
|
||||||
|
// the operator does. An empty password downloads the plain archive; otherwise
|
||||||
|
// the response is a .spbk envelope, which is decrypted here.
|
||||||
|
func downloadBackup(t *testing.T, h http.Handler, session *http.Cookie, password string) []byte {
|
||||||
|
t.Helper()
|
||||||
|
form := url.Values{}
|
||||||
|
if password != "" {
|
||||||
|
form.Set("encrypt", "1")
|
||||||
|
form.Set("password", password)
|
||||||
|
form.Set("password_confirm", password)
|
||||||
|
}
|
||||||
|
rec := request(t, h, http.MethodPost, "/backup", strings.NewReader(form.Encode()), session)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("download a backup = %d, want 200:\n%s", rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
if got := rec.Header().Get("Cache-Control"); got != "no-store" {
|
||||||
|
t.Errorf("Cache-Control = %q; an archive of every secret on the server must not be cached", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
body := rec.Body.Bytes()
|
||||||
|
if password == "" {
|
||||||
|
if secretfile.HasMagic(body) {
|
||||||
|
t.Fatal("an unencrypted download came back as an envelope")
|
||||||
|
}
|
||||||
|
return body
|
||||||
|
}
|
||||||
|
|
||||||
|
if !secretfile.HasMagic(body) {
|
||||||
|
t.Fatal("the download is not an encrypted envelope, so the archive left the panel in the clear")
|
||||||
|
}
|
||||||
|
r, err := secretfile.NewReader(bytes.NewReader(body), password)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("open the encrypted backup: %v", err)
|
||||||
|
}
|
||||||
|
plain, err := io.ReadAll(r)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("decrypt the backup: %v", err)
|
||||||
|
}
|
||||||
|
return plain
|
||||||
|
}
|
||||||
|
|
||||||
|
// extract unpacks a backup archive into dir, as `tar -xzf` does onto the project
|
||||||
|
// directory before the image is started.
|
||||||
|
func extract(t *testing.T, archive []byte, dir string) {
|
||||||
|
t.Helper()
|
||||||
|
gz, err := gzip.NewReader(bytes.NewReader(archive))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("the download is not a gzip stream: %v", err)
|
||||||
|
}
|
||||||
|
tr := tar.NewReader(gz)
|
||||||
|
for {
|
||||||
|
hdr, err := tr.Next()
|
||||||
|
if err == io.EOF {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read the archive: %v", err)
|
||||||
|
}
|
||||||
|
name := filepath.Clean(filepath.FromSlash(hdr.Name))
|
||||||
|
if strings.HasPrefix(name, "..") || filepath.IsAbs(name) {
|
||||||
|
t.Fatalf("the archive escapes the directory it is extracted into: %q", hdr.Name)
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, name)
|
||||||
|
|
||||||
|
switch hdr.Typeflag {
|
||||||
|
case tar.TypeDir:
|
||||||
|
if err := os.MkdirAll(path, hdr.FileInfo().Mode().Perm()); err != nil {
|
||||||
|
t.Fatalf("mkdir %s: %v", path, err)
|
||||||
|
}
|
||||||
|
case tar.TypeReg:
|
||||||
|
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir %s: %v", filepath.Dir(path), err)
|
||||||
|
}
|
||||||
|
f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, hdr.FileInfo().Mode().Perm())
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if _, err := io.Copy(f, tr); err != nil {
|
||||||
|
f.Close()
|
||||||
|
t.Fatalf("write %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if err := f.Close(); err != nil {
|
||||||
|
t.Fatalf("close %s: %v", path, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// getPage performs a GET and returns the body, failing on any non-200.
|
||||||
|
func getPage(t *testing.T, h http.Handler, target string, session *http.Cookie) string {
|
||||||
|
t.Helper()
|
||||||
|
rec := request(t, h, http.MethodGet, target, nil, session)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("GET %s = %d, want 200:\n%s", target, rec.Code, rec.Body.String())
|
||||||
|
}
|
||||||
|
return rec.Body.String()
|
||||||
|
}
|
||||||
|
|
||||||
|
// request drives the panel's real handler chain, including the origin check,
|
||||||
|
// with the headers a browser on the panel's own page would send.
|
||||||
|
func request(t *testing.T, h http.Handler, method, target string, body io.Reader, session *http.Cookie) *httptest.ResponseRecorder {
|
||||||
|
t.Helper()
|
||||||
|
req := httptest.NewRequest(method, "http://mail.example.ru"+target, body)
|
||||||
|
req.Host = "mail.example.ru"
|
||||||
|
if method == http.MethodPost {
|
||||||
|
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||||
|
req.Header.Set("Sec-Fetch-Site", "same-origin")
|
||||||
|
}
|
||||||
|
if session != nil {
|
||||||
|
req.AddCookie(session)
|
||||||
|
}
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
h.ServeHTTP(rec, req)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
@@ -6,9 +6,9 @@
|
|||||||
//
|
//
|
||||||
// docker exec <container> selfpost-backup > selfpost-backup.tar.gz
|
// docker exec <container> selfpost-backup > selfpost-backup.tar.gz
|
||||||
//
|
//
|
||||||
// Use -o to write to a file instead. The resulting archive contains DKIM private
|
// Use -o to write to a file instead. The resulting archive is self-contained:
|
||||||
// keys, the admin password hash and SASL credentials — treat it as a secret
|
// data/, docker-compose.yml, .env, and certs/ when present — treat it as a
|
||||||
// (architecture.md § Persistence).
|
// secret (architecture.md § Persistence).
|
||||||
//
|
//
|
||||||
// Given a password (SELFPOST_BACKUP_PASSWORD or -password-file, never an
|
// Given a password (SELFPOST_BACKUP_PASSWORD or -password-file, never an
|
||||||
// argument, which would show up in the process list) the archive is written as
|
// argument, which would show up in the process list) the archive is written as
|
||||||
@@ -18,7 +18,6 @@
|
|||||||
// docker exec -i <container> selfpost-backup -decrypt < backup.spbk > backup.tar.gz
|
// docker exec -i <container> selfpost-backup -decrypt < backup.spbk > backup.tar.gz
|
||||||
//
|
//
|
||||||
// Copyright (C) 2026 Mikhail Yenuchenko
|
// Copyright (C) 2026 Mikhail Yenuchenko
|
||||||
// SPDX-License-Identifier: AGPL-3.0-only
|
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -91,6 +90,10 @@ func run(outPath, password string) error {
|
|||||||
DataDir: dataDir,
|
DataDir: dataDir,
|
||||||
DBPath: dbPath,
|
DBPath: dbPath,
|
||||||
Version: buildinfo.Version,
|
Version: buildinfo.Version,
|
||||||
|
DeployRoot: envDefault("SELFPOST_DEPLOY_ROOT", "/selfpost-deploy"),
|
||||||
|
OnWarn: func(msg string) {
|
||||||
|
fmt.Fprintf(os.Stderr, "selfpost-backup: %s\n", msg)
|
||||||
|
},
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,13 +9,18 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/mixeme/selfpost/internal/backup"
|
||||||
"github.com/mixeme/selfpost/internal/store"
|
"github.com/mixeme/selfpost/internal/store"
|
||||||
)
|
)
|
||||||
|
|
||||||
// seedDataDir builds the minimum /data tree a backup can be taken from.
|
// seedProject builds the minimum operator project tree a backup can be taken from.
|
||||||
func seedDataDir(t *testing.T) string {
|
func seedProject(t *testing.T) (deployRoot, dataDir string) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
dataDir := t.TempDir()
|
deployRoot = t.TempDir()
|
||||||
|
dataDir = filepath.Join(deployRoot, "data")
|
||||||
|
if err := os.MkdirAll(dataDir, 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir data: %v", err)
|
||||||
|
}
|
||||||
st, err := store.Open(filepath.Join(dataDir, "selfpost.db"))
|
st, err := store.Open(filepath.Join(dataDir, "selfpost.db"))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("open store: %v", err)
|
t.Fatalf("open store: %v", err)
|
||||||
@@ -26,16 +31,31 @@ func seedDataDir(t *testing.T) string {
|
|||||||
if err := st.Close(); err != nil {
|
if err := st.Close(); err != nil {
|
||||||
t.Fatalf("close store: %v", err)
|
t.Fatalf("close store: %v", err)
|
||||||
}
|
}
|
||||||
|
writeFile(t, filepath.Join(deployRoot, backup.ComposeFileName), "services:\n selfpost:\n image: test\n")
|
||||||
|
writeFile(t, filepath.Join(deployRoot, backup.EnvFileName), "SELFPOST_HOSTNAME=mail.example.com\n")
|
||||||
|
writeFile(t, filepath.Join(deployRoot, backup.CertsDirName, "fullchain.pem"), "CERT")
|
||||||
|
writeFile(t, filepath.Join(deployRoot, backup.CertsDirName, "privkey.pem"), "KEY")
|
||||||
t.Setenv("SELFPOST_DATA_DIR", dataDir)
|
t.Setenv("SELFPOST_DATA_DIR", dataDir)
|
||||||
t.Setenv("SELFPOST_DB_PATH", filepath.Join(dataDir, "selfpost.db"))
|
t.Setenv("SELFPOST_DB_PATH", filepath.Join(dataDir, "selfpost.db"))
|
||||||
return dataDir
|
t.Setenv("SELFPOST_DEPLOY_ROOT", deployRoot)
|
||||||
|
return deployRoot, dataDir
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeFile(t *testing.T, path, content string) {
|
||||||
|
t.Helper()
|
||||||
|
if err := os.MkdirAll(filepath.Dir(path), 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir %s: %v", path, err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(path, []byte(content), 0o640); err != nil {
|
||||||
|
t.Fatalf("write %s: %v", path, err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// An encrypted backup is only worth having if the container it came from can
|
// An encrypted backup is only worth having if the container it came from can
|
||||||
// hand it back as an ordinary archive during a restore, so the two halves of
|
// hand it back as an ordinary archive during a restore, so the two halves of
|
||||||
// the CLI are tested as the one round trip an operator actually performs.
|
// the CLI are tested as the one round trip an operator actually performs.
|
||||||
func TestEncryptedBackupRoundTrip(t *testing.T) {
|
func TestEncryptedBackupRoundTrip(t *testing.T) {
|
||||||
seedDataDir(t)
|
seedProject(t)
|
||||||
dir := t.TempDir()
|
dir := t.TempDir()
|
||||||
encrypted := filepath.Join(dir, "backup.spbk")
|
encrypted := filepath.Join(dir, "backup.spbk")
|
||||||
plain := filepath.Join(dir, "backup.tar.gz")
|
plain := filepath.Join(dir, "backup.tar.gz")
|
||||||
@@ -81,7 +101,12 @@ func TestEncryptedBackupRoundTrip(t *testing.T) {
|
|||||||
}
|
}
|
||||||
names[hdr.Name] = true
|
names[hdr.Name] = true
|
||||||
}
|
}
|
||||||
for _, want := range []string{"manifest.json", "selfpost.db"} {
|
for _, want := range []string{
|
||||||
|
backup.DataArchivePrefix + backup.ManifestName,
|
||||||
|
backup.DataArchivePrefix + "selfpost.db",
|
||||||
|
backup.ComposeFileName,
|
||||||
|
backup.EnvFileName,
|
||||||
|
} {
|
||||||
if !names[want] {
|
if !names[want] {
|
||||||
t.Errorf("decrypted archive has no %s (entries: %v)", want, names)
|
t.Errorf("decrypted archive has no %s (entries: %v)", want, names)
|
||||||
}
|
}
|
||||||
@@ -91,7 +116,7 @@ func TestEncryptedBackupRoundTrip(t *testing.T) {
|
|||||||
// Without a password the CLI keeps producing the plain archive that existing
|
// Without a password the CLI keeps producing the plain archive that existing
|
||||||
// backup scripts consume.
|
// backup scripts consume.
|
||||||
func TestUnencryptedBackupStaysPlain(t *testing.T) {
|
func TestUnencryptedBackupStaysPlain(t *testing.T) {
|
||||||
seedDataDir(t)
|
seedProject(t)
|
||||||
out := filepath.Join(t.TempDir(), "backup.tar.gz")
|
out := filepath.Join(t.TempDir(), "backup.tar.gz")
|
||||||
if err := run(out, ""); err != nil {
|
if err := run(out, ""); err != nil {
|
||||||
t.Fatalf("create backup: %v", err)
|
t.Fatalf("create backup: %v", err)
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ services:
|
|||||||
TLS_KEY_FILE: /etc/postfix/tls/<hostname>.key
|
TLS_KEY_FILE: /etc/postfix/tls/<hostname>.key
|
||||||
volumes: !override
|
volumes: !override
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
|
- .:/selfpost-deploy:ro
|
||||||
# Replace <hostname> with your actual mail/panel hostname, matching
|
# Replace <hostname> with your actual mail/panel hostname, matching
|
||||||
# the Caddyfile below and SELFPOST_HOSTNAME.
|
# the Caddyfile below and SELFPOST_HOSTNAME.
|
||||||
- ./caddy/caddy-data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/<hostname>:/etc/postfix/tls:ro
|
- ./caddy/caddy-data/caddy/certificates/acme-v02.api.letsencrypt.org-directory/<hostname>:/etc/postfix/tls:ro
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
selfpost:
|
selfpost:
|
||||||
image: ghcr.io/mixeme/selfpost:1.2.5
|
image: ghcr.io/mixeme/selfpost:1.3.0
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
SELFPOST_HOSTNAME: "${SELFPOST_HOSTNAME:?set the mail/panel hostname, e.g. mail.example.com}"
|
SELFPOST_HOSTNAME: "${SELFPOST_HOSTNAME:?set the mail/panel hostname, e.g. mail.example.com}"
|
||||||
@@ -58,6 +58,9 @@ services:
|
|||||||
# kept) so the delivery lines that resolve a queued send-log row survive
|
# kept) so the delivery lines that resolve a queued send-log row survive
|
||||||
# a container recreate; it is diagnostics and is left out of backups.
|
# a container recreate; it is diagnostics and is left out of backups.
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
|
# Read-only project root for full backups: docker-compose.yml, .env, and
|
||||||
|
# certs/ are archived alongside /data (architecture.md § Persistence).
|
||||||
|
- .:/selfpost-deploy:ro
|
||||||
# Read-only: SelfPost only ever reads certificates, never manages them
|
# Read-only: SelfPost only ever reads certificates, never manages them
|
||||||
# (spec 10 p.2). Point this at wherever your reverse-proxy/certbot
|
# (spec 10 p.2). Point this at wherever your reverse-proxy/certbot
|
||||||
# writes PEM files, e.g. /etc/letsencrypt on the host.
|
# writes PEM files, e.g. /etc/letsencrypt on the host.
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ services:
|
|||||||
# network at selfpost:8080 instead (see nginx.conf.example).
|
# network at selfpost:8080 instead (see nginx.conf.example).
|
||||||
volumes: !override
|
volumes: !override
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
|
- .:/selfpost-deploy:ro
|
||||||
# Same host directory certbot below writes into — plain bind mount,
|
# Same host directory certbot below writes into — plain bind mount,
|
||||||
# no named volume, so the PEM files are as directly inspectable as in
|
# no named volume, so the PEM files are as directly inspectable as in
|
||||||
# the Apache scenario (spec 10.3).
|
# the Apache scenario (spec 10.3).
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ services:
|
|||||||
- "587:587"
|
- "587:587"
|
||||||
volumes: !override
|
volumes: !override
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
|
- .:/selfpost-deploy:ro
|
||||||
# Populated by extract-cert.sh from traefik's acme.json — see below.
|
# Populated by extract-cert.sh from traefik's acme.json — see below.
|
||||||
- ./traefik/extracted-certs:/etc/postfix/tls:ro
|
- ./traefik/extracted-certs:/etc/postfix/tls:ro
|
||||||
labels:
|
labels:
|
||||||
|
|||||||
+69
-24
@@ -154,7 +154,10 @@ state for an older message and the page reports it as such, not as a failure.
|
|||||||
## Panel HTTP surface
|
## Panel HTTP surface
|
||||||
|
|
||||||
Canonical routes: [internal/web/web.go](../internal/web/web.go). Authenticated
|
Canonical routes: [internal/web/web.go](../internal/web/web.go). Authenticated
|
||||||
unless noted. The table below is a summary — HTMX fragment endpoints
|
unless noted. Routes marked **global** return **404** for domain administrators
|
||||||
|
(`requireGlobal()` in
|
||||||
|
[internal/web/handlers/authz.go](../internal/web/handlers/authz.go)). The table
|
||||||
|
below is a summary — HTMX fragment endpoints
|
||||||
(`/status/fragment`, `/deliveries/rows`, `/mail-queue/body`,
|
(`/status/fragment`, `/deliveries/rows`, `/mail-queue/body`,
|
||||||
`/system-log/body`, …) and every POST variant live in `web.go`.
|
`/system-log/body`, …) and every POST variant live in `web.go`.
|
||||||
|
|
||||||
@@ -165,17 +168,17 @@ unless noted. The table below is a summary — HTMX fragment endpoints
|
|||||||
| `/setup/*` | One-time admin bootstrap |
|
| `/setup/*` | One-time admin bootstrap |
|
||||||
| `/login`, `/logout` | Session auth |
|
| `/login`, `/logout` | Session auth |
|
||||||
| `/account` | 308 redirect to `/settings` (pre-1.2.3 route, kept as a compat shim) |
|
| `/account` | 308 redirect to `/settings` (pre-1.2.3 route, kept as a compat shim) |
|
||||||
| `/status` | Process, cert, socket, PTR checks; machine CPU/memory/network |
|
| `/status`, `/status/*` | **Global.** Process, cert, socket, PTR checks; machine CPU/memory/network |
|
||||||
| `/domains`, `/domains/*` | Domain and application CRUD, DKIM, L2 limits |
|
| `/domains` | Domain list; `POST /domains` (add domain) is **global** |
|
||||||
| `/domains/import` | Domain import (`POST`; form on the Backup page) |
|
| `/domains/{id}`, `/domains/{id}/*` | Assigned-domain detail for domain-admins; delete domain is **global** |
|
||||||
| `/deliveries` | Send log with filters |
|
| `/domains/import` | **Global.** Domain import (`POST`; form on the Backup page) |
|
||||||
| `/deliveries/{id}` | One send-log row in full, with its `mail.log` lines |
|
| `/deliveries`, `/deliveries/{id}` | Send log with filters; scoped to assigned domains for domain-admins |
|
||||||
| `/mail-queue` | Postfix queue view |
|
| `/mail-queue`, `/mail-queue/*` | **Global.** Postfix queue view |
|
||||||
| `/system-log` | `mail.log` tail |
|
| `/system-log`, `/system-log/*` | **Global.** `mail.log` tail |
|
||||||
| `/reload` | Reload OpenDKIM + Postfix maps |
|
| `/reload` | **Global.** `POST` — reload OpenDKIM + Postfix maps |
|
||||||
| `/backup` | Full backup download (page also hosts the import form) |
|
| `/backup`, `/backup/*` | **Global.** Full backup download (page also hosts the import form) |
|
||||||
| `/settings` | Admin username/password and DMARC report address |
|
| `/settings` | Username/password for any user; DMARC report default is **global** only |
|
||||||
| `/users`, `/users/*` | Panel user CRUD (global admin only) |
|
| `/users`, `/users/*` | **Global.** Panel user CRUD |
|
||||||
|
|
||||||
HTMX polling refreshes monitoring fragments (5 s while the operator is active on
|
HTMX polling refreshes monitoring fragments (5 s while the operator is active on
|
||||||
the page, 30 s when the tab is visible but idle, none when hidden — scheduled in
|
the page, 30 s when the tab is visible but idle, none when hidden — scheduled in
|
||||||
@@ -194,13 +197,16 @@ holds the cookie works after process restart, redeploy, or full backup restore.
|
|||||||
absolute cap (regular use keeps the session alive indefinitely).
|
absolute cap (regular use keeps the session alive indefinitely).
|
||||||
- **Renewal** — DB `last_seen` and cookie `Max-Age` update at most once per hour
|
- **Renewal** — DB `last_seen` and cookie `Max-Age` update at most once per hour
|
||||||
(`renewThreshold` in [internal/web/auth/session.go](../internal/web/auth/session.go)).
|
(`renewThreshold` in [internal/web/auth/session.go](../internal/web/auth/session.go)).
|
||||||
- **Password change** — all other sessions are deleted; the current session stays
|
- **Password change on `/settings`** — changing your own password deletes
|
||||||
active ([internal/store/sessions.go](../internal/store/sessions.go),
|
every other session for that user; the current session stays active
|
||||||
[handlers_account.go](../internal/web/handlers/handlers_account.go)).
|
([internal/store/sessions.go](../internal/store/sessions.go),
|
||||||
|
[handlers_settings.go](../internal/web/handlers/handlers_settings.go)).
|
||||||
|
A global administrator resetting another user's password on `/users` updates
|
||||||
|
the hash but does not delete that user's existing sessions.
|
||||||
|
|
||||||
Restoring an **older** backup also restores session rows: a session invalidated
|
Restoring an **older** backup also restores session rows: a session removed
|
||||||
after that backup was taken can become valid again if the browser still has the
|
after that backup was taken can become valid again if the browser still holds
|
||||||
cookie and idle timeout has not expired.
|
the cookie and the restored row's `expires_at` has not passed.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -285,19 +291,27 @@ single-connection trade-off that follows from it.
|
|||||||
| `opendkim/` | DKIM keys + tables |
|
| `opendkim/` | DKIM keys + tables |
|
||||||
| `sasl/sasldb2` | Application SASL credentials |
|
| `sasl/sasldb2` | Application SASL credentials |
|
||||||
| `postfix/sender_login_maps` | Login → From binding |
|
| `postfix/sender_login_maps` | Login → From binding |
|
||||||
|
| `postfix/queue/` | Postfix transit mail (deferred/active); survives container recreate |
|
||||||
| `log/mail.log` | Postfix delivery log + rotated copies (excluded from backups) |
|
| `log/mail.log` | Postfix delivery log + rotated copies (excluded from backups) |
|
||||||
| `manifest.json` | Backup version stamp (consumed on restore) |
|
| `manifest.json` | Backup version stamp (consumed on restore) |
|
||||||
|
|
||||||
Not in `/data`: TLS certificates (reverse-proxy mount), Postfix queue
|
Not in `/data`: TLS certificates for the panel (reverse-proxy mount) — though
|
||||||
(transit mail not migrated by design).
|
full backups also archive the operator's `./certs` PEM files when present.
|
||||||
|
|
||||||
**Rotation:** send-log retention `SEND_LOG_RETENTION_DAYS` (default 90);
|
**Rotation:** send-log retention `SEND_LOG_RETENTION_DAYS` (default 90);
|
||||||
`mail.log` via logrotate (14 rotated files, check every 6h, rename +
|
`mail.log` via logrotate (14 rotated files, check every 6h, rename +
|
||||||
`postfix reload` in `postrotate` — see § Log tailer above).
|
`postfix reload` in `postrotate` — see § Log tailer above).
|
||||||
|
|
||||||
**Backup:** panel button or `selfpost-backup` CLI — SQLite snapshot + tar of
|
**Restore:** panel button or `selfpost-backup` CLI — self-contained archive:
|
||||||
`/data` tree, minus `log/`, the setup token and any `tls/`; version check on
|
`data/` (SQLite snapshot + tree minus `log/`, the setup token and any `tls/`
|
||||||
restore. Stopped-container `tar` of `./data` is safe (see guide).
|
under `/data`), `docker-compose.yml`, `.env`, and `certs/` when present;
|
||||||
|
version check on restore. Requires the project directory mounted read-only at
|
||||||
|
`SELFPOST_DEPLOY_ROOT` (`/selfpost-deploy` in the default compose file). On the
|
||||||
|
first successful boot after restore, the panel runs one **Resync** — OpenDKIM's
|
||||||
|
tables and Postfix's sender map are re-derived from SQLite and both daemons are
|
||||||
|
reloaded, so drift between the extracted archive and the database is healed
|
||||||
|
before mail flows (same step as `POST /reload` on demand). Stopped-container
|
||||||
|
`tar` of `./data` alone remains possible for state-only copies (see guide).
|
||||||
|
|
||||||
**Optional encryption** of the two secret-bearing downloads
|
**Optional encryption** of the two secret-bearing downloads
|
||||||
([internal/secretfile](../internal/secretfile/secretfile.go)): password →
|
([internal/secretfile](../internal/secretfile/secretfile.go)): password →
|
||||||
@@ -319,5 +333,36 @@ origin check, no CSRF tokens) are documented there separately.
|
|||||||
|
|
||||||
## Configuration
|
## Configuration
|
||||||
|
|
||||||
Public and internal env vars: [guide § Environment variables](guide.md#environment-variables).
|
Public env vars: [guide § Environment variables](guide.md#environment-variables).
|
||||||
Regression test: [cmd/panel/envdoc_test.go](../cmd/panel/envdoc_test.go).
|
Regression test: [cmd/panel/envdoc_test.go](../cmd/panel/envdoc_test.go).
|
||||||
|
|
||||||
|
**Internal env vars.** The following are read by the panel or startup scripts
|
||||||
|
but are not part of the operator interface — not meant to be changed in a
|
||||||
|
normal deployment; documented here so an accidental override reads as
|
||||||
|
unsupported rather than as a missing doc:
|
||||||
|
|
||||||
|
- **Panel paths and tuning:** `SELFPOST_DATA_DIR` (`/data`), `SELFPOST_DB_PATH`
|
||||||
|
(`/data/selfpost.db`), `SELFPOST_SETUP_TOKEN_FILE`
|
||||||
|
(`/data/setup-token`), `PANEL_HTTP_ADDR` (`:8080`),
|
||||||
|
`JOURNAL_MILTER_SOCKET` (`/run/selfpost/journal.sock`), `MAIL_LOG`
|
||||||
|
(`/data/log/mail.log` — read by the panel and written by Postfix, so a change
|
||||||
|
here has to be matched in `build/postfix-config.sh`),
|
||||||
|
`PANEL_COOKIE_SECURE` (`true`), `OPENDKIM_SOCKET`
|
||||||
|
(`/run/opendkim/opendkim.sock`), `OPENDKIM_DIR` (`/data/opendkim`),
|
||||||
|
`DKIM_SELECTOR_DEFAULT` (`selfpost`), `SASL_DB_PATH`
|
||||||
|
(`/data/sasl/sasldb2`), `SASL_REALM` (defaults to `SELFPOST_HOSTNAME`),
|
||||||
|
`POSTFIX_DIR` (`/data/postfix`), `POSTFIX_SENDER_LOGIN_MAPS`
|
||||||
|
(`/data/postfix/sender_login_maps` — read by Postfix config only; the panel
|
||||||
|
always writes `<POSTFIX_DIR>/sender_login_maps`, so overriding this env alone
|
||||||
|
desyncs the map Postfix reads from the file the panel maintains),
|
||||||
|
`POSTFIX_QUEUE_DIR` (`/data/postfix/queue` — set in `build/postfix-config.sh`),
|
||||||
|
`SELFPOST_DEPLOY_ROOT` (`/selfpost-deploy` — operator project directory for
|
||||||
|
full backups; mount `.:/selfpost-deploy:ro` in compose).
|
||||||
|
- **Milter and Postfix startup:** `MILTER_CONNECT_TIMEOUT` (`15s`),
|
||||||
|
`MILTER_COMMAND_TIMEOUT` (`15s`), `MILTER_CONTENT_TIMEOUT` (`30s`),
|
||||||
|
`MILTER_WAIT_TIMEOUT` (`30` seconds).
|
||||||
|
- **Background maintenance:** `TLS_RELOAD_INTERVAL_SECONDS` (`86400` — daily
|
||||||
|
`postfix reload` to pick up renewed certificates),
|
||||||
|
`LOGROTATE_INTERVAL_SECONDS` (`21600` — check `mail.log` rotation every six
|
||||||
|
hours; logrotate keeps 14 rotated files on a daily schedule, and each
|
||||||
|
rotation triggers `postfix reload`).
|
||||||
|
|||||||
@@ -0,0 +1,44 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>SelfPost — panel mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<script>
|
||||||
|
(function () {
|
||||||
|
var map = {
|
||||||
|
login: "login.html",
|
||||||
|
setup: "setup.html",
|
||||||
|
status: "status.html",
|
||||||
|
domains: "domains.html",
|
||||||
|
domain: "domain.html",
|
||||||
|
"domain-delete": "domain-delete.html",
|
||||||
|
deliveries: "deliveries.html",
|
||||||
|
delivery: "delivery.html",
|
||||||
|
"mail-queue": "mail-queue.html",
|
||||||
|
"system-log": "system-log.html",
|
||||||
|
backup: "backup.html",
|
||||||
|
users: "users.html",
|
||||||
|
"user-form": "user-form.html",
|
||||||
|
"user-delete": "user-delete.html",
|
||||||
|
settings: "settings.html",
|
||||||
|
inbound: "inbound.html",
|
||||||
|
"inbound-domain": "inbound-domain.html",
|
||||||
|
"inbound-backup": "inbound-backup.html",
|
||||||
|
"inbound-delete": "inbound-delete.html",
|
||||||
|
dmarc: "dmarc.html",
|
||||||
|
"dmarc-domain": "dmarc-domain.html",
|
||||||
|
"dmarc-report": "dmarc-report.html",
|
||||||
|
"dmarc-report-fail": "dmarc-report-fail.html",
|
||||||
|
help: "help.html"
|
||||||
|
};
|
||||||
|
var h = location.hash.replace(/^#/, "");
|
||||||
|
location.replace((map[h] || "status.html") + location.search);
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p>Макеты собраны отдельными страницами. Откройте <a href="status.html">Status</a> или <a href="index.html">оглавление</a>.</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Backup & migration — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-backup" data-page="backup" data-nav="backup" data-title="Backup" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<h1>Backup & migration</h1>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Full backup</h2>
|
||||||
|
<p class="muted">Download a self-contained backup — <code>data/</code> (database, DKIM keys, credentials, Postfix queue), <code>docker-compose.yml</code>, <code>.env</code>, and <code>certs/</code>. Extract into an empty project directory on a new machine, adjust hostname if needed, and start the <strong>same SelfPost version</strong> before first boot. The reverse-proxy vhost is not included.</p>
|
||||||
|
<p class="muted"><strong>The backup file is a secret.</strong> Encrypting it is the simplest way to store it: the download is then a <code>.spbk</code> that only the password opens.</p>
|
||||||
|
<div class="encrypt">
|
||||||
|
<label class="check"><input type="checkbox" checked> <span>Encrypt with a password</span></label>
|
||||||
|
<div class="encrypt-fields">
|
||||||
|
<label>Password</label><input type="password" placeholder="at least 8 characters">
|
||||||
|
<label>Repeat password</label><input type="password">
|
||||||
|
<p class="muted">Keep this password: without it the file cannot be opened.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="actions-row"><button type="button">Download full backup</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Import a domain</h2>
|
||||||
|
<p class="muted">Move a single domain here from another SelfPost instance — plain <code>.json</code> or encrypted <code>.spde</code>. Its DKIM key and application passwords come across, so the published DNS record needs no change. The export file is a secret, like a full backup.</p>
|
||||||
|
<label>Domain export file</label>
|
||||||
|
<input type="file">
|
||||||
|
<label>Password</label>
|
||||||
|
<input type="password" autocomplete="off">
|
||||||
|
<p class="muted">Needed for a <code>.spde</code> file. Leave empty for plain <code>.json</code>.</p>
|
||||||
|
<div class="actions-row"><button type="button">Import domain</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Deliveries — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-deliveries" data-page="deliveries" data-nav="deliveries" data-title="Deliveries">
|
||||||
|
<main class="stack">
|
||||||
|
<h1>Deliveries</h1>
|
||||||
|
<form class="toolbar fill" action="#" onsubmit="return false">
|
||||||
|
<div class="field"><label>Domain</label>
|
||||||
|
<select><option>All domains</option><option>example.com</option><option>alerts.example.com</option></select>
|
||||||
|
</div>
|
||||||
|
<div class="field"><label>Application</label>
|
||||||
|
<select><option>All applications</option><option>newsletter</option><option>billing</option></select>
|
||||||
|
</div>
|
||||||
|
<button type="button">Filter</button>
|
||||||
|
</form>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Time</th><th>From</th><th>To</th><th>Subject</th><th>Status</th><th></th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 20:14:02</td>
|
||||||
|
<td>billing@example.com</td>
|
||||||
|
<td>ada@example.net</td>
|
||||||
|
<td class="subject"><span>Invoice #4412</span></td>
|
||||||
|
<td class="status"><span class="st st-warn">deferred</span></td>
|
||||||
|
<td class="actions"><a href="delivery.html">Details</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 20:11:40</td>
|
||||||
|
<td>news@example.com</td>
|
||||||
|
<td>list-bounces@example.net</td>
|
||||||
|
<td class="subject"><span>August digest</span></td>
|
||||||
|
<td class="status"><span class="st st-ok">delivered</span></td>
|
||||||
|
<td class="actions"><a href="delivery.html">Details</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 19:02:11</td>
|
||||||
|
<td>alerts@alerts.example.com</td>
|
||||||
|
<td>noreply@blocked.example</td>
|
||||||
|
<td class="subject"><span>Disk 92% on web-3</span></td>
|
||||||
|
<td class="status"><span class="st st-error">bounced</span></td>
|
||||||
|
<td class="actions"><a href="delivery.html">Details</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 18:44:09</td>
|
||||||
|
<td>news@example.com</td>
|
||||||
|
<td>sam@example.org</td>
|
||||||
|
<td class="subject"><span>August digest</span></td>
|
||||||
|
<td class="status"><span class="st st-ok">delivered</span></td>
|
||||||
|
<td class="actions"><a href="delivery.html">Details</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li>
|
||||||
|
<a href="delivery.html">
|
||||||
|
<span class="st st-warn">deferred</span><span class="when">20:14</span>
|
||||||
|
<span class="meta">billing@example.com → ada@example.net</span>
|
||||||
|
<span class="subj">Invoice #4412</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="delivery.html">
|
||||||
|
<span class="st st-ok">delivered</span><span class="when">20:11</span>
|
||||||
|
<span class="meta">news@example.com → list-bounces@example.net</span>
|
||||||
|
<span class="subj">August digest</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="delivery.html">
|
||||||
|
<span class="st st-error">bounced</span><span class="when">19:02</span>
|
||||||
|
<span class="meta">alerts@alerts.example.com → noreply@blocked.example</span>
|
||||||
|
<span class="subj">Disk 92% on web-3</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">Page 1 of 4 · <a href="deliveries.html">Older →</a></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Invoice #4412 — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-delivery" data-page="delivery" data-nav="deliveries" data-title="Message">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1 class="subject">Invoice #4412</h1>
|
||||||
|
<p class="route">
|
||||||
|
<span class="addr">billing@example.com</span>
|
||||||
|
<span class="arrow">→</span>
|
||||||
|
<span class="addr">ada@example.net</span>
|
||||||
|
<span class="st st-warn">deferred</span>
|
||||||
|
</p>
|
||||||
|
<a class="back" href="deliveries.html">← Back to deliveries</a>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Message</h2>
|
||||||
|
<div class="facts">
|
||||||
|
<div class="fact"><span class="fact-label">Domain</span><span class="fact-value">example.com</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Application</span><span class="fact-value">billing</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Accepted</span><span class="fact-value">2026-08-15 20:14:02 UTC</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Status reported</span><span class="fact-value">2026-08-15 20:14:08 UTC</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Queue id</span><span class="fact-value mono">4C3A1E2F1A</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Journal id</span><span class="fact-value mono">1842</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>History</h2>
|
||||||
|
<ol class="timeline">
|
||||||
|
<li class="event lvl-ok">
|
||||||
|
<p class="event-time">2026-08-15 20:14:02 UTC</p>
|
||||||
|
<p class="event-title"><span class="st st-ok">accepted</span> Received by the relay</p>
|
||||||
|
<p class="event-detail muted">SASL login billing, queued as 4C3A1E2F1A.</p>
|
||||||
|
</li>
|
||||||
|
<li class="event lvl-warn">
|
||||||
|
<p class="event-time">2026-08-15 20:14:08 UTC</p>
|
||||||
|
<p class="event-title"><span class="st st-warn">deferred</span> Receiving MX asked to try later</p>
|
||||||
|
<p class="event-detail muted">Postfix retries: first after 5 minutes, then with increasing gaps up to 1 hour 7 minutes, for up to 5 days. There is no fixed attempt count — a deferred message stays in the queue until it is delivered or that lifetime runs out.</p>
|
||||||
|
</li>
|
||||||
|
<li class="event pending">
|
||||||
|
<p class="event-time">not yet</p>
|
||||||
|
<p class="event-title"><span class="st st-unknown">delivery</span> Waiting on the next retry</p>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Delivery log</h2>
|
||||||
|
<table class="log desk-only">
|
||||||
|
<thead><tr><th>Time</th><th>Message</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr><td class="time muted">20:14:02</td><td class="log-text">postfix/smtpd[221]: 4C3A1E2F1A: client=203.0.113.40, sasl_username=billing</td></tr>
|
||||||
|
<tr><td class="time muted">20:14:02</td><td class="log-text">postfix/cleanup[224]: 4C3A1E2F1A: message-id=<4412@example.com></td></tr>
|
||||||
|
<tr><td class="time muted">20:14:08</td><td class="log-text">postfix/smtp[230]: 4C3A1E2F1A: to=<ada@example.net>, relay=mx.example.net[198.51.100.20]:25, delay=6, status=deferred (450 4.2.1 mailbox busy)</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<div class="phone-only">
|
||||||
|
<p class="muted" style="margin:0.6rem 0 0.2rem">20:14:08</p>
|
||||||
|
<span class="code">status=deferred (450 4.2.1 mailbox busy)</span>
|
||||||
|
<p class="muted" style="margin:0.6rem 0 0.2rem">20:14:02</p>
|
||||||
|
<span class="code">client=203.0.113.40, sasl_username=billing</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>example.com — DMARC — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-dmarc-domain" data-page="dmarc-domain" data-nav="dmarc" data-title="example.com DMARC">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>example.com <span class="tag future">candidate</span></h1>
|
||||||
|
<a class="back g-only" href="dmarc.html">← All DMARC reports</a>
|
||||||
|
<a class="back" href="domain.html">← Back to example.com</a>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Last 7 days <span class="st st-ok">pass</span></h2>
|
||||||
|
<p>98% aligned. Tightening <code>p=</code> looks reasonable.</p>
|
||||||
|
<p class="muted"><a href="domain.html">Domain DNS and rua=</a></p>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Third-party senders</h2>
|
||||||
|
<p>google.com / 66.102.0.0/20 failed SPF and DKIM 6 times. Everyone else is this relay.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Reports</h2>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Received</th><th>Reporter</th><th>Window</th><th>Pass</th><th>Fail</th><th></th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 06:12</td>
|
||||||
|
<td class="muted">google.com</td>
|
||||||
|
<td>14 Aug</td>
|
||||||
|
<td>412</td>
|
||||||
|
<td>6</td>
|
||||||
|
<td class="actions"><a href="dmarc-report.html">View</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-14 06:08</td>
|
||||||
|
<td class="muted">google.com</td>
|
||||||
|
<td>13 Aug</td>
|
||||||
|
<td>390</td>
|
||||||
|
<td>2</td>
|
||||||
|
<td class="actions"><a href="dmarc-report.html">View</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li>
|
||||||
|
<a href="dmarc-report.html">
|
||||||
|
<span class="st st-ok">412 pass</span><span class="when">14 Aug</span>
|
||||||
|
<span class="meta">google.com · 6 fail</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="dmarc-report.html">
|
||||||
|
<span class="st st-ok">390 pass</span><span class="when">13 Aug</span>
|
||||||
|
<span class="meta">google.com · 2 fail</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Sources · last 7 days</h2>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Source</th><th>Pass</th><th>Fail</th><th>Disposition</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr><td class="muted">203.0.113.10 (this relay)</td><td>802</td><td>0</td><td><span class="st st-ok">none</span></td></tr>
|
||||||
|
<tr><td class="muted">google.com / 66.102.0.0/20</td><td>0</td><td>8</td><td><span class="st st-warn">none</span></td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li><a href="dmarc-report.html"><span>this relay</span><span class="st st-ok">802 pass</span></a></li>
|
||||||
|
<li><a href="dmarc-report.html"><span>google.com / 66.102.0.0/20</span><span class="st st-warn">8 fail</span></a></li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>google.com report — alerts.example.com — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-dmarc-report-fail" data-page="dmarc-report-fail" data-nav="dmarc" data-title="DMARC report">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1 class="subject">google.com · 14 Aug</h1>
|
||||||
|
<p class="route">
|
||||||
|
<span class="addr">alerts.example.com</span>
|
||||||
|
<span class="st st-ok">88 pass</span>
|
||||||
|
<span class="st st-error">19 fail</span>
|
||||||
|
</p>
|
||||||
|
<a class="back" href="dmarc.html">← All DMARC reports</a>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Report</h2>
|
||||||
|
<div class="facts">
|
||||||
|
<div class="fact"><span class="fact-label">Reporter</span><span class="fact-value">google.com</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Report id</span><span class="fact-value mono">3178944098765432109</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Window</span><span class="fact-value">2026-08-14 00:00 – 2026-08-15 00:00 UTC</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Received</span><span class="fact-value">2026-08-15 04:40 UTC</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Contact</span><span class="fact-value">noreply-dmarc-support@google.com</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card attn">
|
||||||
|
<h2>Published policy</h2>
|
||||||
|
<div class="facts">
|
||||||
|
<div class="fact"><span class="fact-label">Domain</span><span class="fact-value">alerts.example.com</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">p / sp / pct</span><span class="fact-value mono">none / none / 100</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">adkim / aspf</span><span class="fact-value mono">r / r</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">rua</span><span class="fact-value">dmarc@mail.example.org</span></div>
|
||||||
|
</div>
|
||||||
|
<p class="muted">A third-party source is not in SPF or DKIM. Do not tighten <code>p=</code> until that sender is gone or aligned.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Records</h2>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Source</th><th>Count</th><th>Disposition</th><th>SPF</th><th>DKIM</th><th>Header from</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="muted">203.0.113.10 (this relay)</td>
|
||||||
|
<td>88</td>
|
||||||
|
<td><span class="st st-ok">none</span></td>
|
||||||
|
<td><span class="st st-ok">pass</span></td>
|
||||||
|
<td><span class="st st-ok">pass</span></td>
|
||||||
|
<td>alerts.example.com</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="muted">198.51.100.80 (unknown)</td>
|
||||||
|
<td>19</td>
|
||||||
|
<td><span class="st st-error">none</span></td>
|
||||||
|
<td><span class="st st-error">fail</span></td>
|
||||||
|
<td><span class="st st-error">fail</span></td>
|
||||||
|
<td>alerts.example.com</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li>
|
||||||
|
<div class="item">
|
||||||
|
<span>this relay · 88</span><span class="st st-ok">pass</span>
|
||||||
|
<span class="meta">203.0.113.10 · SPF pass · DKIM pass</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<div class="item">
|
||||||
|
<span>unknown · 19</span><span class="st st-error">fail</span>
|
||||||
|
<span class="meta">198.51.100.80 · SPF fail · DKIM fail</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">Parsed from the aggregate XML. Forensic (<code>ruf=</code>) samples are not stored.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>google.com report — example.com — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-dmarc-report" data-page="dmarc-report" data-nav="dmarc" data-title="DMARC report">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1 class="subject">google.com · 14 Aug</h1>
|
||||||
|
<p class="route">
|
||||||
|
<span class="addr">example.com</span>
|
||||||
|
<span class="st st-ok">412 pass</span>
|
||||||
|
<span class="st st-warn">6 fail</span>
|
||||||
|
</p>
|
||||||
|
<a class="back" href="dmarc-domain.html">← Back to example.com</a>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Report</h2>
|
||||||
|
<div class="facts">
|
||||||
|
<div class="fact"><span class="fact-label">Reporter</span><span class="fact-value">google.com</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Report id</span><span class="fact-value mono">3178944012345678901</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Window</span><span class="fact-value">2026-08-14 00:00 – 2026-08-15 00:00 UTC</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Received</span><span class="fact-value">2026-08-15 06:12 UTC</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Contact</span><span class="fact-value">noreply-dmarc-support@google.com</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Published policy</h2>
|
||||||
|
<div class="facts">
|
||||||
|
<div class="fact"><span class="fact-label">Domain</span><span class="fact-value">example.com</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">p / sp / pct</span><span class="fact-value mono">none / none / 100</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">adkim / aspf</span><span class="fact-value mono">r / r</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">rua</span><span class="fact-value">dmarc@mail.example.org</span></div>
|
||||||
|
</div>
|
||||||
|
<p class="muted"><code>p=none</code> does not affect delivery. Failures here are forwarding through Google, not this relay.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Records</h2>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Source</th><th>Count</th><th>Disposition</th><th>SPF</th><th>DKIM</th><th>Header from</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="muted">203.0.113.10 (this relay)</td>
|
||||||
|
<td>412</td>
|
||||||
|
<td><span class="st st-ok">none</span></td>
|
||||||
|
<td><span class="st st-ok">pass</span></td>
|
||||||
|
<td><span class="st st-ok">pass</span></td>
|
||||||
|
<td>example.com</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="muted">66.102.1.44 (google.com)</td>
|
||||||
|
<td>6</td>
|
||||||
|
<td><span class="st st-warn">none</span></td>
|
||||||
|
<td><span class="st st-error">fail</span></td>
|
||||||
|
<td><span class="st st-error">fail</span></td>
|
||||||
|
<td>example.com</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li>
|
||||||
|
<div class="item">
|
||||||
|
<span>this relay · 412</span><span class="st st-ok">pass</span>
|
||||||
|
<span class="meta">203.0.113.10 · SPF pass · DKIM pass</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<div class="item">
|
||||||
|
<span>google.com · 6</span><span class="st st-error">fail</span>
|
||||||
|
<span class="meta">66.102.1.44 · SPF fail · DKIM fail</span>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">Parsed from the aggregate XML. Forensic (<code>ruf=</code>) samples are not stored.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,91 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>DMARC reports — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-dmarc" data-page="dmarc" data-nav="dmarc" data-title="DMARC" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div class="page-head">
|
||||||
|
<h1>DMARC reports <span class="tag future">candidate</span></h1>
|
||||||
|
</div>
|
||||||
|
<p class="muted">Aggregate reports SelfPost accepted for <code>rua=</code>. Forensic (<code>ruf=</code>) is out of scope. Open a report for the parsed XML — not a dashboard.</p>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Ingest <span class="st st-ok">ok</span></h2>
|
||||||
|
<p>Last report 6 hours ago. Port 25 accepts only the configured report address.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>This week</h2>
|
||||||
|
<p>14 kept, 0 parse failures. Older summaries are pruned.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Recent reports</h2>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Received</th><th>Domain</th><th>Reporter</th><th>Window</th><th>Pass</th><th>Fail</th><th></th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 06:12</td>
|
||||||
|
<td><a href="dmarc-domain.html">example.com</a></td>
|
||||||
|
<td class="muted">google.com</td>
|
||||||
|
<td>14 Aug</td>
|
||||||
|
<td>412</td>
|
||||||
|
<td>6</td>
|
||||||
|
<td class="actions"><a href="dmarc-report.html">View</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-15 04:40</td>
|
||||||
|
<td>alerts.example.com</td>
|
||||||
|
<td class="muted">google.com</td>
|
||||||
|
<td>14 Aug</td>
|
||||||
|
<td>88</td>
|
||||||
|
<td>19</td>
|
||||||
|
<td class="actions"><a href="dmarc-report-fail.html">View</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="time muted">2026-08-14 06:08</td>
|
||||||
|
<td><a href="dmarc-domain.html">example.com</a></td>
|
||||||
|
<td class="muted">google.com</td>
|
||||||
|
<td>13 Aug</td>
|
||||||
|
<td>390</td>
|
||||||
|
<td>2</td>
|
||||||
|
<td class="actions"><a href="dmarc-report.html">View</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li>
|
||||||
|
<a href="dmarc-report.html">
|
||||||
|
<span class="st st-ok">412 pass</span><span class="when">06:12</span>
|
||||||
|
<span class="meta">example.com · google.com · 14 Aug</span>
|
||||||
|
<span class="subj">6 fail</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="dmarc-report-fail.html">
|
||||||
|
<span class="st st-error">19 fail</span><span class="when">04:40</span>
|
||||||
|
<span class="meta">alerts.example.com · google.com · 14 Aug</span>
|
||||||
|
<span class="subj">88 pass</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="dmarc-report.html">
|
||||||
|
<span class="st st-ok">390 pass</span><span class="when">14 Aug</span>
|
||||||
|
<span class="meta">example.com · google.com · 13 Aug</span>
|
||||||
|
<span class="subj">2 fail</span>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">Each row is one aggregate XML SelfPost parsed. Domain names open the roll-up for that sending domain.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Delete example.com — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-domain-delete" data-page="domain-delete" data-nav="domains" data-title="Delete domain">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>Delete example.com</h1>
|
||||||
|
<a class="back" href="domain.html">← Back to example.com</a>
|
||||||
|
</div>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Confirm deletion</h2>
|
||||||
|
<p>You are about to delete <strong>example.com</strong>. This will:</p>
|
||||||
|
<ul>
|
||||||
|
<li>permanently delete its DKIM signing key;</li>
|
||||||
|
<li>delete <strong>all 2 bound applications</strong>, including their SASL credentials;</li>
|
||||||
|
<li>reload OpenDKIM so the domain is no longer signed.</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">This cannot be undone.</p>
|
||||||
|
<div class="actions-row"><button type="button" class="danger">Delete example.com</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,260 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>example.com — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-domain" data-page="domain" data-nav="domains" data-title="example.com">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>example.com</h1>
|
||||||
|
<a class="back" href="domains.html">← All domains</a>
|
||||||
|
</div>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card credential" id="new-credential">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>New application password</h2>
|
||||||
|
<label class="help-link" for="help-password" title="Why this is shown once">?</label>
|
||||||
|
</div>
|
||||||
|
<p class="muted">Shown <strong>once only</strong> and not stored. Copy it now.</p>
|
||||||
|
<label>Login</label>
|
||||||
|
<div class="code-row"><span class="code">newsletter</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
<label>Password</label>
|
||||||
|
<div class="code-row"><span class="code">xK.9fQ2m-pL7wR</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card" id="dns-status">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>DNS status <span class="st st-ok">ok</span></h2>
|
||||||
|
<label class="help-link" for="help-dns" title="What these checks mean">?</label>
|
||||||
|
</div>
|
||||||
|
<div class="stack">
|
||||||
|
<div class="pair">
|
||||||
|
<div>
|
||||||
|
<label>DKIM <span class="st st-ok">ok</span></label>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<span class="code">mail._domainkey.example.com</span>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label>SPF <span class="st st-ok">ok</span></label>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<span class="code">example.com</span>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div>
|
||||||
|
<label>DMARC <span class="st st-ok">ok</span></label>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<span class="code">_dmarc.example.com</span>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="muted">p=none; rua points at SelfPost ingest.</p>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<label>Report authorization</label>
|
||||||
|
<p class="muted">Not required (rua= is on a domain SelfPost accepts).</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="actions-row"><button type="button">Re-check</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card" id="dkim-spf">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>DKIM and SPF records</h2>
|
||||||
|
<label class="help-link" for="help-records" title="What to publish">?</label>
|
||||||
|
</div>
|
||||||
|
<p class="check-col-title">DKIM</p>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<div class="code-row"><span class="code">mail._domainkey.example.com</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value</label>
|
||||||
|
<div class="code-row"><span class="code">v=DKIM1; k=rsa; p=MIIBIjANBgkqh…</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
<p class="check-col-title">SPF</p>
|
||||||
|
<div class="code-row"><span class="code">v=spf1 ip4:203.0.113.10 -all</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card" id="dmarc-record">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>DMARC record</h2>
|
||||||
|
<label class="help-link" for="help-dmarc" title="What this record does">?</label>
|
||||||
|
</div>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<div class="code-row"><span class="code">_dmarc.example.com</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value <span class="muted">(from Settings)</span></label>
|
||||||
|
<div class="code-row"><span class="code">v=DMARC1; p=none; rua=mailto:dmarc@mail.example.org</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
<p class="muted"><a href="dmarc-domain.html">Open DMARC reports</a> for this domain.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card" id="connection">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>Connection settings</h2>
|
||||||
|
<label class="help-link" for="help-connection" title="How to connect">?</label>
|
||||||
|
</div>
|
||||||
|
<label>Server</label>
|
||||||
|
<div class="code-row"><span class="code">mail.example.org</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
<label>Port and encryption</label>
|
||||||
|
<span class="code">465 — SSL/TLS (implicit)
|
||||||
|
587 — STARTTLS (submission)</span>
|
||||||
|
</div>
|
||||||
|
<div class="card" id="add-application">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>Add an application</h2>
|
||||||
|
<label class="help-link" for="help-apps" title="What an application is">?</label>
|
||||||
|
</div>
|
||||||
|
<form action="#" onsubmit="return false">
|
||||||
|
<label>Login</label>
|
||||||
|
<input placeholder="prod-server" autocomplete="off">
|
||||||
|
<label>Address mode</label>
|
||||||
|
<select><option>Any address of the domain</option><option>Specific addresses (list)</option></select>
|
||||||
|
<div class="actions-row"><button type="button">Create application</button></div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card" id="applications">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>Applications</h2>
|
||||||
|
<label class="help-link" for="help-apps" title="Address mode and rate limits">?</label>
|
||||||
|
</div>
|
||||||
|
<ul class="apps">
|
||||||
|
<li class="app-item">
|
||||||
|
<p class="app-login">newsletter</p>
|
||||||
|
<p class="app-addr muted">Any address of the domain — *@example.com</p>
|
||||||
|
<div class="actions">
|
||||||
|
<input class="panel-toggle t-edit" id="edit-1" type="checkbox" checked>
|
||||||
|
<label class="toggle for-edit" for="edit-1">Edit <span class="st st-ok">limit</span></label>
|
||||||
|
<button type="button">New password</button>
|
||||||
|
<button type="button" class="danger">Delete</button>
|
||||||
|
<div class="panel panel-edit">
|
||||||
|
<div class="pair">
|
||||||
|
<div>
|
||||||
|
<p class="check-col-title">Address mode</p>
|
||||||
|
<select><option selected>Any address of the domain</option><option>Specific addresses (list)</option></select>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<p class="check-col-title">Trusted-IP override <span class="st st-ok">active</span></p>
|
||||||
|
<textarea rows="1">203.0.113.40</textarea>
|
||||||
|
<div class="field-row equal">
|
||||||
|
<div class="field">
|
||||||
|
<label>Message limit</label>
|
||||||
|
<input value="80">
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Window (seconds)</label>
|
||||||
|
<input value="60">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
<li class="app-item">
|
||||||
|
<p class="app-login">billing</p>
|
||||||
|
<p class="app-addr muted">Fixed list — invoices@example.com</p>
|
||||||
|
<div class="actions">
|
||||||
|
<button type="button">Edit</button>
|
||||||
|
<button type="button">New password</button>
|
||||||
|
<button type="button" class="danger">Delete</button>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card" id="domain-settings-dmarc">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>DMARC reports</h2>
|
||||||
|
<label class="help-link" for="help-domain-settings" title="Reports and rate limits">?</label>
|
||||||
|
</div>
|
||||||
|
<label>Aggregate reports (rua=)</label>
|
||||||
|
<select><option selected>Same as Settings (dmarc@mail.example.org)</option><option>No aggregate reports</option><option>Custom address</option></select>
|
||||||
|
<div class="actions-row"><button type="button">Save DMARC report settings</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card" id="domain-settings-limit">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>Level-2 rate limit <span class="st st-ok">active</span></h2>
|
||||||
|
</div>
|
||||||
|
<div class="field-row equal">
|
||||||
|
<div class="field">
|
||||||
|
<label>Message limit</label>
|
||||||
|
<input value="40">
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Window (seconds)</label>
|
||||||
|
<input value="60">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="actions-row"><button type="button">Save limit</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card" id="export-domain">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>Export domain</h2>
|
||||||
|
<label class="help-link" for="help-export" title="What the file contains">?</label>
|
||||||
|
</div>
|
||||||
|
<p class="muted"><strong>Secret file</strong> — transfer securely, or encrypt as <code>.spde</code>.</p>
|
||||||
|
<div class="encrypt">
|
||||||
|
<label class="check"><input type="checkbox"> <span>Encrypt with a password</span></label>
|
||||||
|
<div class="encrypt-fields">
|
||||||
|
<label>Password</label><input type="password">
|
||||||
|
<label>Repeat password</label><input type="password">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="actions-row"><button type="button">Export domain</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card g-only">
|
||||||
|
<h2>Danger zone</h2>
|
||||||
|
<p class="muted">Deletes the DKIM key and every application on this domain.</p>
|
||||||
|
<div class="actions-row"><a class="danger" href="domain-delete.html">Delete domain</a></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Domains — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-domains" data-page="domains" data-nav="domains" data-title="Domains">
|
||||||
|
<main class="stack">
|
||||||
|
<div class="page-head"><h1>Domains</h1></div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Domains</h2>
|
||||||
|
<form class="measure g-only" action="#" onsubmit="return false;">
|
||||||
|
<label for="dname">Add a sending domain</label>
|
||||||
|
<div class="input-row">
|
||||||
|
<input id="dname" placeholder="example.com" autocomplete="off">
|
||||||
|
<button type="button">Add domain</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Domain</th><th>DNS</th><th>Selector</th><th>Apps</th><th></th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td><a href="domain.html">example.com</a></td>
|
||||||
|
<td><a class="st st-ok" href="domain.html">ok</a></td>
|
||||||
|
<td class="muted">mail</td>
|
||||||
|
<td>2</td>
|
||||||
|
<td class="actions g-only"><a class="danger" href="domain-delete.html">Delete</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="domain.html">alerts.example.com</a></td>
|
||||||
|
<td><a class="st st-warn" href="domain.html">warn</a></td>
|
||||||
|
<td class="muted">mail</td>
|
||||||
|
<td>1</td>
|
||||||
|
<td class="actions g-only"><a class="danger" href="domain-delete.html">Delete</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li><a href="domain.html"><span>example.com</span><span class="st st-ok">ok</span><span class="meta">2 apps · selector mail</span></a></li>
|
||||||
|
<li><a href="domain.html"><span>alerts.example.com</span><span class="st st-warn">warn</span><span class="meta">1 app · selector mail</span></a></li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">The DNS badge is the worst of DKIM, SPF and DMARC. Open a domain for details.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Help — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-help" data-page="help" data-nav="help" data-title="Help">
|
||||||
|
<main class="stack">
|
||||||
|
<div class="page-head">
|
||||||
|
<h1>Help <span class="tag future">candidate</span></h1>
|
||||||
|
</div>
|
||||||
|
<p class="muted">Short operator notes inside the panel — not a second copy of the full guide. Seeded from the Status explanations that do not belong on the cards (what a kernel counter is, why PTR is set at the host, what Reload does not touch). The cards themselves keep their readings, Detail columns, and the Configuration control.</p>
|
||||||
|
<div class="measure stack">
|
||||||
|
<div class="card">
|
||||||
|
<h2>On this panel</h2>
|
||||||
|
<ul>
|
||||||
|
<li><a href="help.html">Machine</a> — kernel counters and the rate window</li>
|
||||||
|
<li><a href="help.html">TLS certificate</a> — port 465, reverse-proxy mount</li>
|
||||||
|
<li><a href="help.html">Hostname / reverse DNS</a> — forward-confirmed PTR at the hosting provider</li>
|
||||||
|
<li><a href="help.html">Mail queue retries</a> — time-based, no attempt budget</li>
|
||||||
|
<li><a href="help.html">Inbound</a> — not mailboxes; listed recipients or any address at the domain</li>
|
||||||
|
<li>Domain page — DNS, records, connection, applications, export (drawer from each card’s «?»)</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">The same texts open in the drawer from Status’s «?» — so a card can stay a reading, not a paragraph, without throwing the reading away.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Machine</h2>
|
||||||
|
<p>CPU and memory are the container’s own readings, not the host’s spare capacity. Network is a short window, not a daily total. High CPU with an empty queue usually means something else on the box — not SelfPost “being slow to send”.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>TLS certificate</h2>
|
||||||
|
<p>Port 465 presents the certificate the reverse proxy (or the image) mounted. The panel does not issue certificates. A warn here is “expires soon”; an error is “missing or unreadable”, and clients will refuse submission.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Hostname / reverse DNS</h2>
|
||||||
|
<p>Forward-confirmed reverse DNS: the A/AAAA for <code>SELFPOST_HOSTNAME</code> must reverse to that same name. PTR is set at the hosting provider, not in this panel. Receiving networks use this pair as a cheap reputation check.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,92 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>backup.example.net — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-inbound-backup" data-page="inbound-backup" data-nav="inbound" data-title="backup.example.net" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>backup.example.net</h1>
|
||||||
|
<a class="back" href="inbound.html">← All inbound domains</a>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>DNS status <span class="st st-error">error</span></h2>
|
||||||
|
<p class="muted">Cached a few minutes — use <em>Re-check</em> after publishing. Unlike outbound, inbound needs an MX pointing at this server.</p>
|
||||||
|
<label>MX <span class="st st-error">error</span></label>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<span class="code">backup.example.net</span>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">MX</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value</label>
|
||||||
|
<span class="code">10 mail.primary.example.net.</span>
|
||||||
|
<p class="error">No MX points at mail.example.org (this server). Publish the record below, or wait for DNS to propagate and Re-check.</p>
|
||||||
|
<div class="actions-row"><button type="button">Re-check</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Upstream</h2>
|
||||||
|
<p class="muted">Where accepted mail is handed off. Not a mailbox.</p>
|
||||||
|
<label>Host</label><input value="192.0.2.20">
|
||||||
|
<label>Port</label><input value="25">
|
||||||
|
<label>TLS to upstream</label>
|
||||||
|
<select><option>Opportunistic</option><option>Required</option><option selected>Off</option></select>
|
||||||
|
<div class="actions-row"><button type="button">Save upstream</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>MX record to publish</h2>
|
||||||
|
<p class="muted">Add this MX so the internet delivers here. Keep any existing primary MX if this is backup-MX.</p>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<div class="code-row"><span class="code">backup.example.net</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">MX</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value</label>
|
||||||
|
<div class="code-row"><span class="code">20 mail.example.org.</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card rcpt-mode">
|
||||||
|
<h2>Valid recipients</h2>
|
||||||
|
<p class="muted">Who this domain accepts on port 25. Same idea as an application’s address mode: a list, or any address at the domain.</p>
|
||||||
|
<label>Who to accept</label>
|
||||||
|
<select>
|
||||||
|
<option value="list">Listed addresses only</option>
|
||||||
|
<option value="any" selected>Any recipient at this domain</option>
|
||||||
|
</select>
|
||||||
|
<div class="rcpt-list">
|
||||||
|
<label>Addresses (one per line or comma-separated)</label>
|
||||||
|
<textarea rows="6">postmaster@backup.example.net
|
||||||
|
abuse@backup.example.net</textarea>
|
||||||
|
<p class="muted">Unknown recipients are rejected at RCPT so this relay does not generate backscatter.</p>
|
||||||
|
</div>
|
||||||
|
<p class="rcpt-any muted">Every address at this domain is accepted and forwarded. Prefer a list unless the upstream rejects unknowns — otherwise this relay may generate backscatter.</p>
|
||||||
|
<div class="actions-row"><button type="button">Save recipients</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Danger zone</h2>
|
||||||
|
<p class="muted">Stops accepting mail for this domain. Does not touch outbound sending domains.</p>
|
||||||
|
<div class="actions-row"><a class="danger" href="inbound-delete.html">Delete inbound domain</a></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Delete lists.example.com — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-inbound-delete" data-page="inbound-delete" data-nav="inbound" data-title="Delete inbound" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>Delete lists.example.com</h1>
|
||||||
|
<a class="back" href="inbound-domain.html">← Back to lists.example.com</a>
|
||||||
|
</div>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Confirm deletion</h2>
|
||||||
|
<p>You are about to stop accepting inbound mail for <strong>lists.example.com</strong>. This will:</p>
|
||||||
|
<ul>
|
||||||
|
<li>remove it from <code>relay_domains</code> and the recipient map;</li>
|
||||||
|
<li>stop forwarding to <strong>10.0.0.8:25</strong>;</li>
|
||||||
|
<li>leave outbound sending domains untouched.</li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">This cannot be undone from a backup of inbound maps alone unless you restore one. Remove the MX if you do not plan to re-add the domain.</p>
|
||||||
|
<div class="actions-row"><button type="button" class="danger">Delete lists.example.com</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>lists.example.com — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-inbound-domain" data-page="inbound-domain" data-nav="inbound" data-title="lists.example.com" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>lists.example.com</h1>
|
||||||
|
<a class="back" href="inbound.html">← All inbound domains</a>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>DNS status <span class="st st-ok">ok</span></h2>
|
||||||
|
<p class="muted">Cached a few minutes — use <em>Re-check</em> after publishing. Unlike outbound, inbound needs an MX pointing at this server.</p>
|
||||||
|
<label>MX <span class="st st-ok">ok</span></label>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<span class="code">lists.example.com</span>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">MX</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value</label>
|
||||||
|
<span class="code">10 mail.example.org.
|
||||||
|
20 mail.primary.example.net.</span>
|
||||||
|
<p class="muted">An MX points at mail.example.org (this server). Other MX values are the domain’s own primaries — they are not an error.</p>
|
||||||
|
<div class="actions-row"><button type="button">Re-check</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Upstream</h2>
|
||||||
|
<p class="muted">Where accepted mail is handed off. Not a mailbox.</p>
|
||||||
|
<label>Host</label><input value="10.0.0.8">
|
||||||
|
<label>Port</label><input value="25">
|
||||||
|
<label>TLS to upstream</label>
|
||||||
|
<select><option>Opportunistic</option><option selected>Required</option><option>Off</option></select>
|
||||||
|
<div class="actions-row"><button type="button">Save upstream</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>MX record to publish</h2>
|
||||||
|
<p class="muted">Add this MX so the internet delivers here. Keep any existing primary MX if this is backup-MX.</p>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<div class="code-row"><span class="code">lists.example.com</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">MX</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value</label>
|
||||||
|
<div class="code-row"><span class="code">10 mail.example.org.</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card rcpt-mode">
|
||||||
|
<h2>Valid recipients</h2>
|
||||||
|
<p class="muted">Who this domain accepts on port 25. Same idea as an application’s address mode: a list, or any address at the domain.</p>
|
||||||
|
<label>Who to accept</label>
|
||||||
|
<select>
|
||||||
|
<option value="list" selected>Listed addresses only</option>
|
||||||
|
<option value="any">Any recipient at this domain</option>
|
||||||
|
</select>
|
||||||
|
<div class="rcpt-list">
|
||||||
|
<label>Addresses (one per line or comma-separated)</label>
|
||||||
|
<textarea rows="6">staff@lists.example.com
|
||||||
|
postmaster@lists.example.com
|
||||||
|
abuse@lists.example.com</textarea>
|
||||||
|
<p class="muted">Unknown recipients are rejected at RCPT so this relay does not generate backscatter.</p>
|
||||||
|
</div>
|
||||||
|
<p class="rcpt-any muted">Every address at this domain is accepted and forwarded. Prefer a list unless the upstream rejects unknowns — otherwise this relay may generate backscatter.</p>
|
||||||
|
<div class="actions-row"><button type="button">Save recipients</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Danger zone</h2>
|
||||||
|
<p class="muted">Stops accepting mail for this domain. Does not touch outbound sending domains.</p>
|
||||||
|
<div class="actions-row"><a class="danger" href="inbound-delete.html">Delete inbound domain</a></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Inbound — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-inbound" data-page="inbound" data-nav="inbound" data-title="Inbound" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div class="page-head">
|
||||||
|
<h1>Inbound <span class="tag">1.x</span></h1>
|
||||||
|
</div>
|
||||||
|
<p class="muted">Backup-MX / forwarder. Accepts on port 25 only for listed domains. Recipients are either an allow-list or any address at that domain. Off by default in Compose.</p>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Forwarding</h2>
|
||||||
|
<form class="measure" action="#" onsubmit="return false">
|
||||||
|
<label for="iname">Add inbound domain</label>
|
||||||
|
<div class="input-row">
|
||||||
|
<input id="iname" placeholder="lists.example.com">
|
||||||
|
<button type="button">Add domain</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Domain</th><th>DNS</th><th>Upstream</th><th>Recipients</th><th>TLS</th><th></th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td><a href="inbound-domain.html">lists.example.com</a></td>
|
||||||
|
<td><a class="st st-ok" href="inbound-domain.html">ok</a></td>
|
||||||
|
<td class="muted">10.0.0.8:25</td>
|
||||||
|
<td>12 listed</td>
|
||||||
|
<td><span class="st st-ok">required</span></td>
|
||||||
|
<td class="actions"><a class="danger" href="inbound-delete.html">Delete</a></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="inbound-backup.html">backup.example.net</a></td>
|
||||||
|
<td><a class="st st-error" href="inbound-backup.html">error</a></td>
|
||||||
|
<td class="muted">192.0.2.20:25</td>
|
||||||
|
<td>any</td>
|
||||||
|
<td><span class="st st-unknown">off</span></td>
|
||||||
|
<td class="actions"><a class="danger" href="inbound-delete.html">Delete</a></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li><a href="inbound-domain.html"><span>lists.example.com</span><span class="st st-ok">ok</span><span class="meta">12 listed · 10.0.0.8:25</span></a></li>
|
||||||
|
<li><a href="inbound-backup.html"><span>backup.example.net</span><span class="st st-error">error</span><span class="meta">any recipient · 192.0.2.20:25</span></a></li>
|
||||||
|
</ul>
|
||||||
|
<p class="muted">The <em>DNS</em> badge is the MX check: at least one MX must point at this server. Results are cached for a few minutes; open a domain for the lookup and a <em>Re-check</em> button.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,188 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="ru">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>SelfPost — макеты панели</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
</head>
|
||||||
|
<body class="doc">
|
||||||
|
<div class="wrap">
|
||||||
|
|
||||||
|
<header>
|
||||||
|
<p class="eyebrow">макеты · не панель</p>
|
||||||
|
<h1>Self<b>Post</b> — полное обновление интерфейса</h1>
|
||||||
|
<p>Проект системы — как собирать экраны, чтобы не чинить пустые колонки, высоту полей и ряды кнопок по одному. Каждый экран — отдельная страница, не простыня с якорями. Знак и палитра из листа утверждения не меняются. HTML в <code>docs/assets/panel-ui/</code>, не вёрстка <code>internal/web</code>.</p>
|
||||||
|
<div class="cta-row">
|
||||||
|
<a class="cta" href="status.html">Открыть Status</a>
|
||||||
|
<a class="cta quiet" href="system.html">Система интерфейса</a>
|
||||||
|
<a class="cta quiet" href="status.html?view=phone">Аварийный телефон</a>
|
||||||
|
<a class="cta quiet" href="status.html?theme=dark">Status, тёмная тема</a>
|
||||||
|
</div>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>Система, не рескин</h2>
|
||||||
|
<p>Первый click-through повторил сетку живой панели, поэтому те же сбои чинились по одному. <a href="system.html">Грамматика</a> задаёт регионы (<code>measure</code> / <code>pair</code> / <code>fill</code>), карточку со слотом справки, <code>field-row</code> (Host и Type одной высоты) и <code>actions-row</code>. Макеты собраны только из этого: один экран — один HTML-файл.</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>Ширина окна</h2>
|
||||||
|
<p>Сейчас оболочка центрируется, колонка контента упирается в <code>64rem</code>, формы ещё уже — <code>48rem</code>. На широком мониторе поля пустые. Растянуть поля на 100% окна нельзя — они становятся нечитаемыми. Две независимые карточки рядом — можно.</p>
|
||||||
|
<h3>Гибрид</h3>
|
||||||
|
<p>Навигация прижата влево. Ops-страницы (Status, Deliveries, очередь, лог, Backup, Settings, DMARC, inbound) занимают остаток до <strong>90rem (~1440px)</strong>. Backup — полный бэкап ‖ импорт. Settings — учётные данные ‖ DMARC (у domain-admin остаётся одна узкая карточка). Таблица Users — <code>fill</code>. Одиночные формы (подтверждения, форма пользователя) остаются <strong>42rem и выровнены влево</strong>. Login и setup — по-прежнему узкий центрированный блок.</p>
|
||||||
|
<div class="compare">
|
||||||
|
<div>
|
||||||
|
<div class="row">сейчас, окно ~1600px</div>
|
||||||
|
<div class="bar">
|
||||||
|
<i class="navc">nav</i>
|
||||||
|
<i class="col" style="width:42%">64rem</i>
|
||||||
|
<i class="empty">пусто</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div class="row">макет, ops-страница</div>
|
||||||
|
<div class="bar">
|
||||||
|
<i class="navc">nav</i>
|
||||||
|
<i class="fill">контент до 90rem</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<div class="row">макет, форма</div>
|
||||||
|
<div class="bar">
|
||||||
|
<i class="navc">nav</i>
|
||||||
|
<i class="col" style="width:28%">42rem</i>
|
||||||
|
<i class="empty">поле не растягивает инпуты</i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="note">На телефоне это не «узкий десктоп». Таблицы из шести колонок складываются в список. Навигация — выезжающая колонка на CSS-checkbox, без обязательного JavaScript (как панели Edit у приложений уже сейчас).</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>Информационная архитектура</h2>
|
||||||
|
<div class="ia">
|
||||||
|
<div>
|
||||||
|
<h3>Global administrator</h3>
|
||||||
|
<ul>
|
||||||
|
<li>Status</li>
|
||||||
|
<li>Domains → domain → delete</li>
|
||||||
|
<li>Deliveries → message</li>
|
||||||
|
<li>Mail queue</li>
|
||||||
|
<li>System log</li>
|
||||||
|
<li>Inbound <span class="tag">1.x</span> — скрыт, пока <code>INBOUND_RELAY_ENABLE</code> выключен</li>
|
||||||
|
<li>DMARC reports <span class="tag future">candidate</span></li>
|
||||||
|
<li>Backup, Users, Settings</li>
|
||||||
|
<li>Help <span class="tag future">candidate</span> — пункт навбара и drawer с карточек Status и страницы домена</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3>Domain-admin</h3>
|
||||||
|
<ul>
|
||||||
|
<li>Domains (только назначенные) → domain → DMARC reports этого домена</li>
|
||||||
|
<li>Deliveries → message, включая пояснение retry</li>
|
||||||
|
<li>Settings — только учётные данные панели</li>
|
||||||
|
<li>Help drawer</li>
|
||||||
|
<li>Нет Status, очереди, system log, Backup, Users, inbound, глобального DMARC hub</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="muted" style="margin-top:1rem">В прототипе роль, inbound-флаг, ширина и тема переключаются в шапке. <code>contributing</code> и <code>schema-squash</code> экранов не имеют.</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>Знак и новые иконки</h2>
|
||||||
|
<p>Утверждённый stamp не заменяется. Для узкой шапки телефона предлагается уже существующий SP-значок (фавикон), а не компактный wordmark: на 390px высота важнее, чем прочитать «SelfPost» второй раз.</p>
|
||||||
|
<div class="mark-row">
|
||||||
|
<figure>
|
||||||
|
<img src="../selfpost-stamp.svg" width="220" height="100" alt="Полный знак">
|
||||||
|
<figcaption>эталон · login / setup</figcaption>
|
||||||
|
</figure>
|
||||||
|
<figure>
|
||||||
|
<img src="../selfpost-stamp-compact.svg" width="160" height="73" alt="Компактный знак">
|
||||||
|
<figcaption>колонка навбара</figcaption>
|
||||||
|
</figure>
|
||||||
|
<figure>
|
||||||
|
<img src="../selfpost-icon.svg" width="64" height="64" alt="SP">
|
||||||
|
<figcaption>телефон · шапка drawer</figcaption>
|
||||||
|
</figure>
|
||||||
|
</div>
|
||||||
|
<h3>Иконки новых пунктов</h3>
|
||||||
|
<p class="muted">Тот же штрих 1.5, что у Status / Domains. Не пиктограммы-эмодзи и не заливка.</p>
|
||||||
|
<div class="icons-row">
|
||||||
|
<div class="icon-card">
|
||||||
|
<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.5 9.5h11"/><path d="M8 2.75v6.2"/><path d="M5.4 6.4 8 9.05 10.6 6.4"/><path d="M3.2 12.6h9.6"/></svg>
|
||||||
|
<span>Inbound</span>
|
||||||
|
</div>
|
||||||
|
<div class="icon-card">
|
||||||
|
<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M8 1.85 2.75 3.7v4.2c0 3.15 2.15 5.2 5.25 6.25 3.1-1.05 5.25-3.1 5.25-6.25V3.7Z"/><path d="M5.4 8.05 7.15 9.8 10.7 6.2"/></svg>
|
||||||
|
<span>DMARC</span>
|
||||||
|
</div>
|
||||||
|
<div class="icon-card">
|
||||||
|
<svg viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="8" cy="8" r="6.25"/><path d="M8 7.2V11.4"/><path d="M8 5.05v.01"/></svg>
|
||||||
|
<span>Help</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section>
|
||||||
|
<h2>Экраны</h2>
|
||||||
|
<h3>Система</h3>
|
||||||
|
<div class="screen-index">
|
||||||
|
<a href="system.html">Грамматика и живые образцы</a>
|
||||||
|
</div>
|
||||||
|
<h3>Вход</h3>
|
||||||
|
<div class="screen-index">
|
||||||
|
<a href="login.html">Sign in</a>
|
||||||
|
<a href="setup.html">Create administrator</a>
|
||||||
|
</div>
|
||||||
|
<h3>Текущая панель</h3>
|
||||||
|
<div class="screen-index">
|
||||||
|
<a href="status.html">Status</a>
|
||||||
|
<a href="domains.html">Domains</a>
|
||||||
|
<a href="domain.html">Domain detail</a>
|
||||||
|
<a href="domain-delete.html">Delete domain</a>
|
||||||
|
<a href="deliveries.html">Deliveries</a>
|
||||||
|
<a href="delivery.html">Delivery (deferred + retries)</a>
|
||||||
|
<a href="mail-queue.html">Mail queue + retry policy</a>
|
||||||
|
<a href="system-log.html">System log</a>
|
||||||
|
<a href="backup.html">Backup</a>
|
||||||
|
<a href="users.html">Users</a>
|
||||||
|
<a href="user-form.html">Edit user</a>
|
||||||
|
<a href="user-delete.html">Delete user</a>
|
||||||
|
<a href="settings.html">Settings</a>
|
||||||
|
</div>
|
||||||
|
<h3>Roadmap</h3>
|
||||||
|
<div class="screen-index">
|
||||||
|
<a href="mail-queue.html">queue-retries — карточка на Mail queue</a>
|
||||||
|
<a href="delivery.html">queue-retries — history deferred</a>
|
||||||
|
<a href="inbound.html">Inbound list (колонка DNS = MX)</a>
|
||||||
|
<a href="inbound-domain.html">Inbound domain — DNS ok</a>
|
||||||
|
<a href="inbound-backup.html">Inbound domain — DNS error</a>
|
||||||
|
<a href="inbound-delete.html">Delete inbound domain</a>
|
||||||
|
<a href="status.html?inbound=0">Inbound выключен (пункта нет)</a>
|
||||||
|
<a href="dmarc.html">DMARC reports hub <span class="tag future">candidate</span></a>
|
||||||
|
<a href="dmarc-domain.html">DMARC — domain roll-up</a>
|
||||||
|
<a href="dmarc-report.html">DMARC report — aligned</a>
|
||||||
|
<a href="dmarc-report-fail.html">DMARC report — third-party fail</a>
|
||||||
|
<a href="help.html">Help <span class="tag future">candidate</span></a>
|
||||||
|
</div>
|
||||||
|
<h3>Аварийный телефон</h3>
|
||||||
|
<div class="screen-index">
|
||||||
|
<a href="status.html?view=phone">Status 390px — Overall, then queue/cert, then the rest</a>
|
||||||
|
<a href="mail-queue.html?view=phone">Mail queue 390px</a>
|
||||||
|
<a href="deliveries.html?view=phone">Deliveries 390px — список, не таблица</a>
|
||||||
|
<a href="delivery.html?view=phone">Delivery 390px</a>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section style="border-bottom:none">
|
||||||
|
<h2>Как смотреть</h2>
|
||||||
|
<p>Откройте любой экран из списка — это отдельная страница, не якорь в одном файле. Шапка прототипа — не часть панели: роль, Desktop/Phone, inbound, светлая/тёмная. Копирайт экранов английский, как в продукте. Drawer Help открывается с «?» на Status или с карточек домена; на карточках остаются показания и колонка Detail.</p>
|
||||||
|
<p class="muted">После утверждения макетов вёрстка <code>panel.css</code> и шаблонов — отдельная задача. CSP и progressive enhancement в этом HTML не воспроизводятся один в один: здесь допустимы вещи, которые в панели останутся в файле стилей.</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Sign in — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-login" data-page="login" data-nav="login" data-title="Sign in" data-auth="1">
|
||||||
|
<main class="auth">
|
||||||
|
<img class="mark" src="../selfpost-stamp.svg" width="330" height="150" alt="SelfPost">
|
||||||
|
<h1>Sign in</h1>
|
||||||
|
<div class="card">
|
||||||
|
<form action="status.html">
|
||||||
|
<label for="u">Username</label>
|
||||||
|
<input id="u" name="username" autocomplete="username">
|
||||||
|
<label for="p">Password</label>
|
||||||
|
<input id="p" name="password" type="password" autocomplete="current-password">
|
||||||
|
<div class="actions-row"><button type="submit">Sign in</button></div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<p class="version" style="text-align:center">© Mixeme · <a href="#">License (AGPL-3.0)</a></p>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,54 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Mail queue — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-mail-queue" data-page="mail-queue" data-nav="queue" data-title="Mail queue" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<h1>Mail queue</h1>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>How delivery retries work</h2>
|
||||||
|
<p class="muted">This Postfix’s policy, read once at panel start. There is no maximum attempt count — only time.</p>
|
||||||
|
<div class="facts retry-facts">
|
||||||
|
<div class="fact"><span class="fact-label">First retry</span><span class="fact-value">5 minutes</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Later retries</span><span class="fact-value">doubling, cap 1 h 7 min</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Kept in queue</span><span class="fact-value">5 days</span></div>
|
||||||
|
<div class="fact"><span class="fact-label">Then</span><span class="fact-value">bounced</span></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Pending messages</h2>
|
||||||
|
<table class="desk-only">
|
||||||
|
<thead><tr><th>Queue id</th><th>Age</th><th>From</th><th>To</th><th>Size</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr><td class="mono">4C3A1E2F1A</td><td class="time muted">18 min</td><td>billing@example.com</td><td>ada@example.net</td><td>12 KiB</td></tr>
|
||||||
|
<tr><td class="mono">4C3A1E3010</td><td class="time muted">11 min</td><td>news@example.com</td><td>pat@slow.example</td><td>48 KiB</td></tr>
|
||||||
|
<tr><td class="mono">4C3A1E3102</td><td class="time muted">4 min</td><td>billing@example.com</td><td>ada@example.net</td><td>9 KiB</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
<ul class="phone-list phone-only">
|
||||||
|
<li><a href="delivery.html"><span>4C3A1E2F1A</span><span class="when">18 min</span><span class="meta">billing@example.com → ada@example.net</span></a></li>
|
||||||
|
<li><a href="delivery.html"><span>4C3A1E3010</span><span class="when">11 min</span><span class="meta">news@example.com → pat@slow.example</span></a></li>
|
||||||
|
<li><a href="delivery.html"><span>4C3A1E3102</span><span class="when">4 min</span><span class="meta">billing@example.com → ada@example.net</span></a></li>
|
||||||
|
</ul>
|
||||||
|
<label>postqueue -p</label>
|
||||||
|
<span class="code">-Queue ID- --Size-- ----Arrival Time---- -Sender/Recipient-------
|
||||||
|
4C3A1E2F1A* 12288 Sat Aug 15 20:14:02 billing@example.com
|
||||||
|
ada@example.net
|
||||||
|
4C3A1E3010 49152 Sat Aug 15 20:21:18 news@example.com
|
||||||
|
pat@slow.example
|
||||||
|
-- 3 Kbytes in 3 Requests.</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,715 @@
|
|||||||
|
/* SelfPost panel UI mockups. Tokens match internal/web/view/static/panel.css.
|
||||||
|
This file is a design artifact, not the panel stylesheet. */
|
||||||
|
|
||||||
|
@import url("https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&family=IBM+Plex+Sans:wght@200;300;400;500;600;700&display=swap");
|
||||||
|
|
||||||
|
:root {
|
||||||
|
color-scheme: light dark;
|
||||||
|
--font-sans: "IBM Plex Sans", system-ui, -apple-system, Segoe UI, Roboto, sans-serif;
|
||||||
|
--font-mono: "IBM Plex Mono", ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||||
|
--bg: #f4f2ed; --fg: #12161c;
|
||||||
|
--muted: #6b7684;
|
||||||
|
--card-bg: #fff;
|
||||||
|
--border: #dedcd7;
|
||||||
|
--control-border: #cbc8c1;
|
||||||
|
--input-bg: #fff;
|
||||||
|
--code-bg: #efede9;
|
||||||
|
--surface-bg: #eae7e0; --surface-bg-hover: #e0dcd3; --surface-open-bg: #d8d3c8;
|
||||||
|
--nav-active-bg: #ede4de;
|
||||||
|
--accent-fill: #7a3b2e; --accent-fill-hover: #632f25; --accent-text: #7a3b2e;
|
||||||
|
--on-accent: #fff;
|
||||||
|
--flash-bg: #edf6ef; --flash-border: #c2e0cc; --flash-fg: #2c6b43;
|
||||||
|
--credential-bg: #fcf6e4; --credential-border: #e0c874;
|
||||||
|
--danger-fill: #b42318; --danger-fill-hover: #912018;
|
||||||
|
--danger-bg: #fbedea; --danger-border: #efccc4; --danger-fg: #b42318; --danger-bg-hover: #f7dfda;
|
||||||
|
--st-ok-bg: #edf6ef; --st-ok-fg: #2c6b43; --st-ok-border: #c2e0cc;
|
||||||
|
--st-warn-bg: #fbf2e2; --st-warn-fg: #8a5510; --st-warn-border: #ebd5a6;
|
||||||
|
--st-error-bg: #fbedea; --st-error-fg: #b42318; --st-error-border: #efccc4;
|
||||||
|
--st-unknown-bg: #efede9; --st-unknown-fg: #6b7684; --st-unknown-border: #dedcd7;
|
||||||
|
--nav-w: 14rem;
|
||||||
|
--ops-max: 90rem;
|
||||||
|
--form-max: 42rem;
|
||||||
|
--auth-max: 24rem;
|
||||||
|
--gallery-h: 3.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dark-tokens {
|
||||||
|
--bg: #16181b; --fg: #e9e6e0;
|
||||||
|
--muted: #9aa1a9;
|
||||||
|
--card-bg: #1d2024;
|
||||||
|
--border: #2c2f34;
|
||||||
|
--control-border: #3a3e44;
|
||||||
|
--input-bg: #14161a;
|
||||||
|
--code-bg: #14161a;
|
||||||
|
--surface-bg: #23262b; --surface-bg-hover: #2c3036; --surface-open-bg: #343941;
|
||||||
|
--nav-active-bg: #2a1f1b;
|
||||||
|
--accent-fill: #8e4535; --accent-fill-hover: #a0503e; --accent-text: #ce7b66;
|
||||||
|
--flash-bg: #132318; --flash-border: #22452f; --flash-fg: #7fcb9b;
|
||||||
|
--credential-bg: #26210d; --credential-border: #5e5013;
|
||||||
|
--danger-fill: #9b2c22; --danger-fill-hover: #b0342a;
|
||||||
|
--danger-bg: #2a1412; --danger-border: #5e2721; --danger-fg: #eb9b92; --danger-bg-hover: #381a17;
|
||||||
|
--st-ok-bg: #132318; --st-ok-fg: #7fcb9b; --st-ok-border: #22452f;
|
||||||
|
--st-warn-bg: #2a2109; --st-warn-fg: #e5be72; --st-warn-border: #5e4b12;
|
||||||
|
--st-error-bg: #2a1412; --st-error-fg: #eb9b92; --st-error-border: #5e2721;
|
||||||
|
--st-unknown-bg: #23262b; --st-unknown-fg: #9aa1a9; --st-unknown-border: #2c2f34;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-color-scheme: dark) {
|
||||||
|
:root { color-scheme: dark; }
|
||||||
|
html:not(.force-light) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
* { box-sizing: border-box; }
|
||||||
|
html { scrollbar-gutter: stable; }
|
||||||
|
body {
|
||||||
|
font: 400 15px/1.5 var(--font-sans);
|
||||||
|
margin: 0; background: var(--bg); color: var(--fg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.ctrl { position: absolute; width: 1px; height: 1px; overflow: hidden; clip: rect(0 0 0 0); }
|
||||||
|
|
||||||
|
/* —— Gallery chrome (index + prototype toolbar) —— */
|
||||||
|
.gallery {
|
||||||
|
position: sticky; top: 0; z-index: 40;
|
||||||
|
display: flex; flex-wrap: wrap; align-items: center; gap: 0.55rem 1rem;
|
||||||
|
min-height: var(--gallery-h);
|
||||||
|
padding: 0.45rem 1rem;
|
||||||
|
background: var(--surface-bg);
|
||||||
|
border-bottom: 1px solid var(--border);
|
||||||
|
font-size: 0.82rem;
|
||||||
|
}
|
||||||
|
.gallery a { color: var(--accent-text); }
|
||||||
|
.gallery .brand-mini {
|
||||||
|
font-family: var(--font-mono); font-size: 0.7rem; font-weight: 600;
|
||||||
|
letter-spacing: 0.12em; text-transform: uppercase; color: var(--accent-text);
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
.gallery .seg {
|
||||||
|
display: flex; flex-wrap: wrap; align-items: center; gap: 0.2rem 0.35rem;
|
||||||
|
}
|
||||||
|
.gallery .seg > span { color: var(--muted); margin-right: 0.15rem; }
|
||||||
|
.gallery .seg label {
|
||||||
|
margin: 0; font-weight: 500; cursor: pointer;
|
||||||
|
padding: 0.2rem 0.55rem; border: 1px solid var(--control-border);
|
||||||
|
border-radius: 5px; background: var(--card-bg); color: var(--fg);
|
||||||
|
}
|
||||||
|
#role-global:checked ~ .gallery label[for="role-global"],
|
||||||
|
#role-domain:checked ~ .gallery label[for="role-domain"],
|
||||||
|
#vp-desktop:checked ~ .gallery label[for="vp-desktop"],
|
||||||
|
#vp-phone:checked ~ .gallery label[for="vp-phone"],
|
||||||
|
#theme-light:checked ~ .gallery label[for="theme-light"],
|
||||||
|
#theme-dark:checked ~ .gallery label[for="theme-dark"] {
|
||||||
|
background: var(--nav-active-bg); color: var(--accent-text);
|
||||||
|
border-color: var(--accent-fill); font-weight: 600;
|
||||||
|
}
|
||||||
|
.gallery .check-lab {
|
||||||
|
display: flex; align-items: center; gap: 0.35rem; margin: 0; font-weight: 500; cursor: pointer;
|
||||||
|
}
|
||||||
|
.gallery .check-lab input { width: auto; margin: 0; }
|
||||||
|
.tag {
|
||||||
|
display: inline-block; font-family: var(--font-mono); font-size: 0.68rem;
|
||||||
|
font-weight: 500; letter-spacing: 0.06em; text-transform: uppercase;
|
||||||
|
padding: 0.12rem 0.4rem; border-radius: 4px;
|
||||||
|
background: var(--surface-bg); color: var(--muted); border: 1px solid var(--border);
|
||||||
|
}
|
||||||
|
.tag.future { color: var(--st-warn-fg); border-color: var(--st-warn-border); background: var(--st-warn-bg); }
|
||||||
|
|
||||||
|
body:has(#theme-dark:checked) { background: #16181b; color: #e9e6e0; }
|
||||||
|
|
||||||
|
#theme-dark:checked ~ .gallery,
|
||||||
|
#theme-dark:checked ~ .app,
|
||||||
|
#theme-dark:checked ~ .help-drawer {
|
||||||
|
--bg: #16181b; --fg: #e9e6e0;
|
||||||
|
--muted: #9aa1a9;
|
||||||
|
--card-bg: #1d2024;
|
||||||
|
--border: #2c2f34;
|
||||||
|
--control-border: #3a3e44;
|
||||||
|
--input-bg: #14161a;
|
||||||
|
--code-bg: #14161a;
|
||||||
|
--surface-bg: #23262b; --surface-bg-hover: #2c3036; --surface-open-bg: #343941;
|
||||||
|
--nav-active-bg: #2a1f1b;
|
||||||
|
--accent-fill: #8e4535; --accent-fill-hover: #a0503e; --accent-text: #ce7b66;
|
||||||
|
--flash-bg: #132318; --flash-border: #22452f; --flash-fg: #7fcb9b;
|
||||||
|
--credential-bg: #26210d; --credential-border: #5e5013;
|
||||||
|
--danger-fill: #9b2c22; --danger-fill-hover: #b0342a;
|
||||||
|
--danger-bg: #2a1412; --danger-border: #5e2721; --danger-fg: #eb9b92; --danger-bg-hover: #381a17;
|
||||||
|
--st-ok-bg: #132318; --st-ok-fg: #7fcb9b; --st-ok-border: #22452f;
|
||||||
|
--st-warn-bg: #2a2109; --st-warn-fg: #e5be72; --st-warn-border: #5e4b12;
|
||||||
|
--st-error-bg: #2a1412; --st-error-fg: #eb9b92; --st-error-border: #5e2721;
|
||||||
|
--st-unknown-bg: #23262b; --st-unknown-fg: #9aa1a9; --st-unknown-border: #2c2f34;
|
||||||
|
background: var(--bg); color: var(--fg);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* —— Prototype shell: nav docked left, content uses remaining width —— */
|
||||||
|
.app {
|
||||||
|
display: flex; align-items: flex-start; min-height: calc(100vh - var(--gallery-h));
|
||||||
|
background: var(--bg);
|
||||||
|
}
|
||||||
|
.stage { flex: 1 1 auto; min-width: 0; }
|
||||||
|
.nav {
|
||||||
|
position: sticky; top: var(--gallery-h); align-self: stretch;
|
||||||
|
flex: none; width: var(--nav-w);
|
||||||
|
display: flex; flex-direction: column; gap: 0.75rem;
|
||||||
|
padding: 1.1rem 0.85rem 1.4rem;
|
||||||
|
border-right: 1px solid var(--border);
|
||||||
|
background: var(--bg);
|
||||||
|
max-height: calc(100vh - var(--gallery-h)); overflow-y: auto;
|
||||||
|
}
|
||||||
|
.nav .links, .nav .session { display: flex; flex-direction: column; gap: 0.1rem; }
|
||||||
|
.nav .session { margin-top: auto; padding-top: 0.75rem; border-top: 1px solid var(--border); }
|
||||||
|
.nav .session .muted { padding: 0 0.6rem; font-size: 0.85rem; overflow-wrap: anywhere; }
|
||||||
|
.nav .session-user { display: flex; align-items: center; gap: 0.5rem; }
|
||||||
|
.nav .brand { padding: 0; display: block; }
|
||||||
|
.nav .brand img { display: block; width: 100%; height: auto; }
|
||||||
|
.nav a, .nav [aria-current], .nav .current {
|
||||||
|
display: flex; align-items: center; gap: 0.5rem;
|
||||||
|
padding: 0.35rem 0.6rem; border-radius: 5px; text-decoration: none;
|
||||||
|
color: var(--fg);
|
||||||
|
}
|
||||||
|
.nav a:hover { background: var(--surface-bg); }
|
||||||
|
.nav [aria-current], .nav .current {
|
||||||
|
font-weight: 600; color: var(--accent-text); background: var(--nav-active-bg);
|
||||||
|
box-shadow: inset 2px 0 0 var(--accent-fill);
|
||||||
|
}
|
||||||
|
body.page-status .n-status,
|
||||||
|
body.page-domains .n-domains,
|
||||||
|
body.page-domain .n-domains,
|
||||||
|
body.page-domain-delete .n-domains,
|
||||||
|
body.page-deliveries .n-deliveries,
|
||||||
|
body.page-delivery .n-deliveries,
|
||||||
|
body.page-mail-queue .n-queue,
|
||||||
|
body.page-system-log .n-log,
|
||||||
|
body.page-inbound .n-inbound,
|
||||||
|
body.page-inbound-domain .n-inbound,
|
||||||
|
body.page-inbound-backup .n-inbound,
|
||||||
|
body.page-inbound-delete .n-inbound,
|
||||||
|
body.page-dmarc .n-dmarc,
|
||||||
|
body.page-dmarc-domain .n-dmarc,
|
||||||
|
body.page-dmarc-report .n-dmarc,
|
||||||
|
body.page-dmarc-report-fail .n-dmarc,
|
||||||
|
body.page-backup .n-backup,
|
||||||
|
body.page-users .n-users,
|
||||||
|
body.page-user-form .n-users,
|
||||||
|
body.page-user-delete .n-users,
|
||||||
|
body.page-help .n-help,
|
||||||
|
body.page-settings .n-settings {
|
||||||
|
font-weight: 600; color: var(--accent-text); background: var(--nav-active-bg);
|
||||||
|
box-shadow: inset 2px 0 0 var(--accent-fill);
|
||||||
|
}
|
||||||
|
.nav .icon { width: 1rem; height: 1rem; flex: none; }
|
||||||
|
.nav button, .nav .btn-ghost {
|
||||||
|
display: flex; align-items: center; gap: 0.5rem;
|
||||||
|
margin: 0; padding: 0.35rem 0.6rem; font: inherit; font-size: 0.95rem; font-weight: 400;
|
||||||
|
color: var(--danger-fg); background: var(--danger-bg); border: 1px solid var(--danger-border);
|
||||||
|
border-radius: 5px; cursor: pointer; text-decoration: none; width: 100%;
|
||||||
|
}
|
||||||
|
.nav button:hover, .nav .btn-ghost:hover { background: var(--danger-bg-hover); }
|
||||||
|
|
||||||
|
.phone-bar { display: none; }
|
||||||
|
.phone-bar .icon { width: 1.1rem; height: 1.1rem; }
|
||||||
|
.mono { font-family: var(--font-mono); }
|
||||||
|
.sprite { position: absolute; width: 0; height: 0; overflow: hidden; }
|
||||||
|
|
||||||
|
#feat-inbound:checked ~ .gallery label[for="feat-inbound"] {
|
||||||
|
background: var(--nav-active-bg); color: var(--accent-text);
|
||||||
|
border-color: var(--accent-fill);
|
||||||
|
}
|
||||||
|
.gallery label[for="feat-inbound"] {
|
||||||
|
margin: 0; font-weight: 500; cursor: pointer;
|
||||||
|
padding: 0.2rem 0.55rem; border: 1px solid var(--control-border);
|
||||||
|
border-radius: 5px; background: var(--card-bg); color: var(--fg);
|
||||||
|
}
|
||||||
|
#role-domain:checked ~ .gallery .g-only { display: none; }
|
||||||
|
|
||||||
|
main {
|
||||||
|
flex: 1 1 auto; min-width: 0; width: 100%;
|
||||||
|
padding: 1.5rem 1.5rem 2.5rem;
|
||||||
|
}
|
||||||
|
main.auth {
|
||||||
|
max-width: none; display: flex; flex-direction: column; align-items: center;
|
||||||
|
padding-top: 3rem;
|
||||||
|
}
|
||||||
|
main.auth > * { width: 100%; max-width: var(--auth-max); margin-left: auto; margin-right: auto; }
|
||||||
|
main.stack > .page-head,
|
||||||
|
main.stack > h1 { margin-bottom: 0; }
|
||||||
|
main.stack > .back { margin: 0; }
|
||||||
|
main.stack > .route { margin-top: 0; margin-bottom: 0; }
|
||||||
|
main.stack > p.muted { margin-top: 0; margin-bottom: 0; }
|
||||||
|
main.stack > .toolbar { margin-bottom: 0; max-width: var(--ops-max); }
|
||||||
|
|
||||||
|
body.page-login .nav,
|
||||||
|
body.page-setup .nav,
|
||||||
|
body.page-login .phone-bar,
|
||||||
|
body.page-setup .phone-bar { display: none !important; }
|
||||||
|
body.page-login .app,
|
||||||
|
body.page-setup .app { display: block; }
|
||||||
|
|
||||||
|
#role-domain:checked ~ .app .g-only { display: none !important; }
|
||||||
|
#role-domain:checked ~ .app .pair:has(> .g-only) {
|
||||||
|
display: block;
|
||||||
|
max-width: var(--form-max);
|
||||||
|
}
|
||||||
|
#feat-inbound:not(:checked) ~ .app .in-only { display: none !important; }
|
||||||
|
#feat-inbound:checked ~ .app .in-off { display: none !important; }
|
||||||
|
|
||||||
|
h1 { font-size: 1.5rem; font-weight: 300; letter-spacing: -0.01em; margin: 0 0 1rem; }
|
||||||
|
h1.subject { overflow-wrap: anywhere; }
|
||||||
|
h2 { font-size: 1.05rem; font-weight: 600; margin: 0 0 0.4rem; }
|
||||||
|
.mark { display: block; width: 100%; max-width: 24rem; height: auto; margin-bottom: 1.4rem; }
|
||||||
|
.card {
|
||||||
|
background: var(--card-bg); border: 1px solid var(--border); border-radius: 6px;
|
||||||
|
padding: 1.25rem 1.4rem; margin: 0;
|
||||||
|
}
|
||||||
|
.card.narrow { max-width: var(--auth-max); }
|
||||||
|
.card + .card { margin-top: 1rem; }
|
||||||
|
.card.credential { border-color: var(--credential-border); background: var(--credential-bg); }
|
||||||
|
.muted { color: var(--muted); }
|
||||||
|
.error { color: var(--danger-fg); margin: 0.6rem 0 0; font-weight: 600; }
|
||||||
|
a { color: var(--accent-text); }
|
||||||
|
.back { display: block; margin: -0.4rem 0 1rem; }
|
||||||
|
.flash {
|
||||||
|
background: var(--flash-bg); border: 1px solid var(--flash-border); color: var(--flash-fg);
|
||||||
|
padding: 0.7rem 1rem; border-radius: 6px; margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
.flash.error { background: var(--danger-bg); border-color: var(--danger-border); color: var(--danger-fg); }
|
||||||
|
.version { margin-top: 1.6rem; text-align: right; font-size: 0.8rem; color: var(--muted); }
|
||||||
|
.version a { color: inherit; }
|
||||||
|
|
||||||
|
label { display: block; font-weight: 600; margin: 0.9rem 0 0.3rem; }
|
||||||
|
label.check {
|
||||||
|
display: flex; align-items: center; gap: 0.5rem; margin: 0.45rem 0 0; font-weight: 600; cursor: pointer;
|
||||||
|
}
|
||||||
|
label.check input { width: auto; margin: 0; padding: 0; border: 0; background: none; }
|
||||||
|
input, select, textarea {
|
||||||
|
width: 100%; padding: 0.55rem 0.7rem; font-family: inherit; font-size: 1rem;
|
||||||
|
border: 1px solid var(--control-border); border-radius: 5px; background: var(--input-bg); color: inherit;
|
||||||
|
}
|
||||||
|
textarea { resize: vertical; }
|
||||||
|
fieldset {
|
||||||
|
margin: 0.9rem 0 0; padding: 0.55rem 0.85rem 0.85rem;
|
||||||
|
border: 1px solid var(--control-border); border-radius: 5px;
|
||||||
|
}
|
||||||
|
fieldset legend { padding: 0 0.25rem; font-weight: 600; }
|
||||||
|
fieldset > .muted { margin: 0.15rem 0 0.35rem; font-size: 0.85rem; font-weight: 400; }
|
||||||
|
|
||||||
|
button, a.btn, a.danger {
|
||||||
|
display: inline-block; margin-top: 1.1rem; padding: 0.6rem 1.1rem;
|
||||||
|
font: inherit; font-size: 1rem; font-weight: 600; text-decoration: none;
|
||||||
|
color: var(--on-accent); background: var(--accent-fill); border: 0; border-radius: 5px; cursor: pointer;
|
||||||
|
}
|
||||||
|
button:hover, a.btn:hover { background: var(--accent-fill-hover); }
|
||||||
|
button.danger, a.danger { background: var(--danger-fill); color: var(--on-accent); }
|
||||||
|
button.danger:hover, a.danger:hover { background: var(--danger-fill-hover); }
|
||||||
|
form.inline { display: inline; margin: 0; }
|
||||||
|
.form-actions {
|
||||||
|
display: flex; flex-wrap: wrap; gap: 0.6rem; align-items: center;
|
||||||
|
margin-top: 1.1rem;
|
||||||
|
}
|
||||||
|
.form-actions > button, .form-actions > a.btn, .form-actions > a.danger { margin-top: 0; }
|
||||||
|
|
||||||
|
.st {
|
||||||
|
display: inline-block; padding: 0.14rem 0.45rem 0.28rem; border-radius: 4px;
|
||||||
|
font-family: var(--font-mono); font-size: 0.78rem; font-weight: 500; line-height: 1;
|
||||||
|
letter-spacing: 0.02em; vertical-align: middle; border: 1px solid transparent;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
.st-ok { background: var(--st-ok-bg); color: var(--st-ok-fg); border-color: var(--st-ok-border); }
|
||||||
|
.st-warn { background: var(--st-warn-bg); color: var(--st-warn-fg); border-color: var(--st-warn-border); }
|
||||||
|
.st-error { background: var(--st-error-bg); color: var(--st-error-fg); border-color: var(--st-error-border); }
|
||||||
|
.st-unknown { background: var(--st-unknown-bg); color: var(--st-unknown-fg); border-color: var(--st-unknown-border); }
|
||||||
|
a.st, a.st:hover { color: inherit; text-decoration: none; }
|
||||||
|
|
||||||
|
table { width: 100%; border-collapse: collapse; }
|
||||||
|
th, td {
|
||||||
|
text-align: left; padding: 0.5rem 0.45rem; border-bottom: 1px solid var(--border);
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
th {
|
||||||
|
font-family: var(--font-mono); font-size: 0.75rem; font-weight: 500;
|
||||||
|
text-transform: uppercase; letter-spacing: 0.08em; color: var(--muted);
|
||||||
|
}
|
||||||
|
td.actions { text-align: right; }
|
||||||
|
.metric { white-space: nowrap; }
|
||||||
|
.card:has(table) { overflow-x: auto; }
|
||||||
|
td.subject span {
|
||||||
|
display: block; max-width: 22rem;
|
||||||
|
overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.code {
|
||||||
|
display: block; white-space: pre; overflow-x: auto; overflow-wrap: normal;
|
||||||
|
word-break: normal; font-family: var(--font-mono);
|
||||||
|
font-size: 0.85rem; background: var(--code-bg); border: 1px solid var(--border);
|
||||||
|
border-radius: 5px; padding: 0.7rem 0.8rem; margin: 0.3rem 0 0;
|
||||||
|
}
|
||||||
|
.code-row { display: flex; align-items: flex-start; gap: 0.5rem; }
|
||||||
|
.code-row .code { flex: 1; min-width: 0; margin-top: 0; padding-top: 0.45rem; padding-bottom: 0.45rem; }
|
||||||
|
.input-row { display: flex; align-items: stretch; gap: 0.5rem; }
|
||||||
|
.input-row input { flex: 1; min-width: 0; }
|
||||||
|
.input-row button { margin-top: 0; flex: none; white-space: nowrap; }
|
||||||
|
|
||||||
|
.split {
|
||||||
|
display: grid; grid-template-columns: repeat(auto-fit, minmax(22rem, 1fr));
|
||||||
|
gap: 1rem; margin-top: 1rem;
|
||||||
|
}
|
||||||
|
h1 + .split, h1 + form > .split { margin-top: 0; }
|
||||||
|
.split > .card { min-width: 0; }
|
||||||
|
.split > .card + .card { margin-top: 0; }
|
||||||
|
.split + .card, .card + .split, form:has(.split) + .card { margin-top: 1rem; }
|
||||||
|
#settings form { width: 100%; max-width: none; }
|
||||||
|
#settings .split,
|
||||||
|
#backup > .split {
|
||||||
|
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
|
||||||
|
}
|
||||||
|
|
||||||
|
.check-cols {
|
||||||
|
display: grid; grid-template-columns: repeat(auto-fit, minmax(20rem, 1fr));
|
||||||
|
gap: 1rem 1.2rem; margin-top: 1rem;
|
||||||
|
}
|
||||||
|
.check-col { min-width: 0; }
|
||||||
|
.check-col-title { margin: 0.85rem 0 0.35rem; font-size: 1.05rem; font-weight: 600; }
|
||||||
|
.field-pair {
|
||||||
|
display: grid; grid-template-columns: repeat(auto-fit, minmax(8rem, 1fr));
|
||||||
|
gap: 0 1rem; margin-top: 0.45rem;
|
||||||
|
}
|
||||||
|
.field-pair > div { min-width: 0; }
|
||||||
|
.field-pair label { margin-top: 0.45rem; }
|
||||||
|
/* Host / name beside Type — size the type column to that token rather than
|
||||||
|
giving it half the row. Vertical padding matches .code-row .code so Type is
|
||||||
|
the same height as Host when Copy sits beside it. */
|
||||||
|
.field-pair.host-type {
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
}
|
||||||
|
.field-pair.host-type .code {
|
||||||
|
padding-top: 0.45rem; padding-bottom: 0.45rem;
|
||||||
|
}
|
||||||
|
.field-type { width: max-content; }
|
||||||
|
.field-type .code {
|
||||||
|
width: fit-content; min-width: 2.75rem; text-align: center; box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.facts { display: grid; grid-template-columns: repeat(auto-fit, minmax(9.5rem, 1fr)); gap: 0.5rem; margin-top: 1rem; }
|
||||||
|
.fact { min-width: 0; padding: 0.5rem 0.7rem; border-radius: 6px; background: var(--surface-bg); }
|
||||||
|
.fact-label {
|
||||||
|
display: block; font-family: var(--font-mono); font-size: 0.7rem; font-weight: 500;
|
||||||
|
text-transform: uppercase; letter-spacing: 0.1em; color: var(--muted);
|
||||||
|
}
|
||||||
|
.fact-value { display: block; margin-top: 0.1rem; white-space: nowrap; overflow-x: auto; }
|
||||||
|
.fact-value.mono { font-family: var(--font-mono); font-size: 0.85rem; }
|
||||||
|
|
||||||
|
.timeline {
|
||||||
|
list-style: none; display: flex; flex-direction: column; gap: 1.1rem;
|
||||||
|
margin: 1rem 0 0; padding: 0.2rem 0 0.2rem 1.4rem; border-left: 2px solid var(--border);
|
||||||
|
}
|
||||||
|
.event { position: relative; min-width: 0; }
|
||||||
|
.event::before {
|
||||||
|
content: ""; position: absolute; left: -1.85rem; top: 0.3rem;
|
||||||
|
width: 0.65rem; height: 0.65rem; border-radius: 50%;
|
||||||
|
background: var(--card-bg); border: 2px solid var(--control-border);
|
||||||
|
}
|
||||||
|
.event.lvl-ok::before { border-color: var(--st-ok-fg); background: var(--st-ok-bg); }
|
||||||
|
.event.lvl-warn::before { border-color: var(--st-warn-fg); background: var(--st-warn-bg); }
|
||||||
|
.event.lvl-error::before { border-color: var(--st-error-fg); background: var(--st-error-bg); }
|
||||||
|
.event.pending { opacity: 0.7; }
|
||||||
|
.event.pending::before { border-style: dashed; }
|
||||||
|
.event-time { margin: 0; font-family: var(--font-mono); font-size: 0.75rem; color: var(--muted); }
|
||||||
|
.event-title { display: flex; flex-wrap: wrap; align-items: center; gap: 0.4rem; margin: 0.15rem 0 0; font-weight: 600; }
|
||||||
|
.event-detail { margin: 0.2rem 0 0; font-size: 0.9rem; }
|
||||||
|
|
||||||
|
.route { display: flex; flex-wrap: wrap; align-items: center; gap: 0.4rem; margin-top: -0.5rem; margin-bottom: 1rem; }
|
||||||
|
.route .addr { font-family: var(--font-mono); font-size: 0.9rem; white-space: nowrap; overflow-x: auto; max-width: 100%; }
|
||||||
|
.route .arrow { color: var(--muted); }
|
||||||
|
|
||||||
|
table.log { margin-top: 1rem; }
|
||||||
|
table.log th:first-child, table.log td.time { width: 1%; }
|
||||||
|
table.log td.log-text {
|
||||||
|
font-family: var(--font-mono);
|
||||||
|
font-size: 0.8rem; white-space: pre;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.copy, .actions button, .actions > label.toggle, .actions a.danger {
|
||||||
|
margin: 0; padding: 0.45rem 0.7rem; font-size: 0.8rem; font-weight: 600;
|
||||||
|
border-radius: 5px; white-space: nowrap;
|
||||||
|
background: var(--surface-bg); color: var(--accent-text); border: 1px solid var(--control-border);
|
||||||
|
}
|
||||||
|
button.copy:hover, .actions button:hover, .actions > label.toggle:hover { background: var(--surface-bg-hover); }
|
||||||
|
.actions button.danger, .actions a.danger { color: var(--danger-fg); background: var(--danger-bg); border-color: var(--danger-border); }
|
||||||
|
.actions { display: flex; flex-wrap: wrap; gap: 0.4rem; align-items: center; }
|
||||||
|
|
||||||
|
.apps { list-style: none; margin: 1rem 0 0; padding: 0; }
|
||||||
|
.app-item { padding: 0.9rem 0; border-top: 1px solid var(--border); }
|
||||||
|
.app-item:last-child { padding-bottom: 0; }
|
||||||
|
.app-login { margin: 0; font-family: var(--font-mono); font-weight: 600; }
|
||||||
|
.app-addr { margin: 0.15rem 0 0; white-space: nowrap; overflow-x: auto; }
|
||||||
|
.app-item .actions { margin-top: 0.7rem; }
|
||||||
|
.app-item .actions > .panel-toggle {
|
||||||
|
position: absolute; width: 1px; height: 1px; margin: 0; opacity: 0; pointer-events: none;
|
||||||
|
}
|
||||||
|
.app-item .actions > .panel { display: none; flex: 1 0 100%; }
|
||||||
|
.app-item .actions > .t-edit:checked ~ .panel-edit { display: block; }
|
||||||
|
.app-item .actions > .t-edit:checked ~ .for-edit { background: var(--surface-open-bg); }
|
||||||
|
.app-item .actions > .panel button { margin-top: 0.9rem; }
|
||||||
|
|
||||||
|
.encrypt { margin-top: 1.2rem; }
|
||||||
|
.encrypt-fields {
|
||||||
|
display: none; margin-top: 0.8rem; margin-left: 1.6rem; padding-left: 0.9rem;
|
||||||
|
border-left: 2px solid var(--border);
|
||||||
|
}
|
||||||
|
.encrypt:has(input[type="checkbox"]:checked) .encrypt-fields { display: block; }
|
||||||
|
.encrypt-fields label { margin-top: 0.7rem; }
|
||||||
|
|
||||||
|
.rcpt-list, .rcpt-any { display: none; }
|
||||||
|
.rcpt-mode:has(option[value="list"]:checked) .rcpt-list { display: block; }
|
||||||
|
.rcpt-mode:has(option[value="any"]:checked) .rcpt-any { display: block; }
|
||||||
|
|
||||||
|
.toolbar {
|
||||||
|
display: flex; flex-wrap: wrap; gap: 0.6rem 1rem; align-items: end;
|
||||||
|
padding: 0.85rem 1rem; margin-bottom: 1rem;
|
||||||
|
background: var(--card-bg); border: 1px solid var(--border); border-radius: 6px;
|
||||||
|
}
|
||||||
|
.toolbar .field { flex: 1 1 10rem; min-width: 8rem; }
|
||||||
|
.toolbar label { margin-top: 0; font-size: 0.8rem; }
|
||||||
|
.toolbar button { margin-top: 0; }
|
||||||
|
|
||||||
|
/* Status: hero + dense grid */
|
||||||
|
.status-hero {
|
||||||
|
display: flex; flex-wrap: wrap; align-items: baseline; gap: 0.75rem 1.2rem;
|
||||||
|
padding: 1rem 1.25rem; margin-bottom: 1rem;
|
||||||
|
background: var(--card-bg); border: 1px solid var(--border); border-radius: 6px;
|
||||||
|
}
|
||||||
|
.status-hero.attn,
|
||||||
|
.card.attn { border-color: var(--st-warn-border); }
|
||||||
|
.status-hero h1 { margin: 0; }
|
||||||
|
.status-hero .lead { margin: 0; color: var(--fg); }
|
||||||
|
.status-grid {
|
||||||
|
display: grid; grid-template-columns: repeat(auto-fit, minmax(17.5rem, 1fr));
|
||||||
|
gap: 1rem;
|
||||||
|
}
|
||||||
|
.status-grid .card { margin: 0; }
|
||||||
|
.status-grid .card.attn { border-color: var(--st-warn-border); }
|
||||||
|
.metric-row {
|
||||||
|
display: flex; justify-content: space-between; gap: 0.75rem; align-items: baseline;
|
||||||
|
padding: 0.35rem 0; border-bottom: 1px solid var(--border); font-size: 0.92rem;
|
||||||
|
}
|
||||||
|
.metric-row:last-child { border-bottom: 0; }
|
||||||
|
.metric-row .k { font-weight: 600; }
|
||||||
|
.metric-row .v { font-family: var(--font-mono); font-size: 0.85rem; }
|
||||||
|
meter { width: 5rem; height: 0.7rem; vertical-align: middle; margin-right: 0.4rem; }
|
||||||
|
.card-head {
|
||||||
|
display: flex; align-items: center; justify-content: space-between; gap: 0.5rem; margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
.card-head h2 { margin: 0; }
|
||||||
|
.help-link {
|
||||||
|
flex: none; width: 1.35rem; height: 1.35rem; display: inline-flex; align-items: center; justify-content: center;
|
||||||
|
border-radius: 50%; border: 1px solid var(--control-border); color: var(--muted);
|
||||||
|
text-decoration: none; font-family: var(--font-mono); font-size: 0.75rem; font-weight: 600;
|
||||||
|
background: var(--surface-bg); cursor: pointer; margin: 0;
|
||||||
|
}
|
||||||
|
.help-link:hover { color: var(--accent-text); border-color: var(--accent-fill); }
|
||||||
|
|
||||||
|
.page-head {
|
||||||
|
display: flex; flex-wrap: wrap; align-items: baseline; justify-content: space-between; gap: 0.5rem 1rem;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
.page-head h1 { margin: 0; }
|
||||||
|
|
||||||
|
/* Compact retry policy */
|
||||||
|
.retry-facts { display: grid; grid-template-columns: repeat(auto-fit, minmax(11rem, 1fr)); gap: 0.5rem; margin-top: 0.7rem; }
|
||||||
|
|
||||||
|
.phone-list { display: none; list-style: none; margin: 0; padding: 0; }
|
||||||
|
.phone-list li { border-bottom: 1px solid var(--border); }
|
||||||
|
.phone-list a,
|
||||||
|
.phone-list .item {
|
||||||
|
display: grid; grid-template-columns: 1fr auto; gap: 0.15rem 0.7rem;
|
||||||
|
padding: 0.75rem 0.1rem; text-decoration: none; color: var(--fg);
|
||||||
|
}
|
||||||
|
.phone-list .when { font-family: var(--font-mono); font-size: 0.75rem; color: var(--muted); }
|
||||||
|
.phone-list .meta { grid-column: 1 / -1; font-family: var(--font-mono); font-size: 0.82rem; white-space: nowrap; overflow-x: auto; }
|
||||||
|
.phone-list .subj { grid-column: 1 / -1; margin: 0; }
|
||||||
|
|
||||||
|
/* Help drawer — CSS checkbox, no script required */
|
||||||
|
.help-drawer {
|
||||||
|
display: none; position: fixed; top: var(--gallery-h); right: 0; bottom: 0;
|
||||||
|
width: min(26rem, 100vw); z-index: 30;
|
||||||
|
background: var(--card-bg); border-left: 1px solid var(--border);
|
||||||
|
padding: 1.25rem 1.35rem 2rem; overflow-y: auto;
|
||||||
|
}
|
||||||
|
html:has(input[name="help"]:checked):not(:has(#help-off:checked)) .help-drawer,
|
||||||
|
html:has(input[name="help"]:checked):not(:has(#help-off:checked)) .help-scrim { display: block; }
|
||||||
|
.help-pane { display: none; }
|
||||||
|
html:has(#help-index:checked) .help-pane-index,
|
||||||
|
html:has(#help-status:checked) .help-pane-status,
|
||||||
|
html:has(#help-password:checked) .help-pane-password,
|
||||||
|
html:has(#help-dns:checked) .help-pane-dns,
|
||||||
|
html:has(#help-records:checked) .help-pane-records,
|
||||||
|
html:has(#help-dmarc:checked) .help-pane-dmarc,
|
||||||
|
html:has(#help-connection:checked) .help-pane-connection,
|
||||||
|
html:has(#help-apps:checked) .help-pane-apps,
|
||||||
|
html:has(#help-domain-settings:checked) .help-pane-domain-settings,
|
||||||
|
html:has(#help-export:checked) .help-pane-export { display: block; }
|
||||||
|
.help-scrim {
|
||||||
|
display: none; position: fixed; inset: var(--gallery-h) 0 0 0; z-index: 25;
|
||||||
|
background: rgba(18, 22, 28, 0.28);
|
||||||
|
}
|
||||||
|
.help-drawer h2 { margin-top: 1.2rem; }
|
||||||
|
.help-drawer h2:first-of-type,
|
||||||
|
.help-pane h2 { margin-top: 0; }
|
||||||
|
.help-drawer .toc { list-style: none; margin: 0.7rem 0 0; padding: 0; }
|
||||||
|
.help-drawer .toc li { margin: 0.35rem 0 0; }
|
||||||
|
.help-drawer .toc label {
|
||||||
|
margin: 0; font-weight: 600; color: var(--accent-text); cursor: pointer;
|
||||||
|
}
|
||||||
|
.help-drawer .more { margin-top: 1.2rem; font-size: 0.85rem; }
|
||||||
|
.help-drawer .more label {
|
||||||
|
display: inline; margin: 0; font-weight: 600; color: var(--accent-text); cursor: pointer;
|
||||||
|
}
|
||||||
|
.help-close {
|
||||||
|
position: absolute; top: 0.8rem; right: 0.8rem; margin: 0; padding: 0.35rem 0.6rem;
|
||||||
|
font-size: 0.8rem; font-weight: 600; background: var(--surface-bg); color: var(--fg);
|
||||||
|
border: 1px solid var(--control-border); border-radius: 5px; cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Phone preview (gallery toggle) and real narrow windows */
|
||||||
|
.nav-burger { display: none; }
|
||||||
|
|
||||||
|
#vp-phone:checked ~ .app {
|
||||||
|
position: relative;
|
||||||
|
width: 390px; margin: 0.75rem auto 2rem; min-height: 760px;
|
||||||
|
border: 1px solid var(--border); border-radius: 6px; overflow: hidden;
|
||||||
|
max-height: none;
|
||||||
|
}
|
||||||
|
#vp-phone:checked ~ .app .nav {
|
||||||
|
position: absolute; top: 0; left: 0; bottom: 0;
|
||||||
|
height: auto; max-height: none;
|
||||||
|
width: min(16rem, 82%); z-index: 20;
|
||||||
|
transform: translateX(-110%);
|
||||||
|
border-right: 1px solid var(--border); background: var(--card-bg);
|
||||||
|
}
|
||||||
|
#nav-open:checked ~ .app .nav { transform: translateX(0); }
|
||||||
|
#vp-phone:checked ~ .app .phone-bar {
|
||||||
|
display: flex; align-items: center; gap: 0.55rem;
|
||||||
|
margin: 0; padding: 0.65rem 0.85rem;
|
||||||
|
border-bottom: 1px solid var(--border); background: var(--card-bg);
|
||||||
|
}
|
||||||
|
#vp-phone:checked ~ .app .nav-burger {
|
||||||
|
display: inline-flex; align-items: center; justify-content: center;
|
||||||
|
width: 2.1rem; height: 2.1rem; margin: 0; padding: 0;
|
||||||
|
border: 1px solid var(--control-border); border-radius: 5px;
|
||||||
|
background: var(--surface-bg); cursor: pointer;
|
||||||
|
}
|
||||||
|
#vp-phone:checked ~ .app .phone-mark { width: 1.7rem; height: 1.7rem; }
|
||||||
|
#vp-phone:checked ~ .app .phone-bar .grow { flex: 1; font-weight: 600; }
|
||||||
|
#vp-phone:checked ~ .app main { padding: 1.5rem 0.9rem 2rem; }
|
||||||
|
#vp-phone:checked ~ .app .desk-only { display: none !important; }
|
||||||
|
#vp-phone:checked ~ .app .phone-only { display: block; }
|
||||||
|
#vp-phone:checked ~ .app .phone-list { display: block; }
|
||||||
|
#vp-phone:checked ~ .app .status-grid { display: flex; flex-direction: column; }
|
||||||
|
#vp-phone:checked ~ .app .status-grid .attn { order: -1; }
|
||||||
|
#vp-phone:checked ~ .app .pair { grid-template-columns: 1fr; }
|
||||||
|
#vp-phone:checked ~ .app .split,
|
||||||
|
#vp-phone:checked ~ .app .check-cols,
|
||||||
|
#vp-phone:checked ~ .app .field-pair:not(.host-type),
|
||||||
|
#vp-phone:checked ~ .app .facts,
|
||||||
|
#vp-phone:checked ~ .app .retry-facts {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
#vp-phone:checked ~ .app td.subject span { max-width: none; }
|
||||||
|
#vp-phone:checked ~ .help-drawer { width: 100vw; }
|
||||||
|
|
||||||
|
.phone-only { display: none; }
|
||||||
|
|
||||||
|
@media (max-width: 52rem) {
|
||||||
|
.app { min-height: calc(100vh - var(--gallery-h)); }
|
||||||
|
.nav {
|
||||||
|
position: fixed; top: var(--gallery-h); left: 0; bottom: 0;
|
||||||
|
z-index: 20; width: min(16rem, 84vw); max-height: none;
|
||||||
|
transform: translateX(-110%);
|
||||||
|
border-right: 1px solid var(--border); background: var(--card-bg);
|
||||||
|
}
|
||||||
|
#nav-open:checked ~ .app .nav { transform: translateX(0); }
|
||||||
|
.phone-bar {
|
||||||
|
display: flex; align-items: center; gap: 0.55rem;
|
||||||
|
margin: 0; padding: 0.65rem 0.85rem;
|
||||||
|
border-bottom: 1px solid var(--border); background: var(--card-bg);
|
||||||
|
}
|
||||||
|
.nav-burger {
|
||||||
|
display: inline-flex; align-items: center; justify-content: center;
|
||||||
|
width: 2.1rem; height: 2.1rem; margin: 0; padding: 0;
|
||||||
|
border: 1px solid var(--control-border); border-radius: 5px;
|
||||||
|
background: var(--surface-bg); cursor: pointer;
|
||||||
|
}
|
||||||
|
.phone-mark { width: 1.7rem; height: 1.7rem; }
|
||||||
|
.phone-bar .grow { flex: 1; font-weight: 600; }
|
||||||
|
main { padding: 1.5rem 0.9rem 2rem; }
|
||||||
|
.desk-only { display: none !important; }
|
||||||
|
.phone-only, .phone-list { display: block; }
|
||||||
|
.status-grid { display: flex; flex-direction: column; }
|
||||||
|
.status-grid .attn { order: -1; }
|
||||||
|
.split, .pair, #settings .split, #backup > .split,
|
||||||
|
.check-cols, .field-pair:not(.host-type), .facts, .retry-facts { grid-template-columns: 1fr; }
|
||||||
|
.help-drawer { width: 100vw; }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Index page */
|
||||||
|
.wrap { max-width: 58rem; margin: 0 auto; padding: 2.5rem 1.25rem 5rem; }
|
||||||
|
.wrap > header { border-bottom: 2px solid var(--accent-fill); padding-bottom: 1.5rem; margin-bottom: 0.5rem; }
|
||||||
|
.eyebrow {
|
||||||
|
font-family: var(--font-mono); font-size: 0.72rem; letter-spacing: 0.14em;
|
||||||
|
text-transform: uppercase; color: var(--accent-text); margin: 0 0 0.7rem;
|
||||||
|
}
|
||||||
|
.wrap h1 { font-size: clamp(1.7rem, 4vw, 2.4rem); font-weight: 200; }
|
||||||
|
.wrap h1 b { font-weight: 600; }
|
||||||
|
.wrap > header p { margin: 0; max-width: 62ch; color: var(--muted); }
|
||||||
|
.wrap section { border-bottom: 1px solid var(--border); padding: 2.2rem 0; }
|
||||||
|
.wrap h2 {
|
||||||
|
font-size: 0.8rem; font-weight: 500; margin: 0 0 1.1rem;
|
||||||
|
letter-spacing: 0.1em; text-transform: uppercase; font-family: var(--font-mono); color: var(--muted);
|
||||||
|
}
|
||||||
|
.wrap h3 { font-size: 1.05rem; font-weight: 600; margin: 1.2rem 0 0.4rem; }
|
||||||
|
.note {
|
||||||
|
background: #f1eae4; border-left: 2px solid var(--accent-fill);
|
||||||
|
padding: 0.9rem 1rem; font-size: 0.92rem; line-height: 1.6; max-width: 64ch; margin-top: 1rem;
|
||||||
|
}
|
||||||
|
#theme-dark:checked ~ .doc .note { background: #2a1f1b; }
|
||||||
|
.compare {
|
||||||
|
display: grid; grid-template-columns: 1fr; gap: 0.75rem; margin-top: 0.8rem;
|
||||||
|
}
|
||||||
|
.compare .row {
|
||||||
|
font-family: var(--font-mono); font-size: 0.75rem; color: var(--muted);
|
||||||
|
}
|
||||||
|
.bar {
|
||||||
|
display: flex; height: 2.1rem; border: 1px solid var(--border); border-radius: 4px; overflow: hidden; background: var(--card-bg);
|
||||||
|
}
|
||||||
|
.bar i { display: flex; align-items: center; justify-content: center; font-style: normal; font-size: 0.7rem; }
|
||||||
|
.bar .navc { width: 14%; background: var(--surface-bg); color: var(--fg); border-right: 1px solid var(--border); }
|
||||||
|
.bar .col { background: var(--nav-active-bg); color: var(--accent-text); }
|
||||||
|
.bar .empty { flex: 1; background: var(--code-bg); color: var(--muted); }
|
||||||
|
.bar .fill { flex: 1; background: var(--st-ok-bg); color: var(--st-ok-fg); }
|
||||||
|
.ia { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; }
|
||||||
|
@media (max-width: 40rem) { .ia { grid-template-columns: 1fr; } }
|
||||||
|
.ia ul { margin: 0.3rem 0 0; padding-left: 1.1rem; }
|
||||||
|
.ia li { margin: 0.2rem 0; }
|
||||||
|
.screen-index { display: grid; grid-template-columns: repeat(auto-fit, minmax(16rem, 1fr)); gap: 0.4rem 1.5rem; }
|
||||||
|
.screen-index a { display: block; padding: 0.25rem 0; }
|
||||||
|
.icons-row { display: flex; flex-wrap: wrap; gap: 1.2rem; align-items: end; margin-top: 0.8rem; }
|
||||||
|
.icon-card {
|
||||||
|
background: var(--card-bg); border: 1px solid var(--border); border-radius: 6px;
|
||||||
|
padding: 1rem 1.1rem 0.85rem; text-align: center; min-width: 7.5rem;
|
||||||
|
}
|
||||||
|
.icon-card svg { width: 1.5rem; height: 1.5rem; display: block; margin: 0 auto 0.45rem; }
|
||||||
|
.icon-card span { display: block; font-family: var(--font-mono); font-size: 0.7rem; color: var(--muted); }
|
||||||
|
.mark-row { display: flex; flex-wrap: wrap; gap: 1.5rem; align-items: end; }
|
||||||
|
.mark-row figure { margin: 0; }
|
||||||
|
.mark-row figcaption { font-family: var(--font-mono); font-size: 0.7rem; color: var(--muted); margin-top: 0.4rem; }
|
||||||
|
|
||||||
|
.cta {
|
||||||
|
display: inline-block; margin-top: 1rem; padding: 0.65rem 1.2rem;
|
||||||
|
background: var(--accent-fill); color: var(--on-accent); text-decoration: none;
|
||||||
|
font-weight: 600; border-radius: 5px;
|
||||||
|
}
|
||||||
|
.cta:hover { background: var(--accent-fill-hover); color: var(--on-accent); }
|
||||||
|
.cta-row { display: flex; flex-wrap: wrap; gap: 0.6rem; margin-top: 1rem; }
|
||||||
|
.cta.quiet {
|
||||||
|
background: var(--surface-bg); color: var(--accent-text); border: 1px solid var(--control-border);
|
||||||
|
}
|
||||||
|
.cta.quiet:hover { background: var(--surface-bg-hover); color: var(--accent-text); }
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Settings — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-settings" data-page="settings" data-nav="settings" data-title="Settings">
|
||||||
|
<main class="stack">
|
||||||
|
<h1>Settings</h1>
|
||||||
|
<form class="stack" action="#" onsubmit="return false">
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Panel credentials</h2>
|
||||||
|
<p class="muted">These are the credentials for this control panel only. Applications keep their own logins and passwords, which are not affected.</p>
|
||||||
|
<label>Username</label><input value="admin" autocomplete="username">
|
||||||
|
<label>Current password</label><input type="password" autocomplete="current-password">
|
||||||
|
<label>New password</label><input type="password" autocomplete="new-password">
|
||||||
|
<label>Confirm new password</label><input type="password">
|
||||||
|
<div class="actions-row"><button type="button">Save changes</button></div>
|
||||||
|
<p class="muted">Leave both new-password fields empty to change the username or DMARC address only. Changing the password signs out every other session; this one stays signed in.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card g-only">
|
||||||
|
<h2>DMARC aggregate reports</h2>
|
||||||
|
<p class="muted">Default <code>rua=</code> for every sending domain (overridable per domain). When ingest is on, this can be an address SelfPost accepts.</p>
|
||||||
|
<label>Default report address</label>
|
||||||
|
<input type="email" value="dmarc@mail.example.org">
|
||||||
|
<p class="muted">When <code>rua=</code> points at another domain, that hub must publish a report-authorisation record. <a href="dmarc.html">DMARC reports</a> in the panel.</p>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<div class="code-row"><span class="code">mail.example.org._report._dmarc.example.com</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<label>Value</label>
|
||||||
|
<div class="code-row"><span class="code">v=DMARC1;</span><button type="button" class="copy">Copy</button></div>
|
||||||
|
<label>Report authorization DNS <span class="st st-ok">ok</span></label>
|
||||||
|
<p class="muted">Published at mail.example.org._report._dmarc.example.com — aggregate reports addressed to dmarc@mail.example.org are authorised.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<div class="fill g-only">
|
||||||
|
<div class="card" id="rate-limits">
|
||||||
|
<h2>Sending rate limits</h2>
|
||||||
|
<p class="muted">Level 1 is set in Compose; restart the container to change it. Domain and application ceilings live on each domain’s page.</p>
|
||||||
|
<div class="check-cols">
|
||||||
|
<div class="check-col">
|
||||||
|
<p class="check-col-title">Level 1 — per client IP</p>
|
||||||
|
<span class="code">100 messages / 60 seconds</span>
|
||||||
|
<p class="muted"><code>RATE_LIMIT_MESSAGES_PER_IP</code> / <code>RATE_LIMIT_WINDOW_SECONDS</code>. Hard ceiling for every connecting IP; the panel cannot raise a domain or application limit above this.</p>
|
||||||
|
</div>
|
||||||
|
<div class="check-col">
|
||||||
|
<p class="check-col-title">Level 2 — domain</p>
|
||||||
|
<p class="muted">Optional ceiling for <em>all</em> senders on a domain. When unset, only level 1 applies. Must be ≤ level 1.</p>
|
||||||
|
</div>
|
||||||
|
<div class="check-col">
|
||||||
|
<p class="check-col-title">Level 2 — application</p>
|
||||||
|
<p class="muted">Optional override for trusted IPs: a ceiling strictly above the domain limit (still ≤ level 1). Those IPs skip the domain check; everyone else stays under the domain (or level 1).</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Create administrator — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-setup" data-page="setup" data-nav="setup" data-title="Create administrator" data-auth="1">
|
||||||
|
<main class="auth">
|
||||||
|
<img class="mark" src="../selfpost-stamp.svg" width="330" height="150" alt="SelfPost">
|
||||||
|
<h1>Create administrator</h1>
|
||||||
|
<div class="card">
|
||||||
|
<p class="muted">This one-time link creates the single panel administrator. After you submit, the link stops working for good.</p>
|
||||||
|
<form action="status.html">
|
||||||
|
<label>Username</label>
|
||||||
|
<input autocomplete="username">
|
||||||
|
<label>Password</label>
|
||||||
|
<input type="password" autocomplete="new-password">
|
||||||
|
<label>Confirm password</label>
|
||||||
|
<input type="password" autocomplete="new-password">
|
||||||
|
<div class="actions-row"><button type="submit">Create administrator</button></div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,276 @@
|
|||||||
|
/* Shared chrome for panel UI page mockups. Each screen is its own HTML file;
|
||||||
|
this script injects radios, gallery, nav, sprite, and the help drawer so
|
||||||
|
file:// viewing does not need a module fetch. */
|
||||||
|
(function () {
|
||||||
|
if (document.body.dataset.shell === "1") return;
|
||||||
|
document.body.dataset.shell = "1";
|
||||||
|
var main = document.querySelector("main");
|
||||||
|
if (!main) return;
|
||||||
|
|
||||||
|
var page = document.body.getAttribute("data-page") || "";
|
||||||
|
var navKey = document.body.getAttribute("data-nav") || page;
|
||||||
|
var title = document.body.getAttribute("data-title") || document.title;
|
||||||
|
var globalOnly = document.body.getAttribute("data-global-only") === "1";
|
||||||
|
|
||||||
|
document.body.insertAdjacentHTML("afterbegin",
|
||||||
|
'<input class="ctrl" type="radio" name="role" id="role-global" checked>' +
|
||||||
|
'<input class="ctrl" type="radio" name="role" id="role-domain">' +
|
||||||
|
'<input class="ctrl" type="radio" name="vp" id="vp-desktop" checked>' +
|
||||||
|
'<input class="ctrl" type="radio" name="vp" id="vp-phone">' +
|
||||||
|
'<input class="ctrl" type="radio" name="theme" id="theme-light" checked>' +
|
||||||
|
'<input class="ctrl" type="radio" name="theme" id="theme-dark">' +
|
||||||
|
'<input class="ctrl" type="checkbox" id="feat-inbound" checked>' +
|
||||||
|
'<input class="ctrl" type="checkbox" id="nav-open">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-off" checked>' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-index">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-status">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-password">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-dns">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-records">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-dmarc">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-connection">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-apps">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-domain-settings">' +
|
||||||
|
'<input class="ctrl" type="radio" name="help" id="help-export">'
|
||||||
|
);
|
||||||
|
|
||||||
|
var q = new URLSearchParams(location.search);
|
||||||
|
if (q.get("view") === "phone") document.getElementById("vp-phone").checked = true;
|
||||||
|
if (q.get("role") === "domain") document.getElementById("role-domain").checked = true;
|
||||||
|
if (q.get("theme") === "dark") document.getElementById("theme-dark").checked = true;
|
||||||
|
if (q.get("inbound") === "0") document.getElementById("feat-inbound").checked = false;
|
||||||
|
|
||||||
|
var gallery =
|
||||||
|
'<header class="gallery">' +
|
||||||
|
'<a class="brand-mini" href="index.html">Макеты</a>' +
|
||||||
|
'<div class="seg"><span>Роль</span>' +
|
||||||
|
'<label for="role-global">Global</label>' +
|
||||||
|
'<label for="role-domain">Domain-admin</label></div>' +
|
||||||
|
'<div class="seg"><span>Ширина</span>' +
|
||||||
|
'<label for="vp-desktop">Desktop</label>' +
|
||||||
|
'<label for="vp-phone">Phone</label></div>' +
|
||||||
|
'<div class="seg"><span>Тема</span>' +
|
||||||
|
'<label for="theme-light">Light</label>' +
|
||||||
|
'<label for="theme-dark">Dark</label></div>' +
|
||||||
|
'<label class="g-only" for="feat-inbound">Inbound</label>' +
|
||||||
|
'<a href="index.html">Оглавление</a>' +
|
||||||
|
'<a href="system.html">Система</a>' +
|
||||||
|
"</header>";
|
||||||
|
|
||||||
|
var sprite =
|
||||||
|
'<svg class="sprite" xmlns="http://www.w3.org/2000/svg" aria-hidden="true">' +
|
||||||
|
'<symbol id="i-status" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M1.25 8.5h2.9L6.2 3.4l3.1 9.4 1.9-4.3h3.55"/></symbol>' +
|
||||||
|
'<symbol id="i-domains" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="8" r="6.25"/><path d="M1.9 8h12.2"/><path d="M8 1.75c1.85 1.8 2.8 4 2.8 6.25S9.85 12.45 8 14.25C6.15 12.45 5.2 10.25 5.2 8S6.15 3.55 8 1.75Z"/></symbol>' +
|
||||||
|
'<symbol id="i-deliveries" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M14.25 1.75 1.6 6.6l5 2.05 2.05 5z"/><path d="M14.25 1.75 6.6 8.65"/></symbol>' +
|
||||||
|
'<symbol id="i-queue" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M1.75 9.5h3.3l1 1.75h3.9l1-1.75h3.3v3.05a1.2 1.2 0 0 1-1.2 1.2H2.95a1.2 1.2 0 0 1-1.2-1.2z"/><path d="M1.75 9.5 3.4 3.2a1.25 1.25 0 0 1 1.2-.95h6.8a1.25 1.25 0 0 1 1.2.95l1.65 6.3"/></symbol>' +
|
||||||
|
'<symbol id="i-log" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3.75 1.75h5.1l3.4 3.4v8.05a1.05 1.05 0 0 1-1.05 1.05H3.75a1.05 1.05 0 0 1-1.05-1.05V2.8a1.05 1.05 0 0 1 1.05-1.05Z"/><path d="M8.85 1.75v3.4h3.4"/><path d="M5.35 8.6h5.3M5.35 11.1h3.5"/></symbol>' +
|
||||||
|
'<symbol id="i-inbound" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M2.5 9.5h11"/><path d="M8 2.75v6.2"/><path d="M5.4 6.4 8 9.05 10.6 6.4"/><path d="M3.2 12.6h9.6"/></symbol>' +
|
||||||
|
'<symbol id="i-dmarc" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M8 1.85 2.75 3.7v4.2c0 3.15 2.15 5.2 5.25 6.25 3.1-1.05 5.25-3.1 5.25-6.25V3.7Z"/><path d="M5.4 8.05 7.15 9.8 10.7 6.2"/></symbol>' +
|
||||||
|
'<symbol id="i-backup" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2.75" y="1.75" width="10.5" height="12.5" rx="1.15"/><path d="M2.75 8h10.5"/><path d="M6.4 4.85h3.2M6.4 11.15h3.2"/></symbol>' +
|
||||||
|
'<symbol id="i-users" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M10.9 3.1a2.1 2.1 0 0 1 0 4.2"/><path d="M14.7 14.25a3.8 3.8 0 0 0-3.9-3.65"/><circle cx="5.5" cy="5.2" r="2.5"/><path d="M1.4 14.25a4.8 4.8 0 0 1 8.2 0"/></symbol>' +
|
||||||
|
'<symbol id="i-help" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="8" r="6.25"/><path d="M8 7.2V11.4"/><path d="M8 5.05v.01"/></symbol>' +
|
||||||
|
'<symbol id="i-settings" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.25" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06A1.65 1.65 0 0 0 4.68 15a1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06A1.65 1.65 0 0 0 9 4.68a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06A1.65 1.65 0 0 0 19.4 9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/></symbol>' +
|
||||||
|
'<symbol id="i-account" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="8" cy="5.4" r="2.75"/><path d="M2.9 14.25a5.1 5.1 0 0 1 10.2 0"/></symbol>' +
|
||||||
|
'<symbol id="i-out" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M6.1 14.25H3.65a1.15 1.15 0 0 1-1.15-1.15V2.9a1.15 1.15 0 0 1 1.15-1.15H6.1"/><path d="M10.6 11.15 13.75 8 10.6 4.85"/><path d="M13.75 8H6.35"/></symbol>' +
|
||||||
|
'<symbol id="i-menu" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"><path d="M2.5 4h11M2.5 8h11M2.5 12h11"/></symbol>' +
|
||||||
|
"</svg>";
|
||||||
|
|
||||||
|
function icon(id) {
|
||||||
|
return '<svg class="icon"><use href="#' + id + '"/></svg>';
|
||||||
|
}
|
||||||
|
|
||||||
|
var navHtml =
|
||||||
|
'<nav class="nav">' +
|
||||||
|
'<a class="brand" href="status.html"><img src="../selfpost-stamp-compact.svg" width="220" height="100" alt="SelfPost"></a>' +
|
||||||
|
'<div class="links">' +
|
||||||
|
'<a class="n-status g-only" href="status.html">' + icon("i-status") + "Status</a>" +
|
||||||
|
'<a class="n-domains" href="domains.html">' + icon("i-domains") + "Domains</a>" +
|
||||||
|
'<a class="n-deliveries" href="deliveries.html">' + icon("i-deliveries") + "Deliveries</a>" +
|
||||||
|
'<a class="n-queue g-only" href="mail-queue.html">' + icon("i-queue") + "Mail queue</a>" +
|
||||||
|
'<a class="n-log g-only" href="system-log.html">' + icon("i-log") + "System log</a>" +
|
||||||
|
'<a class="n-inbound g-only in-only" href="inbound.html">' + icon("i-inbound") + "Inbound</a>" +
|
||||||
|
'<a class="n-dmarc g-only" href="dmarc.html">' + icon("i-dmarc") + 'DMARC <span class="tag future">1.x</span></a>' +
|
||||||
|
'<a class="n-backup g-only" href="backup.html">' + icon("i-backup") + "Backup</a>" +
|
||||||
|
'<a class="n-users g-only" href="users.html">' + icon("i-users") + "Users</a>" +
|
||||||
|
'<a class="n-help" href="help.html">' + icon("i-help") + 'Help <span class="tag future">1.x</span></a>' +
|
||||||
|
"</div>" +
|
||||||
|
'<div class="session">' +
|
||||||
|
'<span class="session-user muted">' + icon("i-account") + "User: admin</span>" +
|
||||||
|
'<a class="n-settings" href="settings.html">' + icon("i-settings") + "Settings</a>" +
|
||||||
|
'<a class="btn-ghost" href="login.html">' + icon("i-out") + "Sign out</a>" +
|
||||||
|
"</div>" +
|
||||||
|
"</nav>";
|
||||||
|
|
||||||
|
var phone =
|
||||||
|
'<div class="phone-bar">' +
|
||||||
|
'<label class="nav-burger" for="nav-open" title="Menu">' + icon("i-menu") + "</label>" +
|
||||||
|
'<img class="phone-mark" src="../selfpost-icon.svg" width="28" height="28" alt="">' +
|
||||||
|
'<span class="grow phone-title"></span>' +
|
||||||
|
'<label class="help-link" for="help-index" title="Help">?</label>' +
|
||||||
|
"</div>";
|
||||||
|
|
||||||
|
var help =
|
||||||
|
'<label class="help-scrim" for="help-off"></label>' +
|
||||||
|
'<aside class="help-drawer">' +
|
||||||
|
'<label class="help-close" for="help-off">Close</label>' +
|
||||||
|
'<article class="help-pane help-pane-index">' +
|
||||||
|
"<h2>Help</h2>" +
|
||||||
|
"<p>Short notes for the card you opened — not a second copy of the guide.</p>" +
|
||||||
|
'<p class="muted">Status</p>' +
|
||||||
|
'<ul class="toc"><li><label for="help-status">Status checks</label></li></ul>' +
|
||||||
|
'<p class="muted">Domain</p>' +
|
||||||
|
'<ul class="toc">' +
|
||||||
|
'<li><label for="help-password">New application password</label></li>' +
|
||||||
|
'<li><label for="help-dns">DNS status</label></li>' +
|
||||||
|
'<li><label for="help-records">DKIM and SPF records</label></li>' +
|
||||||
|
'<li><label for="help-dmarc">DMARC record</label></li>' +
|
||||||
|
'<li><label for="help-connection">Connection settings</label></li>' +
|
||||||
|
'<li><label for="help-apps">Applications</label></li>' +
|
||||||
|
'<li><label for="help-domain-settings">Domain settings</label></li>' +
|
||||||
|
'<li><label for="help-export">Export domain</label></li>' +
|
||||||
|
"</ul></article>" +
|
||||||
|
'<article class="help-pane help-pane-status">' +
|
||||||
|
"<h2>Status checks</h2>" +
|
||||||
|
"<p>The cards keep the readings. This drawer is what used to sit under them as paragraphs.</p>" +
|
||||||
|
"<h2>Machine</h2>" +
|
||||||
|
"<p>CPU and memory are the container’s readings. Network is a short rate window. These numbers explain load; they do not replace the queue.</p>" +
|
||||||
|
"<h2>TLS certificate</h2>" +
|
||||||
|
"<p>Presented on port 465. Issued and renewed outside SelfPost. Warn = expires soon; error = missing, and submission will fail.</p>" +
|
||||||
|
"<h2>Hostname / reverse DNS</h2>" +
|
||||||
|
"<p>The hostname must forward to this IP and the PTR must come back to the same name. Set PTR at the provider.</p>" +
|
||||||
|
"<h2>Mail queue</h2>" +
|
||||||
|
"<p>Deferred mail is retried on a time schedule (first delay, doubling cap, queue lifetime). There is no “attempt 3 of N”.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-password">' +
|
||||||
|
"<h2>New application password</h2>" +
|
||||||
|
"<p>Shown <strong>once only</strong> and not stored. Copy it now — if it is lost, regenerate a new one. The previous password stops working immediately.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-dns">' +
|
||||||
|
"<h2>DNS status</h2>" +
|
||||||
|
"<p>The badge is the worst of DKIM, SPF and DMARC. Results are cached a few minutes — use <em>Re-check</em> after publishing.</p>" +
|
||||||
|
"<p>SPF is a shallow check: the literal address only, no <code>include:</code> or <code>redirect=</code>. Report authorization is required only when <code>rua=</code> points at a domain this server does not accept.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-records">' +
|
||||||
|
"<h2>DKIM and SPF records</h2>" +
|
||||||
|
"<p>DKIM is not a secret. The selector on this page is the one this server signs with. Merge the SPF example into an existing record if the domain already has one — do not publish a second TXT.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-dmarc">' +
|
||||||
|
"<h2>DMARC record</h2>" +
|
||||||
|
"<p><code>p=none</code> does not affect delivery. Tighten to <code>p=quarantine</code> then <code>p=reject</code> once reports look clean. The report address is set under Domain settings (or the Settings default).</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-connection">' +
|
||||||
|
"<h2>Connection settings</h2>" +
|
||||||
|
"<p>Same host for every domain. Authenticate with an application login from this page. Auth is required on every port. The password is shown once at create or regenerate.</p>" +
|
||||||
|
"<p>465 is implicit TLS; 587 is STARTTLS submission when that port is enabled.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-apps">' +
|
||||||
|
"<h2>Applications</h2>" +
|
||||||
|
"<p>SASL logins for this domain. Login is unique across domains; letters, digits, <code>.</code>, <code>-</code> and <code>_</code>. The password is shown once.</p>" +
|
||||||
|
"<p>Address mode is which From addresses this application may use: any address of the domain, or a fixed list. A trusted-IP override gives those clients a higher ceiling than the domain (still ≤ level 1) and skips the domain check; everyone else uses the domain limit if set, otherwise level 1.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-domain-settings">' +
|
||||||
|
"<h2>Domain settings</h2>" +
|
||||||
|
"<p>Aggregate reports (<code>rua=</code>) inherit the Settings default, or you override them per domain. Level 2 is an optional ceiling for all senders on this domain; it must be ≤ level 1. Application overrides live on each application.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
'<article class="help-pane help-pane-export">' +
|
||||||
|
"<h2>Export domain</h2>" +
|
||||||
|
"<p>The file is a secret: it carries the DKIM key and application passwords, so published DNS does not have to change on the other instance. Transfer it securely, or encrypt it as <code>.spde</code>.</p>" +
|
||||||
|
'<p class="more muted"><label for="help-index">All topics</label></p></article>' +
|
||||||
|
"</aside>";
|
||||||
|
|
||||||
|
var app = document.createElement("div");
|
||||||
|
app.className = "app";
|
||||||
|
app.innerHTML = navHtml + '<div class="stage">' + phone + "</div>";
|
||||||
|
main.parentNode.insertBefore(app, main);
|
||||||
|
app.insertAdjacentHTML("beforebegin", gallery + sprite);
|
||||||
|
app.querySelector(".stage").appendChild(main);
|
||||||
|
app.insertAdjacentHTML("afterend", help);
|
||||||
|
|
||||||
|
var cur = app.querySelector(".n-" + navKey);
|
||||||
|
if (cur) cur.setAttribute("aria-current", "page");
|
||||||
|
var grow = app.querySelector(".phone-title");
|
||||||
|
if (grow) grow.textContent = title;
|
||||||
|
|
||||||
|
var skip = { "index.html": 1, "system.html": 1, "app.html": 1 };
|
||||||
|
|
||||||
|
function qs() {
|
||||||
|
var p = new URLSearchParams();
|
||||||
|
if (document.getElementById("vp-phone").checked) p.set("view", "phone");
|
||||||
|
if (document.getElementById("role-domain").checked) p.set("role", "domain");
|
||||||
|
if (document.getElementById("theme-dark").checked) p.set("theme", "dark");
|
||||||
|
if (!document.getElementById("feat-inbound").checked) p.set("inbound", "0");
|
||||||
|
var s = p.toString();
|
||||||
|
return s ? "?" + s : "";
|
||||||
|
}
|
||||||
|
|
||||||
|
function withQuery(href) {
|
||||||
|
if (!href) return href;
|
||||||
|
if (href.charAt(0) === "#" || /^(https?:|mailto:|javascript:)/i.test(href)) return href;
|
||||||
|
var hash = "";
|
||||||
|
var path = href;
|
||||||
|
var hashAt = href.indexOf("#");
|
||||||
|
if (hashAt >= 0) {
|
||||||
|
hash = href.slice(hashAt);
|
||||||
|
path = href.slice(0, hashAt);
|
||||||
|
}
|
||||||
|
var qAt = path.indexOf("?");
|
||||||
|
var file = qAt >= 0 ? path.slice(0, qAt) : path;
|
||||||
|
var extra = qAt >= 0 ? path.slice(qAt + 1) : "";
|
||||||
|
var base = file.split("/").pop();
|
||||||
|
if (!base || !/\.html$/i.test(base) || skip[base]) return href;
|
||||||
|
var p = new URLSearchParams(extra);
|
||||||
|
var curQs = new URLSearchParams(qs().replace(/^\?/, ""));
|
||||||
|
["view", "role", "theme", "inbound"].forEach(function (k) {
|
||||||
|
if (curQs.has(k)) p.set(k, curQs.get(k));
|
||||||
|
else p.delete(k);
|
||||||
|
});
|
||||||
|
var s = p.toString();
|
||||||
|
return base + (s ? "?" + s : "") + hash;
|
||||||
|
}
|
||||||
|
|
||||||
|
function rewriteLinks() {
|
||||||
|
document.querySelectorAll("a[href]").forEach(function (a) {
|
||||||
|
var raw = a.getAttribute("href");
|
||||||
|
if (!raw) return;
|
||||||
|
a.setAttribute("href", withQuery(raw));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function brandHref() {
|
||||||
|
var brand = document.querySelector(".nav .brand");
|
||||||
|
if (!brand) return;
|
||||||
|
brand.setAttribute("href", withQuery(
|
||||||
|
document.getElementById("role-domain").checked ? "domains.html" : "status.html"
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
function gate() {
|
||||||
|
brandHref();
|
||||||
|
if (!document.getElementById("role-domain").checked) return;
|
||||||
|
if (globalOnly) location.replace(withQuery("domains.html"));
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncUrl() {
|
||||||
|
if (history.replaceState) {
|
||||||
|
history.replaceState(null, "", location.pathname.split("/").pop() + qs() + location.hash);
|
||||||
|
}
|
||||||
|
rewriteLinks();
|
||||||
|
brandHref();
|
||||||
|
gate();
|
||||||
|
}
|
||||||
|
|
||||||
|
["role-global", "role-domain", "vp-desktop", "vp-phone", "theme-light", "theme-dark", "feat-inbound"].forEach(function (id) {
|
||||||
|
var el = document.getElementById(id);
|
||||||
|
if (el) el.addEventListener("change", syncUrl);
|
||||||
|
});
|
||||||
|
|
||||||
|
document.querySelectorAll(".nav a").forEach(function (a) {
|
||||||
|
a.addEventListener("click", function () {
|
||||||
|
var open = document.getElementById("nav-open");
|
||||||
|
if (open) open.checked = false;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
rewriteLinks();
|
||||||
|
gate();
|
||||||
|
})();
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Status — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-status" data-page="status" data-nav="status" data-title="Status" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div class="page-head">
|
||||||
|
<h1>Status</h1>
|
||||||
|
<label class="help-link" for="help-status" title="What these checks mean">?</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card" id="overall">
|
||||||
|
<h2>Overall <span class="st st-warn">warn</span></h2>
|
||||||
|
<p class="muted">Running, with warnings below.</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card attn" id="queue">
|
||||||
|
<h2>Mail queue <span class="st st-warn">warn</span></h2>
|
||||||
|
<p>3 Kbytes in 3 Requests.</p>
|
||||||
|
<div class="actions-row"><a class="btn" href="mail-queue.html">View queue</a></div>
|
||||||
|
</div>
|
||||||
|
<div class="card" id="certificate">
|
||||||
|
<h2>TLS certificate <span class="st st-ok">ok</span></h2>
|
||||||
|
<label>Expires</label>
|
||||||
|
<span class="code">2026-11-02 12:00 UTC</span>
|
||||||
|
<p class="muted">Valid for another 78 day(s).</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card" id="sockets">
|
||||||
|
<h2>Milter sockets <span class="st st-ok">ok</span></h2>
|
||||||
|
<table>
|
||||||
|
<thead><tr><th>Milter</th><th>State</th><th>Detail</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr><td>OpenDKIM</td><td><span class="st st-ok">ok</span></td><td class="muted">Listening</td></tr>
|
||||||
|
<tr><td>send-log</td><td><span class="st st-ok">ok</span></td><td class="muted">Listening</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="card" id="hostname">
|
||||||
|
<h2>Hostname and reverse DNS <span class="st st-ok">ok</span></h2>
|
||||||
|
<label>Server hostname</label>
|
||||||
|
<span class="code">mail.example.org</span>
|
||||||
|
<label>Forward and reverse lookup</label>
|
||||||
|
<span class="code">203.0.113.10 → mail.example.org</span>
|
||||||
|
<p class="muted">mail.example.org resolves to 203.0.113.10 and the reverse lookup points back at it.</p>
|
||||||
|
<div class="actions-row"><button type="button">Re-check DNS</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fill in-only" id="inbound-status">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Inbound <span class="st st-warn">warn</span></h2>
|
||||||
|
<p><code>INBOUND_RELAY_ENABLE</code> is on. Port 25 accepts mail for 2 domains and forwards it upstream — not to local mailboxes.</p>
|
||||||
|
<p class="muted">One domain has no MX pointing at this server. Recipients are a list or any address at the domain. Open Inbound for the list, MX checks, upstream, and recipient maps.</p>
|
||||||
|
<p><a href="inbound.html">Inbound domains</a></p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card" id="machine">
|
||||||
|
<h2>Machine <span class="st st-ok">ok</span></h2>
|
||||||
|
<table>
|
||||||
|
<thead><tr><th class="metric">Resource</th><th>Usage</th><th>Detail</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="metric">CPU</td>
|
||||||
|
<td class="metric"><meter value="12" min="0" max="100" low="70" high="90" optimum="10">12%</meter> 12%</td>
|
||||||
|
<td class="muted">4 cores · 4 threads</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="metric">Memory</td>
|
||||||
|
<td class="metric"><meter value="41" min="0" max="100" low="70" high="90" optimum="10">41%</meter> 41%</td>
|
||||||
|
<td class="muted">1.6 GiB used of 4.0 GiB.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td class="metric">Network</td>
|
||||||
|
<td class="metric">↓ 2.0 KiB/s<br>↑ 1.0 KiB/s</td>
|
||||||
|
<td class="muted"><div>eth0: 1.0 MiB in, 512.0 KiB out</div></td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div class="card" id="processes">
|
||||||
|
<h2>Processes <span class="st st-ok">ok</span></h2>
|
||||||
|
<table>
|
||||||
|
<thead><tr><th>Program</th><th>State</th><th>Detail</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr><td>opendkim</td><td><span class="st st-ok">RUNNING</span></td><td class="muted">pid 21, uptime 3 days, 4:12:01</td></tr>
|
||||||
|
<tr><td>panel</td><td><span class="st st-ok">RUNNING</span></td><td class="muted">pid 18, uptime 3 days, 4:12:03</td></tr>
|
||||||
|
<tr><td>postfix</td><td><span class="st st-ok">RUNNING</span></td><td class="muted">pid 42, uptime 3 days, 4:11:58</td></tr>
|
||||||
|
<tr><td>postfix-reload</td><td><span class="st st-ok">STOPPED</span></td><td class="muted">Not started</td></tr>
|
||||||
|
<tr><td>cert-reload</td><td><span class="st st-ok">STOPPED</span></td><td class="muted">Not started</td></tr>
|
||||||
|
<tr><td>logrotate</td><td><span class="st st-ok">STOPPED</span></td><td class="muted">Not started</td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card" id="configuration">
|
||||||
|
<h2>Configuration</h2>
|
||||||
|
<p class="muted">Regenerates the OpenDKIM and Postfix configuration from the
|
||||||
|
database and reloads both daemons. Use it if you edited the files by hand,
|
||||||
|
restored a backup, or the running configuration looks out of step with the
|
||||||
|
domain and application lists. It does not touch the mail queue or the TLS
|
||||||
|
certificate, and it is safe to run at any time.</p>
|
||||||
|
<div class="actions-row"><button type="button">Reload configuration</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p class="version">SelfPost 1.2.3 · © Mixeme · <a href="#">License (AGPL-3.0)</a></p>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>System log — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-system-log" data-page="system-log" data-nav="log" data-title="System log" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<h1>System log</h1>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Recent log entries</h2>
|
||||||
|
<span class="code">Aug 15 20:14:08 mail postfix/smtp[230]: 4C3A1E2F1A: to=<ada@example.net>, relay=mx.example.net[198.51.100.20]:25, delay=6, delays=0.2/0.1/0.4/5.3, dsn=4.2.1, status=deferred (450 4.2.1 mailbox busy)
|
||||||
|
Aug 15 20:14:02 mail postfix/qmgr[119]: 4C3A1E2F1A: from=<billing@example.com>, size=12288, nrcpt=1 (queue active)
|
||||||
|
Aug 15 20:14:02 mail postfix/smtpd[221]: 4C3A1E2F1A: client=203.0.113.40[203.0.113.40], sasl_method=PLAIN, sasl_username=billing
|
||||||
|
Aug 15 20:11:40 mail postfix/smtp[228]: 4B19D0AA01: to=<list-bounces@example.net>, relay=mx.example.net[198.51.100.20]:25, delay=0.9, status=sent (250 2.0.0 Ok)
|
||||||
|
Aug 15 20:02:11 mail postfix/smtp[226]: 4B19C0BB12: to=<noreply@blocked.example>, status=bounced (host mx.blocked.example[203.0.113.99] said: 550 5.7.1 rejected)</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
/* Panel UI system primitives.
|
||||||
|
Source of truth: system.html. Screens are separate HTML files composed from
|
||||||
|
these classes. Do not “fix” empty columns, Host/Type height, or split
|
||||||
|
actions by one-off rules — compose with these instead. */
|
||||||
|
|
||||||
|
.stack {
|
||||||
|
display: flex; flex-direction: column; gap: 1rem;
|
||||||
|
width: 100%; min-width: 0;
|
||||||
|
}
|
||||||
|
.stack > .card,
|
||||||
|
.stack > .pair,
|
||||||
|
.stack > .measure,
|
||||||
|
.stack > .fill { margin-top: 0; }
|
||||||
|
.stack > .card + .card { margin-top: 0; }
|
||||||
|
|
||||||
|
.measure { width: 100%; max-width: var(--form-max); min-width: 0; }
|
||||||
|
|
||||||
|
.fill { width: 100%; max-width: var(--ops-max); min-width: 0; }
|
||||||
|
.fill > .card { margin-top: 0; }
|
||||||
|
.fill .card:has(table) { overflow-x: auto; }
|
||||||
|
.card > .measure { margin-bottom: 1rem; }
|
||||||
|
|
||||||
|
/* Two peer jobs. One child → reading measure (domain-admin Settings).
|
||||||
|
Never a full-width lonely card on an ops page. */
|
||||||
|
.pair {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);
|
||||||
|
gap: 1rem;
|
||||||
|
width: 100%; max-width: var(--ops-max); min-width: 0;
|
||||||
|
}
|
||||||
|
.pair > * { min-width: 0; }
|
||||||
|
.card > .stack { min-width: 0; }
|
||||||
|
.pair > .card { margin-top: 0; }
|
||||||
|
.pair > .card + .card { margin-top: 0; }
|
||||||
|
.pair:has(> :only-child) {
|
||||||
|
display: block;
|
||||||
|
max-width: var(--form-max);
|
||||||
|
}
|
||||||
|
|
||||||
|
.actions-row {
|
||||||
|
display: flex; flex-wrap: wrap; gap: 0.6rem; align-items: center;
|
||||||
|
margin-top: 1.1rem;
|
||||||
|
}
|
||||||
|
.actions-row > button,
|
||||||
|
.actions-row > a.btn,
|
||||||
|
.actions-row > a.danger { margin-top: 0; }
|
||||||
|
|
||||||
|
/* Two labelled controls on one row. Labels share row 1, values share row 2
|
||||||
|
so they are the same height by construction — not by matching padding. */
|
||||||
|
.field-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) auto;
|
||||||
|
grid-template-rows: auto minmax(2.5rem, auto);
|
||||||
|
column-gap: 1rem;
|
||||||
|
align-items: stretch;
|
||||||
|
margin-top: 0.45rem;
|
||||||
|
}
|
||||||
|
.field-row.equal { grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); }
|
||||||
|
.field-row > .field { display: contents; }
|
||||||
|
.field-row > .field:first-child > * { grid-column: 1; }
|
||||||
|
.field-row > .field:last-child > * { grid-column: 2; }
|
||||||
|
.field-row > .field > label { grid-row: 1; margin-top: 0.45rem; }
|
||||||
|
.field-row > .field > :not(label) {
|
||||||
|
grid-row: 2; align-self: stretch; min-width: 0;
|
||||||
|
margin-top: 0.3rem; box-sizing: border-box;
|
||||||
|
}
|
||||||
|
.field-row > .field > .code,
|
||||||
|
.field-row > .field > .code-row {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
.field-row > .field > .code {
|
||||||
|
display: flex; align-items: center;
|
||||||
|
padding-top: 0.45rem; padding-bottom: 0.45rem;
|
||||||
|
}
|
||||||
|
.field-row > .field:last-child > .code {
|
||||||
|
width: fit-content; min-width: 2.75rem;
|
||||||
|
justify-content: center; text-align: center;
|
||||||
|
}
|
||||||
|
.field-row .code-row {
|
||||||
|
display: flex; align-items: stretch; gap: 0.5rem; height: 100%;
|
||||||
|
}
|
||||||
|
.field-row .code-row .code {
|
||||||
|
flex: 1; min-width: 0; margin-top: 0; height: auto;
|
||||||
|
display: flex; align-items: center;
|
||||||
|
padding-top: 0.45rem; padding-bottom: 0.45rem;
|
||||||
|
}
|
||||||
|
.field-row .code-row .copy { margin-top: 0; align-self: stretch; }
|
||||||
|
|
||||||
|
.card-head {
|
||||||
|
display: flex; align-items: center; justify-content: space-between; gap: 0.5rem;
|
||||||
|
margin-bottom: 0.5rem;
|
||||||
|
}
|
||||||
|
.card-head h2 { margin: 0; }
|
||||||
|
|
||||||
|
@media (max-width: 52rem) {
|
||||||
|
.pair { grid-template-columns: 1fr; }
|
||||||
|
/* field-row stays two columns: Type is a token, not a second form. */
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Specimens on the system page */
|
||||||
|
.sys-wrap { max-width: 70rem; }
|
||||||
|
.sys-wrap > header p,
|
||||||
|
.sys-wrap section > p,
|
||||||
|
.sys-wrap li { max-width: 68ch; }
|
||||||
|
.sys-toc {
|
||||||
|
display: flex; flex-wrap: wrap; gap: 0.35rem 1.1rem;
|
||||||
|
margin: 1rem 0 0; padding: 0; list-style: none;
|
||||||
|
}
|
||||||
|
.sys-toc a { font-size: 0.92rem; }
|
||||||
|
.specimen {
|
||||||
|
margin: 1rem 0 0; padding: 0.9rem 1rem 1.1rem;
|
||||||
|
border: 1px dashed var(--border); border-radius: 6px; background: var(--code-bg);
|
||||||
|
}
|
||||||
|
.specimen > figcaption {
|
||||||
|
font-family: var(--font-mono); font-size: 0.72rem; letter-spacing: 0.08em;
|
||||||
|
text-transform: uppercase; color: var(--muted); margin: 0 0 0.7rem;
|
||||||
|
}
|
||||||
|
.specimen.bad {
|
||||||
|
border-color: var(--danger-border); background: var(--danger-bg);
|
||||||
|
}
|
||||||
|
.specimen.bad > figcaption { color: var(--danger-fg); }
|
||||||
|
.recipes {
|
||||||
|
width: 100%; margin-top: 0.8rem; font-size: 0.92rem;
|
||||||
|
}
|
||||||
|
.recipes th, .recipes td { white-space: normal; vertical-align: top; }
|
||||||
|
.recipes code { font-size: 0.82rem; }
|
||||||
|
.forbid { margin: 0.4rem 0 0; padding-left: 1.1rem; }
|
||||||
|
.forbid li { margin: 0.35rem 0; }
|
||||||
@@ -0,0 +1,298 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="ru">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>SelfPost — система панели</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="doc">
|
||||||
|
<div class="wrap sys-wrap">
|
||||||
|
|
||||||
|
<header>
|
||||||
|
<p class="eyebrow">система · не рескин</p>
|
||||||
|
<h1>Self<b>Post</b> — грамматика интерфейса</h1>
|
||||||
|
<p>Это проект системы. Экраны складываются из регионов и контролов. Запрещённые состояния нельзя «починить паддингом» — их не из чего собрать. Знак, кирпич и IBM Plex не меняются. Живая панель (<code>internal/web</code>) пока не трогается.</p>
|
||||||
|
<div class="cta-row">
|
||||||
|
<a class="cta" href="#regions">Регионы</a>
|
||||||
|
<a class="cta quiet" href="#controls">Контролы</a>
|
||||||
|
<a class="cta quiet" href="#recipes">Экраны</a>
|
||||||
|
<a class="cta quiet" href="status.html">Макеты экранов</a>
|
||||||
|
</div>
|
||||||
|
<ul class="sys-toc">
|
||||||
|
<li><a href="#why">Зачем</a></li>
|
||||||
|
<li><a href="#regions">Регионы</a></li>
|
||||||
|
<li><a href="#card">Карточка</a></li>
|
||||||
|
<li><a href="#controls">Контролы</a></li>
|
||||||
|
<li><a href="#actions">Действия</a></li>
|
||||||
|
<li><a href="#forbid">Нельзя</a></li>
|
||||||
|
<li><a href="#recipes">Рецепты экранов</a></li>
|
||||||
|
<li><a href="#phone">Телефон</a></li>
|
||||||
|
<li><a href="#apply">Как внедрять</a></li>
|
||||||
|
</ul>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<section id="why">
|
||||||
|
<h2>Зачем</h2>
|
||||||
|
<p>Первый макет скопировал грамматику живой панели: страница помечается <code>ops</code> или <code>form</code>, карточки стопкой, пара полей — два независимых <code>.code</code>, Save внутри <code><form></code>, Delete снаружи. Дальше каждая мелочь чинилась отдельно — как в <code>panel.css</code> годами. Новый интерфейс должен <strong>не давать собрать</strong> пустую колонку, разные высоты Host/Type и кнопки на двух строках.</p>
|
||||||
|
<p>Три оси, которые больше не выбираются «на глаз» у каждой страницы:</p>
|
||||||
|
<ol>
|
||||||
|
<li><strong>Регион</strong> — как блок занимает ширину окна.</li>
|
||||||
|
<li><strong>Карточка</strong> — заголовок, справка, тело, действия.</li>
|
||||||
|
<li><strong>Контрол</strong> — одно поле или пара полей одной высоты.</li>
|
||||||
|
</ol>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="regions">
|
||||||
|
<h2>Регионы</h2>
|
||||||
|
<p>Страница — это <code>stack</code> регионов, не класс на <code><main></code>. Оболочка одна: навбар прижат влево, контент забирает остаток. Навбар не прыгает, когда меняется содержимое.</p>
|
||||||
|
<table class="recipes">
|
||||||
|
<thead><tr><th>Регион</th><th>Ширина</th><th>Когда</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td><code>measure</code></td>
|
||||||
|
<td>до 42rem, влево</td>
|
||||||
|
<td>Одна читаемая форма: login, setup, подтверждение удаления, форма пользователя. Не «вся страница Settings».</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>pair</code></td>
|
||||||
|
<td>две колонки до 90rem</td>
|
||||||
|
<td>Две равноправные задачи на одном экране. Один ребёнок — сам сжимается в <code>measure</code> (domain-admin без DMARC).</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>fill</code></td>
|
||||||
|
<td>до 90rem</td>
|
||||||
|
<td>Таблица, лог, DNS-статус, список приложений. Ячейки не переносят однострочные значения; карточка скроллится по X.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><code>stack</code></td>
|
||||||
|
<td>колонка с зазором</td>
|
||||||
|
<td>Вертикальный порядок регионов. Зазор даёт <code>gap</code>, не <code>.card + .card</code>.</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
|
||||||
|
<figure class="specimen bad">
|
||||||
|
<figcaption>Нельзя — страница-форма, две задачи стопкой</figcaption>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Full backup</h2>
|
||||||
|
<p class="muted">Карточка узкая. Справа пустое поле на 1600px.</p>
|
||||||
|
<button type="button">Download</button>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Import a domain</h2>
|
||||||
|
<p class="muted">Вторая задача под первой — та же пустота.</p>
|
||||||
|
<button type="button">Import</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</figure>
|
||||||
|
|
||||||
|
<figure class="specimen">
|
||||||
|
<figcaption>Надо — pair</figcaption>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Full backup</h2>
|
||||||
|
<p class="muted">Секрет. Шифрование — внутри карточки, поля не растягиваются на 1440px.</p>
|
||||||
|
<div class="actions-row"><button type="button">Download full backup</button></div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Import a domain</h2>
|
||||||
|
<p class="muted">Тот же экран, вторая задача. Не «ещё одна форма ниже».</p>
|
||||||
|
<div class="actions-row"><button type="button">Import domain</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</figure>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="card">
|
||||||
|
<h2>Карточка</h2>
|
||||||
|
<p>Один хром: <code>card-head</code> (заголовок + слот «?»), тело, при необходимости <code>actions-row</code>. Справка — часть хрома, её не расставляют после того, как карточки уже собраны. Нет «?» — слот пустой, заголовки соседних карточек всё равно на одной линии.</p>
|
||||||
|
<p>Показания (очередь, PTR, CPU) остаются на карточке. В drawer уходит только то, чего на карточке быть не должно: что такое kernel counter, зачем PTR у провайдера, почему пароль показывают один раз.</p>
|
||||||
|
<figure class="specimen">
|
||||||
|
<figcaption>Хром карточки</figcaption>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>DNS status <span class="st st-ok">ok</span></h2>
|
||||||
|
<span class="help-link" title="What these checks mean">?</span>
|
||||||
|
</div>
|
||||||
|
<p class="muted">Чтение и Re-check здесь. Абзац «зачем MX» — в справке.</p>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<div class="card-head">
|
||||||
|
<h2>Danger zone</h2>
|
||||||
|
</div>
|
||||||
|
<p class="muted">Без «?»: действие очевидное. Карточка всё равно пара к форме, не на всю ширину.</p>
|
||||||
|
<div class="actions-row"><a class="danger" href="#forbid">Delete inbound domain</a></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</figure>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="controls">
|
||||||
|
<h2>Контролы</h2>
|
||||||
|
<p>Одно поле — <code>field</code> (подпись + контроль). Два поля в ряд — <code>field-row</code>: подписи в первой сетке-строке, значения во второй. Высота значений общая, потому что это одна строка грида, а не два блока с подобранным padding. Баг «Type ниже Host» (<code>b0ebe06</code>) из этой разметки не собирается.</p>
|
||||||
|
<p><code>field-row</code> с узкой второй колонкой — Host / name ‖ Type. <code>field-row equal</code> — два равноправных инпута (лимит и окно).</p>
|
||||||
|
|
||||||
|
<figure class="specimen">
|
||||||
|
<figcaption>field-row — Host ‖ Type, с Copy и без</figcaption>
|
||||||
|
<div class="pair">
|
||||||
|
<div class="card">
|
||||||
|
<h2>With Copy</h2>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<div class="code-row">
|
||||||
|
<span class="code">mail._domainkey.example.com</span>
|
||||||
|
<button type="button" class="copy">Copy</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">TXT</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card">
|
||||||
|
<h2>Lookup, no Copy</h2>
|
||||||
|
<div class="field-row">
|
||||||
|
<div class="field">
|
||||||
|
<label>Host / name</label>
|
||||||
|
<span class="code">lists.example.com</span>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Type</label>
|
||||||
|
<span class="code">MX</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</figure>
|
||||||
|
|
||||||
|
<figure class="specimen">
|
||||||
|
<figcaption>field-row equal — лимит ‖ окно</figcaption>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Level-2 rate limit</h2>
|
||||||
|
<div class="field-row equal">
|
||||||
|
<div class="field">
|
||||||
|
<label>Message limit</label>
|
||||||
|
<input value="40">
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Window (seconds)</label>
|
||||||
|
<input value="60">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</figure>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="actions">
|
||||||
|
<h2>Действия</h2>
|
||||||
|
<p>Primary, secondary и danger — всегда <code>actions-row</code>. Для вёрстки неважно, POST это или переход на confirm: ряд один. Форма либо оборачивает всю карточку, либо кнопки несут <code>form=</code>. Нельзя оставить Submit внутри блочной формы, а Delete — следующим соседом: блок формы занимает строку целиком.</p>
|
||||||
|
<figure class="specimen">
|
||||||
|
<figcaption>Save и Delete в одном ряду</figcaption>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Edit user</h2>
|
||||||
|
<label>Username</label>
|
||||||
|
<input value="ops-alerts">
|
||||||
|
<div class="actions-row">
|
||||||
|
<button type="button">Save</button>
|
||||||
|
<a class="danger" href="#forbid">Delete user</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</figure>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="forbid">
|
||||||
|
<h2>Нельзя</h2>
|
||||||
|
<p>Если хочется добавить правило «только на этой странице» — сначала проверить, какого региона не хватило.</p>
|
||||||
|
<ul class="forbid">
|
||||||
|
<li>Класс на <code>main</code> (<code>ops</code> / <code>form</code>) как способ выбрать ширину. Ширину выбирает регион.</li>
|
||||||
|
<li>Одиночная карточка на 90rem с двумя полями ввода. Это <code>measure</code> или <code>pair</code>.</li>
|
||||||
|
<li>Danger zone отдельным <code>fill</code>. Она вторая колонка последней пары (получатели ‖ удалить, экспорт ‖ удалить).</li>
|
||||||
|
<li>Два <code>.code</code> рядом с разным padding, чтобы «почти совпало». Только <code>field-row</code>.</li>
|
||||||
|
<li>Submit внутри <code><form></code>, danger-ссылка после <code></form></code>.</li>
|
||||||
|
<li>Перенос однострочного поля, адреса, статуса, hostname. <code>nowrap</code> + горизонтальный скролл карточки.</li>
|
||||||
|
<li>Status из одних бейджей без Detail / без строки очереди / без PTR.</li>
|
||||||
|
<li>Телефон как уменьшенный десктоп с шестиколоночной таблицей. Таблица → список; <code>pair</code> → одна колонка; <code>field-row</code> остаётся парой.</li>
|
||||||
|
<li>Копировать разметку <code>internal/web/view/templates</code> «как есть» в макет. Рецепт экрана — ниже, не шаблон Go.</li>
|
||||||
|
</ul>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="recipes">
|
||||||
|
<h2>Рецепты экранов</h2>
|
||||||
|
<p>Экраны — отдельные HTML-файлы рядом с этой спецификацией. Собираются только так:</p>
|
||||||
|
<table class="recipes">
|
||||||
|
<thead><tr><th>Экран</th><th>Стек регионов</th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td><a href="login.html">Login</a> / <a href="setup.html">setup</a></td>
|
||||||
|
<td>центр оболочки, <code>measure</code> 24rem, полный stamp</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="status.html">Status</a></td>
|
||||||
|
<td><code>stack</code>: overall → <code>pair</code> очередь‖TLS → <code>pair</code> milters‖PTR → inbound если есть → <code>pair</code> machine‖processes → configuration. На карточках остаются числа и Detail.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="domains.html">Domains</a> / <a href="inbound.html">Inbound</a> / <a href="deliveries.html">Deliveries</a> / <a href="system-log.html">log</a> / <a href="mail-queue.html">queue</a></td>
|
||||||
|
<td><code>fill</code> таблица. Добавление домена — поле в той же карточке списка (<code>measure</code> внутри, не вторая карточка и не инпут на 90rem).</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="domain.html">Domain</a></td>
|
||||||
|
<td><code>fill</code> DNS status → <code>pair</code> DKIM/SPF ‖ DMARC → <code>pair</code> connection ‖ add app → <code>fill</code> applications → <code>pair</code> domain settings (две половины) → <code>pair</code> export ‖ danger. «?» на рабочих карточках.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="inbound-domain.html">Inbound domain</a></td>
|
||||||
|
<td><code>fill</code> MX DNS → <code>pair</code> upstream ‖ MX to publish → <code>pair</code> recipients ‖ danger</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="dmarc.html">DMARC</a></td>
|
||||||
|
<td>hub: <code>pair</code> ingest ‖ this week, затем <code>fill</code> список отчётов. Домен: <a href="dmarc-domain.html">roll-up</a> (<code>pair</code> 7 days ‖ third-party, <code>fill</code> reports + sources). Один XML: <a href="dmarc-report.html">просмотр</a> — <code>pair</code> report ‖ policy, <code>fill</code> records. Не дашборд, не <code>ruf=</code>.</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="backup.html">Backup</a></td>
|
||||||
|
<td><code>pair</code> full backup ‖ import</td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="settings.html">Settings</a></td>
|
||||||
|
<td>global: <code>pair</code> credentials ‖ DMARC, затем <code>fill</code> rate limits. Domain-admin: один ребёнок в <code>pair</code> → сам <code>measure</code></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="users.html">Users</a></td>
|
||||||
|
<td><code>fill</code> таблица. <a href="user-form.html">Create/Edit</a> — <code>measure</code> + <code>actions-row</code></td>
|
||||||
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td><a href="domain-delete.html">Confirm delete</a></td>
|
||||||
|
<td><code>measure</code> одна карточка</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="phone">
|
||||||
|
<h2>Телефон</h2>
|
||||||
|
<p>Аварийный доступ, не продукт. <code>pair</code> складывается в одну колонку. Таблица заменяется списком (как сейчас в прототипе). <code>field-row</code> не складывается: Type — токен. Навбар — выезжающая колонка на checkbox, без обязательного JS. Знак в шапке — SP-иконка, не второй wordmark.</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section id="apply" style="border-bottom:none">
|
||||||
|
<h2>Как внедрять</h2>
|
||||||
|
<ol>
|
||||||
|
<li>Новый экран или правка макета — только классы из <code>system.css</code> (<code>stack</code>, <code>pair</code>, <code>measure</code>, <code>fill</code>, <code>field-row</code>, <code>actions-row</code>).</li>
|
||||||
|
<li>Не добавлять исключения в <code>mock.css</code> «для этой страницы», если это ширина, высота пары полей или ряд кнопок.</li>
|
||||||
|
<li>Click-through — отдельные страницы (<code>status.html</code>, <code>domain.html</code>, …), не простыня с якорями. Оболочка общая: <code>shell.js</code>.</li>
|
||||||
|
<li>Вёрстка <code>internal/web</code> — отдельная задача после утверждения системы, не параллельный рескин шаблонов.</li>
|
||||||
|
</ol>
|
||||||
|
<p class="muted">Классы живут в <code>docs/assets/panel-ui/system.css</code>. Этот файл — спецификация. Экраны — <a href="status.html">status.html</a> и соседние страницы; оглавление — <a href="index.html">index.html</a>.</p>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Delete ops-alerts — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-user-delete" data-page="user-delete" data-nav="users" data-title="Delete user" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>Delete ops-alerts</h1>
|
||||||
|
<a class="back" href="user-form.html">← Back to ops-alerts</a>
|
||||||
|
</div>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<h2>Confirm deletion</h2>
|
||||||
|
<p>You are about to delete the panel user <strong>ops-alerts</strong>. A signed-in session for this user stops working immediately.</p>
|
||||||
|
<div class="actions-row"><button type="button" class="danger">Delete ops-alerts</button></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Edit user — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-user-form" data-page="user-form" data-nav="users" data-title="Edit user" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<div>
|
||||||
|
<h1>Edit user</h1>
|
||||||
|
<a class="back" href="users.html">← Back to users</a>
|
||||||
|
</div>
|
||||||
|
<div class="measure">
|
||||||
|
<div class="card">
|
||||||
|
<form action="#" onsubmit="return false">
|
||||||
|
<label>Username</label>
|
||||||
|
<input value="ops-alerts">
|
||||||
|
<label>Password (leave empty to keep)</label>
|
||||||
|
<input type="password">
|
||||||
|
<label>Role</label>
|
||||||
|
<select><option selected>Domain administrator</option><option>Global administrator</option></select>
|
||||||
|
<fieldset>
|
||||||
|
<legend>Assigned domains</legend>
|
||||||
|
<p class="muted">Required for domain administrators.</p>
|
||||||
|
<label class="check"><input type="checkbox"> example.com</label>
|
||||||
|
<label class="check"><input type="checkbox" checked> alerts.example.com</label>
|
||||||
|
</fieldset>
|
||||||
|
<div class="actions-row">
|
||||||
|
<button type="button">Save</button>
|
||||||
|
<a class="danger" href="user-delete.html">Delete user</a>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>Users — SelfPost mockups</title>
|
||||||
|
<link rel="icon" href="../selfpost-icon-16.svg" type="image/svg+xml">
|
||||||
|
<link rel="stylesheet" href="mock.css">
|
||||||
|
<link rel="stylesheet" href="system.css">
|
||||||
|
</head>
|
||||||
|
<body class="page-users" data-page="users" data-nav="users" data-title="Users" data-global-only="1">
|
||||||
|
<main class="stack">
|
||||||
|
<h1>Users</h1>
|
||||||
|
<div class="fill">
|
||||||
|
<div class="card">
|
||||||
|
<p><a href="user-form.html">Create user</a></p>
|
||||||
|
<table>
|
||||||
|
<thead><tr><th>Username</th><th>Role</th><th>Domains</th><th></th></tr></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr><td>admin</td><td>Global</td><td class="muted">All</td><td class="actions"><a href="user-form.html">Edit</a></td></tr>
|
||||||
|
<tr><td>ops-alerts</td><td>Domain admin</td><td class="muted">alerts.example.com</td><td class="actions"><a href="user-form.html">Edit</a></td></tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
<script src="shell.js"></script>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
+66
-13
@@ -93,8 +93,9 @@ mechanics → Haiku. Reviewers must not be the author of the code under review.
|
|||||||
## External libraries
|
## External libraries
|
||||||
|
|
||||||
The project is **AGPL-3.0** ([LICENSE](../LICENSE)). Copyright holder and
|
The project is **AGPL-3.0** ([LICENSE](../LICENSE)). Copyright holder and
|
||||||
third-party notices: [NOTICE](../NOTICE). New Go dependencies must be
|
third-party notices: [NOTICE](../NOTICE). The tree does not use per-file
|
||||||
permissive or GPL-family (see
|
`SPDX-License-Identifier` headers; AGPL-3.0 does not require them. New Go
|
||||||
|
dependencies must be permissive or GPL-family (see
|
||||||
[.cursor/rules/agent-rules.mdc](../.cursor/rules/agent-rules.mdc)).
|
[.cursor/rules/agent-rules.mdc](../.cursor/rules/agent-rules.mdc)).
|
||||||
|
|
||||||
### Main module (`go.mod`)
|
### Main module (`go.mod`)
|
||||||
@@ -113,6 +114,7 @@ the tree are AGPL-3.0-compatible.
|
|||||||
| Asset | Version | Repository | License |
|
| Asset | Version | Repository | License |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| `internal/web/view/static/htmx.min.js` | 2.0.4 | <https://github.com/bigskysoftware/htmx> | 0BSD |
|
| `internal/web/view/static/htmx.min.js` | 2.0.4 | <https://github.com/bigskysoftware/htmx> | 0BSD |
|
||||||
|
| `internal/web/view/static/ibm-plex-*.woff2` | latin subset | <https://github.com/IBM/plex> | SIL OFL 1.1 (`OFL.txt` beside the files) |
|
||||||
|
|
||||||
### E2e module (`test/e2e/go.mod`)
|
### E2e module (`test/e2e/go.mod`)
|
||||||
|
|
||||||
@@ -128,8 +130,10 @@ the image.
|
|||||||
Postfix, OpenDKIM, `supervisord`, `sasl2-bin`, `logrotate`, and others come
|
Postfix, OpenDKIM, `supervisord`, `sasl2-bin`, `logrotate`, and others come
|
||||||
from Debian bookworm repositories; licenses are in each package's `copyright`
|
from Debian bookworm repositories; licenses are in each package's `copyright`
|
||||||
file on <https://packages.debian.org/bookworm/>.
|
file on <https://packages.debian.org/bookworm/>.
|
||||||
The image also ships [LICENSE](../LICENSE) and [NOTICE](../NOTICE) under
|
The image also ships [LICENSE](../LICENSE), [NOTICE](../NOTICE), and the IBM
|
||||||
`/usr/share/doc/selfpost/`. The panel serves the AGPL text at `/license`.
|
Plex [OFL.txt](../internal/web/view/static/OFL.txt) under
|
||||||
|
`/usr/share/doc/selfpost/`. The panel serves the AGPL text at `/license` and
|
||||||
|
the OFL text at `/static/OFL.txt`.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -187,9 +191,12 @@ tag / push only on explicit request (see `release.yml`).
|
|||||||
|
|
||||||
### Release image
|
### Release image
|
||||||
|
|
||||||
The release image is published **only on tag** `vX.Y.Z` (not on every push to
|
The release image is published **only** for a SemVer version `X.Y.Z`: a
|
||||||
`main`). The tag is the single source of version: it drives the image tag and
|
**published** GitHub Release whose tag is `vX.Y.Z`, or a `workflow_dispatch`
|
||||||
`-ldflags` in the binaries so they cannot drift apart.
|
that supplies that version. Pushing a git tag alone does not publish. Ordinary
|
||||||
|
commits, and a dispatch from `main` without a version input, do not publish.
|
||||||
|
The version is the single source that drives the image tag and `-ldflags` in
|
||||||
|
the binaries so they cannot drift apart.
|
||||||
|
|
||||||
**Steps (on explicit request):**
|
**Steps (on explicit request):**
|
||||||
|
|
||||||
@@ -197,8 +204,42 @@ The release image is published **only on tag** `vX.Y.Z` (not on every push to
|
|||||||
tag in [deploy/docker-compose.yml](../deploy/docker-compose.yml) (and any
|
tag in [deploy/docker-compose.yml](../deploy/docker-compose.yml) (and any
|
||||||
local-trial image references) in the **same** release commit.
|
local-trial image references) in the **same** release commit.
|
||||||
2. Create and push git tag `vX.Y.Z` on that commit.
|
2. Create and push git tag `vX.Y.Z` on that commit.
|
||||||
3. Workflow [release.yml](../.github/workflows/release.yml) builds, e2e-gates,
|
3. Publish the GitHub Release for `vX.Y.Z` (not a draft).
|
||||||
and publishes `ghcr.io/mixeme/selfpost:X.Y.Z`.
|
4. Workflow [release.yml](../.github/workflows/release.yml) builds, e2e-gates,
|
||||||
|
and publishes `ghcr.io/mixeme/selfpost:X.Y.Z` (checks out tag `vX.Y.Z`).
|
||||||
|
|
||||||
|
**GitHub Release vs GHCR.** The public [Releases](https://github.com/mixeme/selfpost/releases)
|
||||||
|
page lists only **published** releases. A draft is visible to maintainers only —
|
||||||
|
it looks like “no releases” to everyone else. CI does not create or publish the
|
||||||
|
GitHub Release; you do that in the UI. Deleting a release’s git tag on GitHub
|
||||||
|
(or re-pushing tags while cleaning the registry) converts a published release
|
||||||
|
back into a **draft** — that matches “I published three times and it keeps
|
||||||
|
disappearing”. After publish, leave the tag on GitHub; clean up only unwanted
|
||||||
|
GHCR package versions, not the git tag.
|
||||||
|
|
||||||
|
Push workflow and source changes to **github.com/mixeme/selfpost** before
|
||||||
|
publishing — Actions reads that repo, not Gitea.
|
||||||
|
|
||||||
|
**Gitea → GitHub tag mirror.** If every tag push from Gitea is mirrored to
|
||||||
|
GitHub, two things follow:
|
||||||
|
|
||||||
|
1. **GitHub Release tags must not be deleted on GitHub.** Many mirror setups
|
||||||
|
prune remote tags that are absent on Gitea (or re-push with `--force` /
|
||||||
|
`--prune`). Deleting `v1.0.0` / `v1.3.0` on GitHub converts a published
|
||||||
|
Release back to draft. Mirror **branches and new tags forward**; do not
|
||||||
|
delete release tags on the GitHub side. GHCR cleanup is package versions in
|
||||||
|
the UI — not `git push github --delete` and not tag prune on the mirror.
|
||||||
|
|
||||||
|
2. **Tag push runs the workflow file at that tag's commit**, not `main`. `v1.0.0`
|
||||||
|
still points at a commit whose `release.yml` has `on: push: tags` and no
|
||||||
|
per-arch GHCR cleanup — every mirror (re)push of that tag can republish
|
||||||
|
`1.0.0-amd64` / `1.0.0-arm64`. Tags from `v1.3.0` onward only run
|
||||||
|
`release.yml` on **Publish release** (`release: published`), so mirroring
|
||||||
|
those tags alone does not start the image build.
|
||||||
|
|
||||||
|
Safe mirror: push tags to GitHub without deleting existing ones; keep release
|
||||||
|
tags on Gitea; publish the GitHub Release on github.com after the mirror has
|
||||||
|
the tag.
|
||||||
|
|
||||||
Ordinary commits **do not** publish an image. The compose pin and the git tag
|
Ordinary commits **do not** publish an image. The compose pin and the git tag
|
||||||
must match (`1.0.0` / `v1.0.0` for the first published release). Intermediate
|
must match (`1.0.0` / `v1.0.0` for the first published release). Intermediate
|
||||||
@@ -284,21 +325,33 @@ Workflows in [.github/workflows/](../.github/workflows/). What each job runs —
|
|||||||
|
|
||||||
`gofmt -l` → `go vet ./...` → `go test ./...` (main module, no e2e).
|
`gofmt -l` → `go vet ./...` → `go test ./...` (main module, no e2e).
|
||||||
|
|
||||||
### `release.yml` — push of tag `vX.Y.Z` or `workflow_dispatch`
|
### `release.yml` — published GitHub Release, or `workflow_dispatch` with SemVer
|
||||||
|
|
||||||
|
Publishing a GitHub Release runs `release.yml` directly (`release: published`,
|
||||||
|
same pattern as gosentry / imap-scrub). You can also run it manually via
|
||||||
|
`workflow_dispatch` with an explicit `X.Y.Z` input. A bare git tag push does not
|
||||||
|
run the workflow. The build always checks out `vX.Y.Z`, not `main` HEAD.
|
||||||
|
|
||||||
|
`prepare` takes the version from `github.event.release.tag_name` on a release
|
||||||
|
event, or from the `workflow_dispatch` `version` input. A dispatch whose input
|
||||||
|
is missing or not `X.Y.Z` fails in `prepare`.
|
||||||
|
|
||||||
```
|
```
|
||||||
prepare (version from tag)
|
release: published
|
||||||
|
prepare (version from release tag or workflow_dispatch input; checkout vX.Y.Z)
|
||||||
→ build [matrix: ubuntu-latest / ubuntu-24.04-arm]
|
→ build [matrix: ubuntu-latest / ubuntu-24.04-arm]
|
||||||
→ docker build --load (VERSION from tag)
|
→ docker build --load (VERSION from prepare)
|
||||||
→ e2e (test/e2e)
|
→ e2e (test/e2e)
|
||||||
→ push ghcr.io/...:X.Y.Z-amd64 | X.Y.Z-arm64
|
→ push ghcr.io/...:X.Y.Z-amd64 | X.Y.Z-arm64
|
||||||
→ merge
|
→ merge
|
||||||
→ docker buildx imagetools create → unified manifest X.Y.Z
|
→ docker buildx imagetools create → unified manifest X.Y.Z
|
||||||
|
→ GitHub Packages API → drop X.Y.Z-amd64 and X.Y.Z-arm64 from GHCR
|
||||||
```
|
```
|
||||||
|
|
||||||
Native per-arch matrix (no QEMU): running the full Postfix/OpenDKIM stack under
|
Native per-arch matrix (no QEMU): running the full Postfix/OpenDKIM stack under
|
||||||
emulation for e2e is impractical. E2e first, then push — the registry receives
|
emulation for e2e is impractical. E2e first, then push — the registry receives
|
||||||
the bytes that passed the gate.
|
the bytes that passed the gate. Only `ghcr.io/mixeme/selfpost:X.Y.Z` remains
|
||||||
|
tagged in GHCR; per-arch names exist briefly during the merge job.
|
||||||
|
|
||||||
A failed e2e **blocks** image publication.
|
A failed e2e **blocks** image publication.
|
||||||
|
|
||||||
|
|||||||
+532
-269
@@ -3,55 +3,53 @@
|
|||||||
Detailed install, configuration, and day-to-day operations. For a short
|
Detailed install, configuration, and day-to-day operations. For a short
|
||||||
overview and quick start, see [README.md](../README.md).
|
overview and quick start, see [README.md](../README.md).
|
||||||
|
|
||||||
|
This guide has three parts: **[Installation](#installation)** (getting a
|
||||||
|
container running with a working reverse proxy and TLS), **[Instance
|
||||||
|
administration](#instance-administration)** (running and maintaining the
|
||||||
|
SelfPost server itself — status, backups, users, upgrades), and **[Domain
|
||||||
|
administration](#domain-administration)** (day-to-day work on the sending
|
||||||
|
domains hosted on that instance — DNS, deliveries, rate limits, applications).
|
||||||
|
|
||||||
## Table of contents
|
## Table of contents
|
||||||
|
|
||||||
- [Reverse proxy (mandatory)](#reverse-proxy-mandatory)
|
- [Installation](#installation)
|
||||||
- [Local trial](#local-trial)
|
- [Ports](#ports)
|
||||||
- [Environment variables](#environment-variables)
|
- [Local trial](#local-trial)
|
||||||
- [DNS setup](#dns-setup)
|
- [Initial setup](#initial-setup)
|
||||||
- [IP warmup](#ip-warmup)
|
- [Full deployment](#full-deployment)
|
||||||
- [Operations](#operations)
|
- [Fixed image tag](#fixed-image-tag)
|
||||||
- [Rate limiting](#rate-limiting)
|
- [Environment variables](#environment-variables)
|
||||||
- [Backup, restore, and moving a single domain](#backup-restore-and-moving-a-single-domain)
|
- [Reverse proxy (mandatory)](#reverse-proxy-mandatory)
|
||||||
|
- [Instance administration](#instance-administration)
|
||||||
|
- [Status](#status)
|
||||||
|
- [Mail queue and System log](#mail-queue-and-system-log)
|
||||||
|
- [Settings](#settings)
|
||||||
|
- [Users](#users)
|
||||||
|
- [Sessions](#sessions)
|
||||||
|
- [Upgrading](#upgrading)
|
||||||
|
- [Container health](#container-health)
|
||||||
|
- [Server-level DNS (PTR/rDNS)](#server-level-dns-ptrrdns)
|
||||||
|
- [Rate limiting — level 1 (IP backstop)](#rate-limiting--level-1-ip-backstop)
|
||||||
|
- [Full backup and restore](#full-backup-and-restore)
|
||||||
- [Encrypting a backup or export](#encrypting-a-backup-or-export)
|
- [Encrypting a backup or export](#encrypting-a-backup-or-export)
|
||||||
- [Published ports](#published-ports)
|
- [Domain administration](#domain-administration)
|
||||||
- [Fixed image tag](#fixed-image-tag)
|
- [Domains page](#domains-page)
|
||||||
|
- [Domain-level DNS (SPF, DKIM, DMARC)](#domain-level-dns-spf-dkim-dmarc)
|
||||||
|
- [IP warmup](#ip-warmup)
|
||||||
|
- [Rate limiting — level 2 (domain and application)](#rate-limiting--level-2-domain-and-application)
|
||||||
|
- [Deliveries](#deliveries)
|
||||||
|
- [Exporting and importing a single domain](#exporting-and-importing-a-single-domain)
|
||||||
|
|
||||||
## Reverse proxy (mandatory)
|
## Installation
|
||||||
|
|
||||||
SelfPost's panel speaks plain HTTP and never terminates TLS itself — a reverse
|
### Ports
|
||||||
proxy in front of it is not optional. The proxy is also the project's only
|
|
||||||
source of TLS certificates: whatever it obtains via ACME/Let's Encrypt gets
|
|
||||||
bind-mounted **read-only** into the SelfPost container, and Postfix uses those
|
|
||||||
same PEM files for TLS on 465 (and 587, if enabled). If the panel and the mail
|
|
||||||
service share one hostname — the common case — it's genuinely one certificate
|
|
||||||
serving both.
|
|
||||||
|
|
||||||
SelfPost isn't tied to a specific proxy; pick whichever fits your host:
|
`deploy/docker-compose.yml` maps **465** and **587** to the host. Port 465
|
||||||
|
(smtps) is always active. Port **587** is published even when
|
||||||
|
`SUBMISSION_ENABLE=false`; nothing listens until you set it to `true` — harmless,
|
||||||
|
but it can look like an open port in external scans.
|
||||||
|
|
||||||
| Proxy | Where certs live | Fragment |
|
### Local trial
|
||||||
|---|---|---|
|
|
||||||
| **Apache** (default/recommended) | Host disk, via the certbot Apache plugin — PEM files ready to bind-mount, no extraction step. | [deploy/apache/selfpost-vhost.conf](../deploy/apache/selfpost-vhost.conf) |
|
|
||||||
| nginx | Host disk, via a certbot sidecar container — same PEM-ready shape as Apache. | [deploy/nginx/](../deploy/nginx/) |
|
|
||||||
| Caddy | Automatic ACME, zero extra containers — simplest, but its on-disk cert path is versioned internal layout, not a stable API; verify it for the Caddy version you run. | [deploy/caddy/](../deploy/caddy/) |
|
|
||||||
| Traefik | Bundled inside `acme.json` — needs a small extraction script to produce standalone PEM files. | [deploy/traefik/](../deploy/traefik/) |
|
|
||||||
|
|
||||||
Apache is the recommended default because the certbot Apache plugin already
|
|
||||||
writes plain `fullchain.pem`/`privkey.pem` files to a predictable path with no
|
|
||||||
extra moving parts between "certificate issued" and "Postfix can read it."
|
|
||||||
|
|
||||||
**The proxy needs no security configuration of its own.** The panel emits its
|
|
||||||
own `Content-Security-Policy`, `Strict-Transport-Security`, `X-Frame-Options`,
|
|
||||||
`X-Content-Type-Options` and `Referrer-Policy` — deliberately, so the part
|
|
||||||
that's easy to get wrong lives in the service rather than in a config file
|
|
||||||
somebody edits under pressure. There is exactly one thing the proxy must do:
|
|
||||||
**pass the original `Host` header through**. All four fragments above already
|
|
||||||
do (Apache `ProxyPreserveHost On`, nginx `proxy_set_header Host $host`, Caddy
|
|
||||||
and Traefik by default). A proxy that rewrites `Host` instead makes the panel
|
|
||||||
reject every form submission as cross-origin — the log says so explicitly,
|
|
||||||
printing the `Origin` and `Host` it compared.
|
|
||||||
|
|
||||||
## Local trial
|
|
||||||
|
|
||||||
The [README quick start](../README.md#quick-start) runs a single container
|
The [README quick start](../README.md#quick-start) runs a single container
|
||||||
with `PANEL_COOKIE_SECURE=false` and port 8080 published on localhost. No
|
with `PANEL_COOKIE_SECURE=false` and port 8080 published on localhost. No
|
||||||
@@ -85,7 +83,99 @@ Add `-v /tmp/selfpost-certs:/etc/postfix/tls:ro` to the `docker run` command
|
|||||||
(and keep `SELFPOST_HOSTNAME=mail.local.test` so it matches the certificate CN).
|
(and keep `SELFPOST_HOSTNAME=mail.local.test` so it matches the certificate CN).
|
||||||
Clients must skip TLS verification — the cert is not from a public CA.
|
Clients must skip TLS verification — the cert is not from a public CA.
|
||||||
|
|
||||||
## Environment variables
|
### Initial setup
|
||||||
|
|
||||||
|
On first start the one-time setup URL is printed in the container log
|
||||||
|
(`docker compose logs -f`) and written to `/data/setup-token` inside the
|
||||||
|
container — `./data/setup-token` on the host, mode `0600` — then deleted when
|
||||||
|
setup completes. The link is `https://<SELFPOST_HOSTNAME>/setup/<token>` (path
|
||||||
|
token, not a query string), valid for ten minutes. Open it to choose the
|
||||||
|
administrator username and password — until then the panel has no login. If
|
||||||
|
this host ships container logs to a central aggregator, prefer reading the
|
||||||
|
file:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker compose exec selfpost cat /data/setup-token
|
||||||
|
```
|
||||||
|
|
||||||
|
### Full deployment
|
||||||
|
|
||||||
|
Production layout: one `docker-compose.yml`, a `.env`, persistent `./data`, and
|
||||||
|
TLS PEM files at `./certs` (read by Postfix on 465/587). The panel is reached
|
||||||
|
only through a [reverse proxy](#reverse-proxy-mandatory) on 443 — port 8080 is
|
||||||
|
bound to localhost in the default compose file.
|
||||||
|
|
||||||
|
| Artefact | Path |
|
||||||
|
|---|---|
|
||||||
|
| Compose file (fixed image tag) | [deploy/docker-compose.yml](../deploy/docker-compose.yml) |
|
||||||
|
| Environment template | [deploy/.env.example](../deploy/.env.example) |
|
||||||
|
| Apache vhost (recommended) | [deploy/apache/selfpost-vhost.conf](../deploy/apache/selfpost-vhost.conf) |
|
||||||
|
| nginx | [deploy/nginx/](../deploy/nginx/) |
|
||||||
|
| Caddy | [deploy/caddy/](../deploy/caddy/) |
|
||||||
|
| Traefik | [deploy/traefik/](../deploy/traefik/) |
|
||||||
|
|
||||||
|
**1. Fetch the base files.**
|
||||||
|
|
||||||
|
```sh
|
||||||
|
mkdir -p selfpost/data selfpost/certs && cd selfpost
|
||||||
|
curl -O https://raw.githubusercontent.com/mixeme/selfpost/main/deploy/docker-compose.yml
|
||||||
|
curl -O https://raw.githubusercontent.com/mixeme/selfpost/main/deploy/.env.example
|
||||||
|
cp .env.example .env
|
||||||
|
```
|
||||||
|
|
||||||
|
Edit `.env` — at minimum set `SELFPOST_HOSTNAME` to your mail hostname (bare
|
||||||
|
FQDN, e.g. `mail.example.com`). It must match the PTR record you request from
|
||||||
|
your provider and the certificate your proxy will obtain. See [Environment
|
||||||
|
variables](#environment-variables) for the full list.
|
||||||
|
|
||||||
|
**2. Reverse proxy and TLS.** Pick and set up one proxy — see [Reverse proxy
|
||||||
|
(mandatory)](#reverse-proxy-mandatory) for the per-proxy commands. The same
|
||||||
|
certificate must end up under `./certs` as `fullchain.pem` and `privkey.pem`
|
||||||
|
so Postfix can serve it on 465 (and 587 if enabled).
|
||||||
|
|
||||||
|
**3. Start SelfPost.** If you used Apache on the host (the recommended
|
||||||
|
option), start only the base compose file from your `selfpost/` directory:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker compose up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
The nginx/Caddy/Traefik fragments already include `docker compose up -d` —
|
||||||
|
skip this if you ran one of those.
|
||||||
|
|
||||||
|
**Get the setup URL** — open it in a browser to create the admin account (see
|
||||||
|
[Initial setup](#initial-setup)):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker compose logs selfpost 2>&1 | grep -m1 'http'
|
||||||
|
```
|
||||||
|
|
||||||
|
```sh
|
||||||
|
cat ./data/setup-token
|
||||||
|
```
|
||||||
|
|
||||||
|
**4. DNS and sending.** Before sending real mail:
|
||||||
|
|
||||||
|
1. Confirm PTR/rDNS for the server IP points at `SELFPOST_HOSTNAME` (Status
|
||||||
|
page → *Re-check*) — see [Server-level DNS](#server-level-dns-ptrrdns).
|
||||||
|
2. For each domain you add in the panel, publish SPF, DKIM, and DMARC at the
|
||||||
|
same time ([Domain-level DNS](#domain-level-dns-spf-dkim-dmarc)).
|
||||||
|
3. Warm up a new IP gradually ([IP warmup](#ip-warmup)).
|
||||||
|
|
||||||
|
#### Fixed image tag
|
||||||
|
|
||||||
|
`deploy/docker-compose.yml` pins an explicit version (`ghcr.io/mixeme/selfpost:X.Y.Z`),
|
||||||
|
deliberately never `:latest`. The current pin is `1.3.0`. Intermediate
|
||||||
|
CHANGELOG sections (`0.2.0`…`0.6.0`) record development cuts from before that
|
||||||
|
image was published. Pinning matters because of the backup version check (see
|
||||||
|
[Full backup and restore](#full-backup-and-restore)): the panel binary's
|
||||||
|
embedded version and the image tag that produced it are the same value by
|
||||||
|
construction (the release CI stamps both from one git tag — see
|
||||||
|
`.github/workflows/release.yml`), so the pin is what makes "restore into the
|
||||||
|
same version" a checkable fact rather than a guess. Upgrade by bumping the tag
|
||||||
|
deliberately, not by riding a moving target — see [Upgrading](#upgrading).
|
||||||
|
|
||||||
|
### Environment variables
|
||||||
|
|
||||||
Copy [deploy/.env.example](../deploy/.env.example) to `.env` next to your
|
Copy [deploy/.env.example](../deploy/.env.example) to `.env` next to your
|
||||||
`docker-compose.yml`. The table below lists every variable an operator is
|
`docker-compose.yml`. The table below lists every variable an operator is
|
||||||
@@ -95,7 +185,7 @@ expected to set; defaults match the code exactly.
|
|||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| `SELFPOST_HOSTNAME` | Mail-server identity: Postfix HELO/EHLO, SASL realm, certificate CN/SAN, and the hostname the PTR check expects. Bare FQDN only — no scheme or port. | *(required)* | `.env` |
|
| `SELFPOST_HOSTNAME` | Mail-server identity: Postfix HELO/EHLO, SASL realm, certificate CN/SAN, and the hostname the PTR check expects. Bare FQDN only — no scheme or port. | *(required)* | `.env` |
|
||||||
| `SUBMISSION_ENABLE` | When `true`, also listen on port 587 with STARTTLS (RFC 6409 submission) alongside the primary 465/smtps listener. | `false` | `.env` |
|
| `SUBMISSION_ENABLE` | When `true`, also listen on port 587 with STARTTLS (RFC 6409 submission) alongside the primary 465/smtps listener. | `false` | `.env` |
|
||||||
| `RATE_LIMIT_MESSAGES_PER_IP` | Level-1 backstop: maximum messages one client IP may submit per window (Postfix `smtpd_client_message_rate_limit`). See [Rate limiting](#rate-limiting). | `100` | `.env` |
|
| `RATE_LIMIT_MESSAGES_PER_IP` | Level-1 backstop: maximum messages one client IP may submit per window (Postfix `smtpd_client_message_rate_limit`). See [Rate limiting — level 1](#rate-limiting--level-1-ip-backstop). | `100` | `.env` |
|
||||||
| `RATE_LIMIT_WINDOW_SECONDS` | Level-1 window length in seconds (Postfix `anvil_rate_time_unit`). | `3600` | `.env` |
|
| `RATE_LIMIT_WINDOW_SECONDS` | Level-1 window length in seconds (Postfix `anvil_rate_time_unit`). | `3600` | `.env` |
|
||||||
| `SEND_LOG_RETENTION_DAYS` | Days of send-log history kept before the background sweep deletes rows — the main driver of `/data` growth over time. | `90` | `.env` |
|
| `SEND_LOG_RETENTION_DAYS` | Days of send-log history kept before the background sweep deletes rows — the main driver of `/data` growth over time. | `90` | `.env` |
|
||||||
| `PANEL_SESSION_IDLE_DAYS` | Sliding idle timeout for the panel login session, in days. There is no absolute cap: an admin who keeps coming back stays signed in indefinitely. | `7` | `.env` |
|
| `PANEL_SESSION_IDLE_DAYS` | Sliding idle timeout for the panel login session, in days. There is no absolute cap: an admin who keeps coming back stays signed in indefinitely. | `7` | `.env` |
|
||||||
@@ -106,119 +196,128 @@ TLS certificate paths (`TLS_CERT_FILE`, `TLS_KEY_FILE`) are fixed in
|
|||||||
[deploy/docker-compose.yml](../deploy/docker-compose.yml) to match the `./certs`
|
[deploy/docker-compose.yml](../deploy/docker-compose.yml) to match the `./certs`
|
||||||
bind mount — configure the mount, not these variables.
|
bind mount — configure the mount, not these variables.
|
||||||
|
|
||||||
**Internal variables (not part of the operator interface).** The following are
|
The image also reads a number of internal, non-operator env vars (paths,
|
||||||
read by the panel or startup scripts but are not meant to be changed in a
|
timeouts, tuning) — not part of this interface; see
|
||||||
normal deployment; documenting them here avoids treating accidental overrides as
|
[architecture.md § Configuration](architecture.md#configuration) if you need
|
||||||
supported configuration:
|
them.
|
||||||
|
|
||||||
- **Panel paths and tuning:** `SELFPOST_DATA_DIR` (`/data`), `SELFPOST_DB_PATH`
|
### Reverse proxy (mandatory)
|
||||||
(`/data/selfpost.db`), `SELFPOST_SETUP_TOKEN_FILE`
|
|
||||||
(`/data/setup-token`), `PANEL_HTTP_ADDR` (`:8080`),
|
|
||||||
`JOURNAL_MILTER_SOCKET` (`/run/selfpost/journal.sock`), `MAIL_LOG`
|
|
||||||
(`/data/log/mail.log` — read by the panel and written by Postfix, so a change
|
|
||||||
here has to be matched in `build/postfix-config.sh`),
|
|
||||||
`PANEL_COOKIE_SECURE` (`true`), `OPENDKIM_SOCKET`
|
|
||||||
(`/run/opendkim/opendkim.sock`), `OPENDKIM_DIR` (`/data/opendkim`),
|
|
||||||
`DKIM_SELECTOR_DEFAULT` (`selfpost`), `SASL_DB_PATH`
|
|
||||||
(`/data/sasl/sasldb2`), `SASL_REALM` (defaults to `SELFPOST_HOSTNAME`),
|
|
||||||
`POSTFIX_DIR` (`/data/postfix`), `POSTFIX_SENDER_LOGIN_MAPS`
|
|
||||||
(`/data/postfix/sender_login_maps` — read by Postfix config only; the panel
|
|
||||||
always writes `<POSTFIX_DIR>/sender_login_maps`, so overriding this env alone
|
|
||||||
desyncs the map Postfix reads from the file the panel maintains).
|
|
||||||
- **Milter and Postfix startup:** `MILTER_CONNECT_TIMEOUT` (`15s`),
|
|
||||||
`MILTER_COMMAND_TIMEOUT` (`15s`), `MILTER_CONTENT_TIMEOUT` (`30s`),
|
|
||||||
`MILTER_WAIT_TIMEOUT` (`30` seconds).
|
|
||||||
- **Background maintenance:** `TLS_RELOAD_INTERVAL_SECONDS` (`86400` — daily
|
|
||||||
`postfix reload` to pick up renewed certificates),
|
|
||||||
`LOGROTATE_INTERVAL_SECONDS` (`21600` — check `mail.log` rotation every six
|
|
||||||
hours; logrotate keeps 14 rotated files on a daily schedule, and each
|
|
||||||
rotation triggers `postfix reload`).
|
|
||||||
|
|
||||||
## DNS setup
|
SelfPost's panel speaks plain HTTP and never terminates TLS itself — a reverse
|
||||||
|
proxy in front of it is not optional. The proxy is also the project's only
|
||||||
|
source of TLS certificates: whatever it obtains via ACME/Let's Encrypt gets
|
||||||
|
bind-mounted **read-only** into the SelfPost container, and Postfix uses those
|
||||||
|
same PEM files for TLS on 465 (and 587, if enabled). If the panel and the mail
|
||||||
|
service share one hostname — the common case — it's genuinely one certificate
|
||||||
|
serving both.
|
||||||
|
|
||||||
Two different scopes — don't confuse them:
|
SelfPost isn't tied to a specific proxy; pick whichever fits your host:
|
||||||
|
|
||||||
**Server level (once, for the machine itself):**
|
| Proxy | Where certs live | Fragment |
|
||||||
- **PTR/rDNS** for the server's IP, pointing at its mail hostname. Most
|
|---|---|---|
|
||||||
receiving mail servers weigh this heavily; get it from whoever assigns the IP
|
| **Apache** (default/recommended) | Host disk, via the certbot Apache plugin — PEM files ready to bind-mount, no extraction step. | [deploy/apache/selfpost-vhost.conf](../deploy/apache/selfpost-vhost.conf) |
|
||||||
(hosting provider's panel/support), not from your own DNS zone.
|
| nginx | Host disk, via a certbot sidecar container — same PEM-ready shape as Apache. | [deploy/nginx/](../deploy/nginx/) |
|
||||||
|
| Caddy | Automatic ACME, zero extra containers — simplest, but its on-disk cert path is versioned internal layout, not a stable API; verify it for the Caddy version you run. | [deploy/caddy/](../deploy/caddy/) |
|
||||||
|
| Traefik | Bundled inside `acme.json` — needs a small extraction script to produce standalone PEM files. | [deploy/traefik/](../deploy/traefik/) |
|
||||||
|
|
||||||
**Domain level (for *every* sending domain you add in the panel):**
|
Apache is the recommended default because the certbot Apache plugin already
|
||||||
- **SPF** — a TXT record on the domain authorizing this server to send on its
|
writes plain `fullchain.pem`/`privkey.pem` files to a predictable path with no
|
||||||
behalf (e.g. `v=spf1 a mx ip4:<server IP> -all`, adjusted to your setup).
|
extra moving parts between "certificate issued" and "Postfix can read it."
|
||||||
- **DKIM** — a TXT record with the exact value the panel shows on that
|
|
||||||
domain's page (`domain page → DKIM TXT record`), one selector per domain.
|
|
||||||
- **DMARC** — a `_dmarc` TXT record. The panel suggests `p=none` (monitoring
|
|
||||||
only, safe to publish immediately). On a send-only relay the sending domain
|
|
||||||
often has no inbox, so `rua=` is optional — configure a default report address
|
|
||||||
in *Settings* or per domain when you have a mailbox that receives inbound mail
|
|
||||||
elsewhere. If `rua=` points at another domain, publish `_report._dmarc` on that
|
|
||||||
hub domain too; the panel checks it. Public mail hosts (Gmail, Outlook, …)
|
|
||||||
cannot be used as external report destinations.
|
|
||||||
|
|
||||||
Skipping any of the three per-domain records is the single most common reason
|
**The proxy needs no security configuration of its own.** The panel emits its
|
||||||
mail lands in spam even though SelfPost delivered it correctly — DKIM passing
|
own `Content-Security-Policy`, `Strict-Transport-Security`, `X-Frame-Options`,
|
||||||
doesn't help if SPF/DMARC are absent. **Whenever you add a new domain in the
|
`X-Content-Type-Options` and `Referrer-Policy` — deliberately, so the part
|
||||||
panel, add its DNS records at the same time**, not later.
|
that's easy to get wrong lives in the service rather than in a config file
|
||||||
|
somebody edits under pressure. There is exactly one thing the proxy must do:
|
||||||
|
**pass the original `Host` header through**. All four fragments above already
|
||||||
|
do (Apache `ProxyPreserveHost On`, nginx `proxy_set_header Host $host`, Caddy
|
||||||
|
and Traefik by default). A proxy that rewrites `Host` instead makes the panel
|
||||||
|
reject every form submission as cross-origin — the log says so explicitly,
|
||||||
|
printing the `Origin` and `Host` it compared.
|
||||||
|
|
||||||
The panel checks both scopes for you and tells you what is actually published:
|
In every case the proxy terminates HTTPS for the panel; the resulting
|
||||||
the *Status* page verifies the server's hostname and its reverse record
|
certificate must end up under `./certs` as `fullchain.pem` and `privkey.pem`.
|
||||||
(forward-confirmed reverse DNS), and each domain's page shows a *DNS status*
|
|
||||||
card comparing the published DKIM record against the key this server signs with,
|
|
||||||
plus the domain's SPF, DMARC, and (when configured) DMARC report-authorisation
|
|
||||||
records. Results are cached for a few minutes;
|
|
||||||
use *Re-check* right after publishing a record. The SPF check is deliberately
|
|
||||||
shallow — it looks for a mechanism that literally covers this server's address
|
|
||||||
and does not follow `include:` or `redirect=`, so a record that authorizes the
|
|
||||||
server through an include is reported as "cannot tell" rather than as a failure.
|
|
||||||
|
|
||||||
## IP warmup
|
**Apache (recommended, on the host).** Install Apache with `ssl`, `proxy`, and
|
||||||
|
`proxy_http` enabled. Copy
|
||||||
|
[deploy/apache/selfpost-vhost.conf](../deploy/apache/selfpost-vhost.conf) into your
|
||||||
|
vhost directory, replace `mail.example.com` with your hostname, enable the site,
|
||||||
|
then issue a certificate:
|
||||||
|
|
||||||
A brand-new IP has no sending history, so receiving servers are cautious with
|
```sh
|
||||||
it regardless of how correct your DKIM/SPF/DMARC are. Start with low volume to
|
sudo certbot --apache -d mail.example.com
|
||||||
a domain, increase gradually over days/weeks rather than sending everything on
|
```
|
||||||
day one, and check the IP against major blocklists (Spamhaus and similar)
|
|
||||||
before and during warmup. This is inherent to how mail reputation works on the
|
|
||||||
public internet, not something SelfPost's configuration can shortcut.
|
|
||||||
|
|
||||||
## Operations
|
Point `./certs` at the PEM files certbot wrote (symlink is fine):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
ln -s /etc/letsencrypt/live/mail.example.com certs
|
||||||
|
```
|
||||||
|
|
||||||
|
**nginx (containerised).** From the `deploy/` directory, merge the nginx
|
||||||
|
fragment and issue the first certificate before nginx can serve HTTPS:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker compose -f docker-compose.yml -f nginx/docker-compose.nginx.yml \
|
||||||
|
run --rm certbot certonly --webroot -w /var/www/certbot \
|
||||||
|
-d mail.example.com --email you@example.com --agree-tos --no-eff-email
|
||||||
|
|
||||||
|
docker compose -f docker-compose.yml -f nginx/docker-compose.nginx.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
Edit [deploy/nginx/nginx.conf.example](../deploy/nginx/nginx.conf.example) and
|
||||||
|
replace `mail.example.com` first. The fragment bind-mounts certbot's output into
|
||||||
|
both nginx and SelfPost.
|
||||||
|
|
||||||
|
**Caddy (containerised, automatic ACME).** Edit
|
||||||
|
[deploy/caddy/Caddyfile](../deploy/caddy/Caddyfile) and the `<hostname>` placeholders
|
||||||
|
in [deploy/caddy/docker-compose.caddy.yml](../deploy/caddy/docker-compose.caddy.yml),
|
||||||
|
then:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker compose -f docker-compose.yml -f caddy/docker-compose.caddy.yml up -d
|
||||||
|
```
|
||||||
|
|
||||||
|
Verify Caddy's on-disk cert path for your version before relying on the
|
||||||
|
default mount — see the comment at the top of the Caddy compose fragment.
|
||||||
|
|
||||||
|
**Traefik (containerised).** Edit the `Host(...)` label and ACME email in
|
||||||
|
[deploy/traefik/docker-compose.traefik.yml](../deploy/traefik/docker-compose.traefik.yml),
|
||||||
|
start the stack, then extract PEM files for Postfix whenever Traefik issues or
|
||||||
|
renews a certificate:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker compose -f docker-compose.yml -f traefik/docker-compose.traefik.yml up -d
|
||||||
|
./traefik/extract-cert.sh ./traefik/letsencrypt/acme.json mail.example.com ./traefik/extracted-certs
|
||||||
|
```
|
||||||
|
|
||||||
|
Schedule `extract-cert.sh` (cron or a timer) alongside Traefik's renewals.
|
||||||
|
|
||||||
|
## Instance administration
|
||||||
|
|
||||||
After sign-in the panel opens on **Status** — the place to answer "is the
|
After sign-in the panel opens on **Status** — the place to answer "is the
|
||||||
service healthy and will mail be accepted?"
|
service healthy and will mail be accepted?"
|
||||||
|
|
||||||
- **Status** (`/status`) — supervised processes (Postfix, OpenDKIM, panel),
|
### Status
|
||||||
TLS certificate validity and expiry, milter socket presence, and a short
|
|
||||||
Postfix queue summary. The **Machine** card adds the resource usage of the
|
`/status` shows supervised processes (Postfix, OpenDKIM, panel), TLS
|
||||||
host underneath — processor (core and thread counts), memory and swap, and
|
certificate validity and expiry, milter socket presence, and a short Postfix
|
||||||
per-interface network throughput and totals — read from the kernel's
|
queue summary. The **Machine** card adds the resource usage of the host
|
||||||
counters; CPU and throughput are measured between refreshes, so they appear
|
underneath — processor (core and thread counts), memory and swap, and
|
||||||
one refresh after the page opens. A fully busy processor or a machine out of
|
per-interface network throughput and totals — read from the kernel's
|
||||||
memory is a warning here, because both delay or kill the mail path;
|
counters; CPU and throughput are measured between refreshes, so they appear
|
||||||
throughput is only reported. The hostname block compares `SELFPOST_HOSTNAME`
|
one refresh after the page opens. A fully busy processor or a machine out of
|
||||||
against the PTR record the internet publishes for this server's IP
|
memory is a warning here, because both delay or kill the mail path;
|
||||||
(forward-confirmed reverse DNS); use *Re-check* after changing DNS. The
|
throughput is only reported. The hostname block compares `SELFPOST_HOSTNAME`
|
||||||
**Reload configuration** button re-applies OpenDKIM tables and the Postfix
|
against the PTR record the internet publishes for this server's IP
|
||||||
sender map from the database — use it if daemons drifted from what the panel
|
(forward-confirmed reverse DNS) — see
|
||||||
shows after manual edits under `/data`.
|
[Server-level DNS](#server-level-dns-ptrrdns); use *Re-check* after changing
|
||||||
- **Domains** (`/domains`) — add sending domains, inspect each domain's DKIM
|
DNS. The **Reload configuration** button re-applies OpenDKIM tables and the
|
||||||
TXT value, SPF/DMARC checks, and SASL applications. Per-domain rate limits
|
Postfix sender map from the database — use it if daemons drifted from what
|
||||||
(level 2) and trusted-IP application overrides are configured here.
|
the panel shows after manual edits under `/data`.
|
||||||
*Export domain* writes a single-domain archive;
|
|
||||||
*Import a domain* on the Backup page reads one back in.
|
### Mail queue and System log
|
||||||
- **Deliveries** (`/deliveries`) — searchable send log with server-side filters
|
|
||||||
by domain and application. A row identifies its message and nothing more —
|
|
||||||
time, sender, recipient, subject and status `queued` (accepted, not yet
|
|
||||||
delivered), `sent` (handed off successfully), `deferred` (Postfix is retrying),
|
|
||||||
`bounced` (final failure), or `rejected` (refused — for example by a level-2
|
|
||||||
rate limit); *Details* opens that row's own page
|
|
||||||
(`/deliveries/{id}`). That page carries the sending domain, the application it
|
|
||||||
was submitted under, the Postfix queue id and the journal id, beside the
|
|
||||||
message's history — when it was accepted and what Postfix later reported for
|
|
||||||
the recipient — and, under both, the `mail.log` lines for its queue id: the
|
|
||||||
connection to the receiving server, the server's reply, and the status that
|
|
||||||
reply was filed as. Rows outlive `mail.log`, so an older message's lines may
|
|
||||||
have rotated away; the page says so. Retention is controlled by
|
|
||||||
`SEND_LOG_RETENTION_DAYS`.
|
|
||||||
- **Mail queue** (`/mail-queue`) — live view of messages Postfix is still
|
- **Mail queue** (`/mail-queue`) — live view of messages Postfix is still
|
||||||
trying to deliver or deferring.
|
trying to deliver or deferring.
|
||||||
- **System log** (`/system-log`) — tail of `/data/log/mail.log` (Postfix and
|
- **System log** (`/system-log`) — tail of `/data/log/mail.log` (Postfix and
|
||||||
@@ -227,69 +326,88 @@ service healthy and will mail be accepted?"
|
|||||||
hours. It lives in the data volume, so it survives a container recreate along
|
hours. It lives in the data volume, so it survives a container recreate along
|
||||||
with the rest of the state — `./data/log/` on the host — but it is *not*
|
with the rest of the state — `./data/log/` on the host — but it is *not*
|
||||||
included in backups: it is diagnostics, not state.
|
included in backups: it is diagnostics, not state.
|
||||||
- **Backup** (`/backup`) — download a full-server backup; the same page hosts
|
|
||||||
the domain-import form (`POST /domains/import`). See
|
### Settings
|
||||||
[Backup, restore, and moving a single domain](#backup-restore-and-moving-a-single-domain).
|
|
||||||
- **Settings** (`/settings`) — change the administrator username and/or
|
`/settings` changes the signed-in user's username and/or password. **Global
|
||||||
password, and the panel-wide default DMARC report address (`rua=`) offered
|
administrators** also set the panel-wide default DMARC report address (`rua=`)
|
||||||
when a domain doesn't set its own — see [DNS setup](#dns-setup). Application
|
offered when a domain doesn't set its own — see
|
||||||
SASL logins are separate and are not changed here.
|
[Domain-level DNS](#domain-level-dns-spf-dkim-dmarc). Application SASL logins
|
||||||
- **Users** (`/users`, global administrator only) — create, edit, and delete
|
are separate and are not changed here.
|
||||||
panel users. There are two roles:
|
|
||||||
- **Global administrator** — full access to every page and every domain,
|
### Users
|
||||||
|
|
||||||
|
`/users` (global administrator only) creates, edits, and deletes panel users.
|
||||||
|
There are two roles:
|
||||||
|
|
||||||
|
- **Global administrator** — full access to every page and every domain,
|
||||||
including Users, Backup, Status, Mail queue, and System log.
|
including Users, Backup, Status, Mail queue, and System log.
|
||||||
- **Domain-admin** — scoped to one or more domains assigned by a global
|
- **Domain-admin** — scoped to one or more domains assigned by a global
|
||||||
administrator. Sees only those domains' pages, applications, and
|
administrator. Sees only those domains' pages, applications, and
|
||||||
Deliveries rows; `/users`, `/backup`, `/status`, `/mail-queue`, and
|
Deliveries rows; cannot add or delete domains. `/users`, `/backup`,
|
||||||
`/system-log` are not reachable (404). A domain-admin can *export* the
|
`/status`, `/mail-queue`, `/system-log`, and `POST /reload` are not
|
||||||
domains assigned to them — see the note on working credentials below.
|
reachable (404). A domain-admin can *export* the
|
||||||
|
domains assigned to them — see
|
||||||
|
[Exporting and importing a single domain](#exporting-and-importing-a-single-domain).
|
||||||
|
|
||||||
The panel refuses to remove or demote the **last** global administrator, so
|
The panel refuses to remove or demote the **last** global administrator, so
|
||||||
it can never end up with none.
|
it can never end up with none.
|
||||||
|
|
||||||
**Sessions.** A login survives a container restart: sessions live in SQLite, not
|
### Sessions
|
||||||
in memory. Expiry is a sliding idle window (`PANEL_SESSION_IDLE_DAYS`, default
|
|
||||||
|
A login survives a container restart: sessions live in SQLite, not in
|
||||||
|
memory. Expiry is a sliding idle window (`PANEL_SESSION_IDLE_DAYS`, default
|
||||||
seven days) with no absolute lifetime cap — an admin who keeps using the panel
|
seven days) with no absolute lifetime cap — an admin who keeps using the panel
|
||||||
stays signed in indefinitely. HTMX polling on the monitoring screens
|
stays signed in indefinitely. HTMX polling on the monitoring screens
|
||||||
(Deliveries, Mail queue, System log, and the Status health fragment) does
|
(Deliveries, Mail queue, System log, and the Status health fragment) does
|
||||||
**not** count as activity, so an auto-refreshing tab left open will not keep a
|
**not** count as activity, so an auto-refreshing tab left open will not keep a
|
||||||
session alive forever. Changing the password signs out every other session but
|
session alive forever. Changing **your own** password on `/settings` signs out
|
||||||
leaves the current browser signed in.
|
every other session for that user but leaves the current browser signed in.
|
||||||
|
Signing out (`POST /logout`) ends only the current session — other browsers or
|
||||||
|
tabs for the same user keep working until their session rows expire.
|
||||||
|
|
||||||
**Upgrading.** Bump the pinned image tag in `docker-compose.yml` to the target
|
### Upgrading
|
||||||
release, then `docker compose up -d`. The backup version check requires the
|
|
||||||
running image to match the version that created a full backup — see [Fixed image
|
Bump the pinned image tag in `docker-compose.yml` to the target release, then
|
||||||
|
`docker compose up -d`. The backup version check requires the running image
|
||||||
|
to match the version that created a full backup — see [Fixed image
|
||||||
tag](#fixed-image-tag).
|
tag](#fixed-image-tag).
|
||||||
|
|
||||||
**Container health.** The image declares a Docker `HEALTHCHECK` that probes
|
### Container health
|
||||||
`GET /healthz` on port 8080 (unauthenticated). It returns `200 ok` when
|
|
||||||
OpenDKIM, the panel, and Postfix are all `RUNNING` under supervisord;
|
|
||||||
otherwise `503 unhealthy`. This catches a dead mail path that would still leave
|
|
||||||
the HTTP server up, but it does **not** verify TLS certificates, DNS records,
|
|
||||||
or end-to-end delivery — use the authenticated **Status** page for that. External
|
|
||||||
monitoring can use the same endpoint through the reverse proxy if you expose it,
|
|
||||||
or poll `docker inspect` health state on the host.
|
|
||||||
|
|
||||||
**First-time setup link.** On first start the one-time setup URL is printed in
|
The image declares a Docker `HEALTHCHECK` that probes `GET /healthz` on port
|
||||||
the container log (`docker compose logs -f`) and written to `/data/setup-token`
|
8080 (unauthenticated). It returns `200 ok` when OpenDKIM, the panel, and
|
||||||
inside the container — `./data/setup-token` on the host, mode `0600` — then
|
Postfix are all `RUNNING` under supervisord; otherwise `503 unhealthy`. This
|
||||||
deleted when setup completes. The link is
|
catches a dead mail path that would still leave the HTTP server up, but it
|
||||||
`https://<SELFPOST_HOSTNAME>/setup/<token>` (path token, not a query string),
|
does **not** verify TLS certificates, DNS records, or end-to-end delivery —
|
||||||
valid for ten minutes. If this host ships container logs to a central
|
use the authenticated [Status](#status) page for that. External monitoring
|
||||||
aggregator, prefer reading the file:
|
can use the same endpoint through the reverse proxy if you expose it, or poll
|
||||||
|
`docker inspect` health state on the host.
|
||||||
|
|
||||||
```sh
|
### Server-level DNS (PTR/rDNS)
|
||||||
docker compose exec selfpost cat /data/setup-token
|
|
||||||
```
|
|
||||||
|
|
||||||
## Rate limiting
|
Once, for the machine itself: **PTR/rDNS** for the server's IP, pointing at
|
||||||
|
its mail hostname. Most receiving mail servers weigh this heavily; get it
|
||||||
|
from whoever assigns the IP (hosting provider's panel/support), not from
|
||||||
|
your own DNS zone.
|
||||||
|
|
||||||
SelfPost applies two independent layers; both can refuse a submission, but only
|
The [Status](#status) page verifies the server's hostname against this
|
||||||
level 2 writes a `rejected` row in the send log. Level-2 ceilings set in the
|
record (forward-confirmed reverse DNS). Results are cached for about one
|
||||||
panel cannot exceed level 1 (the panel shows the level-1 values and rejects
|
minute; use *Re-check* right after publishing a record.
|
||||||
higher numbers).
|
|
||||||
|
|
||||||
**Level 1 (IP backstop)** — always on, configured via `.env`:
|
Per-domain DNS (SPF, DKIM, DMARC) is a separate scope — see
|
||||||
|
[Domain-level DNS](#domain-level-dns-spf-dkim-dmarc).
|
||||||
|
|
||||||
|
### Rate limiting — level 1 (IP backstop)
|
||||||
|
|
||||||
|
SelfPost applies two independent layers of rate limiting; both can refuse a
|
||||||
|
submission, but only level 2 (domain/application, see
|
||||||
|
[Domain administration](#rate-limiting--level-2-domain-and-application))
|
||||||
|
writes a `rejected` row in the send log. Level-2 ceilings set in the panel
|
||||||
|
cannot exceed level 1 (the panel shows the level-1 values and rejects higher
|
||||||
|
numbers).
|
||||||
|
|
||||||
|
Level 1 is always on, configured via `.env`:
|
||||||
|
|
||||||
- `RATE_LIMIT_MESSAGES_PER_IP` → Postfix `smtpd_client_message_rate_limit`
|
- `RATE_LIMIT_MESSAGES_PER_IP` → Postfix `smtpd_client_message_rate_limit`
|
||||||
- `RATE_LIMIT_WINDOW_SECONDS` → Postfix `anvil_rate_time_unit`
|
- `RATE_LIMIT_WINDOW_SECONDS` → Postfix `anvil_rate_time_unit`
|
||||||
@@ -297,81 +415,126 @@ higher numbers).
|
|||||||
This is an anvil limit per connecting client IP. It keeps working even if the
|
This is an anvil limit per connecting client IP. It keeps working even if the
|
||||||
journal-milter (level 2) is down. There is no per-IP bypass.
|
journal-milter (level 2) is down. There is no per-IP bypass.
|
||||||
|
|
||||||
**Level 2 — domain** — optional, on each domain's page. A message ceiling and
|
### Full backup and restore
|
||||||
window for **every** client IP sending as that domain. When unset, only
|
|
||||||
level 1 applies for non-privileged senders.
|
|
||||||
|
|
||||||
**Level 2 — application (trusted IPs)** — optional override on an application:
|
**Full backup** is a self-contained project archive: `data/` (SQLite, all
|
||||||
list one or more client IPs and a ceiling **strictly above** the domain limit
|
domains' DKIM keys, all applications' SASL credentials, the Postfix queue,
|
||||||
(still ≤ level 1). Connections from those IPs use the application ceiling and
|
`manifest.json` with the version that created it), plus `docker-compose.yml`,
|
||||||
skip the domain check. Other IPs stay under the domain limit (or level 1 alone).
|
`.env`, and `certs/` from the operator directory next to `./data`. Delivery
|
||||||
An application override without trusted IPs is inactive.
|
logs under `data/log/` are excluded. The base compose file mounts the project
|
||||||
|
directory read-only at `/selfpost-deploy` so the panel and CLI can read those
|
||||||
|
deploy files — without that mount, *Full backup* refuses with an error.
|
||||||
|
|
||||||
When a level-2 ceiling is exceeded, Postfix returns a 4xx and the refusal is
|
Take a backup from the panel (*Backup* → *Full backup*) or from the host:
|
||||||
recorded in Deliveries as `rejected`.
|
|
||||||
|
|
||||||
**Level 2 is best-effort, not a guarantee.** It runs inside the journal-milter
|
```sh
|
||||||
and is deliberately fail-open: if the rate-limit lookup hits a store error, or
|
docker exec <container> selfpost-backup > selfpost-backup.tar.gz
|
||||||
the connecting client's IP is not available to the milter, level 2 is skipped
|
```
|
||||||
and the message is accepted rather than held up. Level 1 (the Postfix anvil
|
|
||||||
limit above) is the backstop that keeps working even when level 2 cannot run.
|
|
||||||
|
|
||||||
## Backup, restore, and moving a single domain
|
**Restore** means unpacking that archive into an **empty project directory**
|
||||||
|
(not into `./data` alone) and starting a container of the **exact same image
|
||||||
|
version** that created it — SelfPost refuses to start otherwise and tells you
|
||||||
|
which tag to use. On the first successful start after restore, `data/manifest.json`
|
||||||
|
from the archive is **deleted** — it guards only that one boot, so a later
|
||||||
|
in-place upgrade is not blocked. On that same first boot the panel also runs
|
||||||
|
one **Resync** — OpenDKIM's tables and Postfix's sender map are re-derived from
|
||||||
|
SQLite and both daemons are reloaded, healing any drift between the extracted
|
||||||
|
files and the database (the Status page's *Reload configuration* button runs
|
||||||
|
the same step on demand). This is why the compose file pins a fixed tag rather
|
||||||
|
than `:latest`: without a known version, there'd be no way to tell which image
|
||||||
|
restoring a given backup actually requires (see [Fixed image
|
||||||
|
tag](#fixed-image-tag)).
|
||||||
|
|
||||||
Two related but distinct operations
|
**Restoring in place** (same host — recovering from data loss, or rolling
|
||||||
([architecture.md](architecture.md) § Persistence):
|
back after a bad change):
|
||||||
|
|
||||||
- **Full backup** (whole `/data` except `log/`: SQLite, all domains' DKIM keys,
|
```sh
|
||||||
all applications' SASL credentials, `manifest.json` with the version that
|
# 1. Stop the instance being replaced
|
||||||
created it): panel button (*Backup* → *Full backup*), or from the
|
docker compose down
|
||||||
host:
|
|
||||||
```sh
|
|
||||||
docker exec <container> selfpost-backup > selfpost-backup.tar.gz
|
|
||||||
```
|
|
||||||
**Restore** means unpacking that archive into a fresh `/data` bind mount and
|
|
||||||
starting a container of the **exact same image version** that created it —
|
|
||||||
SelfPost refuses to start otherwise and tells you which tag to use. On the
|
|
||||||
first successful start after restore, `manifest.json` from the archive is
|
|
||||||
**deleted** — it guards only that one boot, so a later in-place upgrade is
|
|
||||||
not blocked. This is why the compose file pins a fixed tag rather than
|
|
||||||
`:latest`: without a known version, there'd be no way to tell which image
|
|
||||||
restoring a given backup actually requires.
|
|
||||||
|
|
||||||
Restoring an archive taken **before** you invalidated a session (password
|
# 2. Move the current project aside rather than deleting it
|
||||||
change, logout everywhere) can bring that session back: session rows travel
|
mv . ../selfpost.before-restore
|
||||||
with the backup, and a browser that still holds the matching cookie is
|
mkdir selfpost && cd selfpost
|
||||||
logged in again once the idle timeout allows it. If a restore might do this,
|
|
||||||
changing every user's password afterwards clears it out.
|
|
||||||
|
|
||||||
**Alternative: archive `./data` while stopped.** If the service can be taken
|
# 3. Unpack the backup into the fresh directory
|
||||||
offline, `docker compose down` then `tar czf selfpost-data.tar.gz ./data` on
|
tar xzf ../selfpost-backup.tar.gz
|
||||||
the host is safe — nothing is writing to SQLite. Unlike the panel/CLI backup
|
|
||||||
this sweeps in `./data/log/` too, which is Postfix's raw log and usually the
|
|
||||||
bulk of the archive; add `--exclude=./data/log` if you only want the state.
|
|
||||||
Do **not** tar `./data` while
|
|
||||||
the container is running: the database uses WAL mode and a naive copy can
|
|
||||||
capture an inconsistent snapshot. The panel/CLI backup remains preferable when
|
|
||||||
you cannot afford downtime because it takes a consistent SQLite snapshot via
|
|
||||||
the Backup API on a live container.
|
|
||||||
|
|
||||||
- **Export/import a single domain** (domain page → *Export domain* to write the
|
# 4. docker-compose.yml in the archive must pin the exact tag the backup was
|
||||||
file, *Backup* → *Import a domain* to read it back in): moves one domain — its DKIM key and its applications' **working**
|
# made with — check if unsure:
|
||||||
SASL passwords — to a different SelfPost instance without regenerating
|
tar xzf ../selfpost-backup.tar.gz -O data/manifest.json
|
||||||
anything, so DNS (the DKIM TXT record) doesn't need to change. Unlike a full
|
|
||||||
restore, this works across different hostnames/instances. *Import* is
|
|
||||||
global-administrator only; *export* is available to any user who can access
|
|
||||||
the domain, **including a domain-admin** for a domain assigned to them — so
|
|
||||||
a domain-admin can walk away with that domain's working SASL passwords in
|
|
||||||
the clear. Weigh that when deciding which domains to assign to a
|
|
||||||
domain-admin account.
|
|
||||||
|
|
||||||
Both files are **secrets** — they contain the admin password hash (full
|
# 5. Start it and watch the boot
|
||||||
backup) or working application credentials (domain export) in the clear or in
|
docker compose up -d
|
||||||
directly reversible form. Treat them like any other credential material:
|
docker compose logs -f selfpost
|
||||||
restrict who can read them, don't email them around — and encrypt them, which
|
```
|
||||||
SelfPost can do for you.
|
|
||||||
|
|
||||||
### Encrypting a backup or export
|
A version mismatch at step 5 refuses to start and leaves `/data` untouched —
|
||||||
|
the panel exits with a message naming the tag to use, e.g.:
|
||||||
|
|
||||||
|
```
|
||||||
|
backup: this backup was created by SelfPost 1.2.3 but this image is 1.3.0 — restore into the matching image (selfpost:1.2.3)
|
||||||
|
```
|
||||||
|
|
||||||
|
Fix the tag in `docker-compose.yml`, `docker compose pull && docker compose up
|
||||||
|
-d` again — the manifest is still there because the failed boot never got to
|
||||||
|
delete it.
|
||||||
|
|
||||||
|
**Moving to a different host** is the same flow: create an empty project
|
||||||
|
directory, unpack the backup there, edit `.env` (and `docker-compose.yml` if
|
||||||
|
needed) for the new hostname or proxy, then `docker compose up -d`. The archive
|
||||||
|
carries `certs/` from the old host — re-issue certificates when the hostname or
|
||||||
|
IP changes. Set up the reverse-proxy vhost separately (not in the backup).
|
||||||
|
|
||||||
|
**Restoring an encrypted (`.spbk`) backup** needs a running container to
|
||||||
|
decrypt it first — any container with the `selfpost-backup` CLI works; decryption
|
||||||
|
does not read `/data` and performs no version check. Start one normally
|
||||||
|
(step 5, but on an empty project you have not unpacked yet), then:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
docker exec -i <container> selfpost-backup -decrypt < backup.spbk > selfpost-backup.tar.gz
|
||||||
|
```
|
||||||
|
|
||||||
|
Stop it, wipe the project directory again, and continue from step 2 above with
|
||||||
|
the resulting `.tar.gz` — see [Encrypting a backup or
|
||||||
|
export](#encrypting-a-backup-or-export) for the decrypt command's password
|
||||||
|
options.
|
||||||
|
|
||||||
|
**Archives from older SelfPost versions** (flat layout: `manifest.json` and
|
||||||
|
`selfpost.db` at the archive root, no `data/` prefix, no deploy files) restore
|
||||||
|
with the previous procedure: `tar xzf backup.tar.gz -C ./data` into a project
|
||||||
|
that already has `docker-compose.yml` and `.env`.
|
||||||
|
|
||||||
|
Restoring an archive taken **before** a session row was removed can bring
|
||||||
|
that session back: session rows travel with the backup, and a browser that
|
||||||
|
still holds the matching cookie is signed in again on the next request if the
|
||||||
|
restored row's idle expiry has not passed. `POST /logout` removes only the
|
||||||
|
current session; there is no "logout everywhere". Changing your own password
|
||||||
|
on `/settings` deletes your other sessions, but a global administrator
|
||||||
|
resetting another user's password on `/users` does not invalidate that user's
|
||||||
|
existing sessions.
|
||||||
|
|
||||||
|
**Alternative: archive `./data` while stopped.** If the service can be taken
|
||||||
|
offline, `docker compose down` then `tar czf selfpost-data.tar.gz ./data` on
|
||||||
|
the host is safe — nothing is writing to SQLite. Unlike the panel/CLI backup
|
||||||
|
this sweeps in `./data/log/` too, which is Postfix's raw log and usually the
|
||||||
|
bulk of the archive; add `--exclude=./data/log` if you only want the state.
|
||||||
|
Do **not** tar `./data` while the container is running: the database uses
|
||||||
|
WAL mode and a naive copy can capture an inconsistent snapshot. The
|
||||||
|
panel/CLI backup remains preferable when you cannot afford downtime because
|
||||||
|
it takes a consistent SQLite snapshot via the Backup API on a live
|
||||||
|
container.
|
||||||
|
|
||||||
|
See also [Exporting and importing a single
|
||||||
|
domain](#exporting-and-importing-a-single-domain) — a different, domain-scoped
|
||||||
|
operation that also lives on the *Backup* page (`/backup`).
|
||||||
|
|
||||||
|
Both a full backup and a domain export are **secrets** — they contain the
|
||||||
|
admin password hash (full backup), TLS private keys and `.env` (full backup),
|
||||||
|
or working application credentials (domain export) in the clear or in
|
||||||
|
directly reversible form. Treat them like any other credential material: restrict who can read them, don't email them
|
||||||
|
around — and encrypt them, which SelfPost can do for you.
|
||||||
|
|
||||||
|
#### Encrypting a backup or export
|
||||||
|
|
||||||
Both download forms carry an **Encrypt with a password** checkbox. Ticked, the
|
Both download forms carry an **Encrypt with a password** checkbox. Ticked, the
|
||||||
file that comes down is an encrypted envelope instead of the plain archive:
|
file that comes down is an encrypted envelope instead of the plain archive:
|
||||||
@@ -411,21 +574,121 @@ docker exec -e SELFPOST_BACKUP_PASSWORD="$PW" <container> selfpost-backup > back
|
|||||||
|
|
||||||
With no password set, the CLI keeps writing the plain `.tar.gz` it always has.
|
With no password set, the CLI keeps writing the plain `.tar.gz` it always has.
|
||||||
|
|
||||||
## Published ports
|
## Domain administration
|
||||||
|
|
||||||
`deploy/docker-compose.yml` maps **465** and **587** to the host. Port 465
|
### Domains page
|
||||||
(smtps) is always active. Port **587** is published even when
|
|
||||||
`SUBMISSION_ENABLE=false`; nothing listens until you set it to `true` — harmless,
|
|
||||||
but it can look like an open port in external scans.
|
|
||||||
|
|
||||||
## Fixed image tag
|
`/domains` lists sending domains and hosts the add-domain form (**global
|
||||||
|
administrator only**). Domain administrators see only domains assigned to
|
||||||
|
them. Each row shows its DKIM TXT value, SPF/DMARC checks, and SASL
|
||||||
|
applications. Per-domain rate limits (level 2) and trusted-IP application
|
||||||
|
overrides are configured here — see [Rate limiting —
|
||||||
|
level 2](#rate-limiting--level-2-domain-and-application). *Export domain*
|
||||||
|
writes a single-domain archive; *Import a domain* on the Backup page reads
|
||||||
|
one back in (**global administrator only**) — see [Exporting and importing a single
|
||||||
|
domain](#exporting-and-importing-a-single-domain).
|
||||||
|
|
||||||
`deploy/docker-compose.yml` pins an explicit version (`ghcr.io/mixeme/selfpost:X.Y.Z`),
|
### Domain-level DNS (SPF, DKIM, DMARC)
|
||||||
deliberately never `:latest`. The current pin is `1.2.5`. Intermediate
|
|
||||||
CHANGELOG sections (`0.2.0`…`0.6.0`) record development cuts from before that
|
For *every* sending domain you add in the panel:
|
||||||
image was published. Pinning matters because of the backup version check above:
|
|
||||||
the panel binary's embedded version and the image tag that produced it are the
|
- **SPF** — a TXT record on the domain authorizing this server to send on its
|
||||||
same value by construction (the release CI stamps both from one git tag — see
|
behalf (e.g. `v=spf1 a mx ip4:<server IP> -all`, adjusted to your setup).
|
||||||
`.github/workflows/release.yml`), so the pin is what makes "restore into the
|
- **DKIM** — a TXT record with the exact value the panel shows on that
|
||||||
same version" a checkable fact rather than a guess. Upgrade by bumping the tag
|
domain's page (`domain page → DKIM TXT record`), one selector per domain.
|
||||||
deliberately, not by riding a moving target.
|
- **DMARC** — a `_dmarc` TXT record. The panel suggests `p=none` (monitoring
|
||||||
|
only, safe to publish immediately). On a send-only relay the sending domain
|
||||||
|
often has no inbox, so `rua=` is optional — configure a default report address
|
||||||
|
in *Settings* (see [Settings](#settings)) or per domain when you have a
|
||||||
|
mailbox that receives inbound mail elsewhere. If `rua=` points at another
|
||||||
|
domain, publish `_report._dmarc` on that hub domain too; the panel checks
|
||||||
|
it. Public mail hosts (Gmail, Outlook, …) cannot be used as external
|
||||||
|
report destinations.
|
||||||
|
|
||||||
|
Skipping any of the three records is the single most common reason mail
|
||||||
|
lands in spam even though SelfPost delivered it correctly — DKIM passing
|
||||||
|
doesn't help if SPF/DMARC are absent. **Whenever you add a new domain in the
|
||||||
|
panel, add its DNS records at the same time**, not later.
|
||||||
|
|
||||||
|
Each domain's page shows a *DNS status* card comparing the published DKIM
|
||||||
|
record against the key this server signs with, plus the domain's SPF,
|
||||||
|
DMARC, and (when configured) DMARC report-authorisation records. Results are
|
||||||
|
cached for a few minutes; use *Re-check* right after publishing a record.
|
||||||
|
The SPF check is deliberately shallow — it looks for a mechanism that
|
||||||
|
literally covers this server's address and does not follow `include:` or
|
||||||
|
`redirect=`, so a record that authorizes the server through an include is
|
||||||
|
reported as "cannot tell" rather than as a failure.
|
||||||
|
|
||||||
|
Server-level DNS (the PTR/rDNS record) is a separate, once-per-machine scope
|
||||||
|
— see [Server-level DNS](#server-level-dns-ptrrdns).
|
||||||
|
|
||||||
|
### IP warmup
|
||||||
|
|
||||||
|
A brand-new IP has no sending history, so receiving servers are cautious with
|
||||||
|
it regardless of how correct your DKIM/SPF/DMARC are. Start with low volume to
|
||||||
|
a domain, increase gradually over days/weeks rather than sending everything on
|
||||||
|
day one, and check the IP against major blocklists (Spamhaus and similar)
|
||||||
|
before and during warmup. This is inherent to how mail reputation works on the
|
||||||
|
public internet, not something SelfPost's configuration can shortcut.
|
||||||
|
|
||||||
|
### Rate limiting — level 2 (domain and application)
|
||||||
|
|
||||||
|
Level 2 is optional, configured on each domain's page, and layers on top of
|
||||||
|
the always-on [level-1 IP backstop](#rate-limiting--level-1-ip-backstop).
|
||||||
|
Level-2 ceilings cannot exceed level 1 (the panel shows the level-1 values
|
||||||
|
and rejects higher numbers). When a level-2 ceiling is exceeded, Postfix
|
||||||
|
returns a 4xx and the refusal is recorded in [Deliveries](#deliveries) as
|
||||||
|
`rejected`.
|
||||||
|
|
||||||
|
**Level 2 — domain** — a message ceiling and window for **every** client IP
|
||||||
|
sending as that domain. When unset, only level 1 applies for non-privileged
|
||||||
|
senders.
|
||||||
|
|
||||||
|
**Level 2 — application (trusted IPs)** — optional override on an
|
||||||
|
application: list one or more client IPs and a ceiling **strictly above**
|
||||||
|
the domain limit (still ≤ level 1). Connections from those IPs use the
|
||||||
|
application ceiling and skip the domain check. Other IPs stay under the
|
||||||
|
domain limit (or level 1 alone). An application override without trusted
|
||||||
|
IPs is inactive.
|
||||||
|
|
||||||
|
**Level 2 is best-effort, not a guarantee.** It runs inside the
|
||||||
|
journal-milter and is deliberately fail-open: if the rate-limit lookup hits
|
||||||
|
a store error, or the connecting client's IP is not available to the
|
||||||
|
milter, level 2 is skipped and the message is accepted rather than held up.
|
||||||
|
Level 1 is the backstop that keeps working even when level 2 cannot run.
|
||||||
|
|
||||||
|
### Deliveries
|
||||||
|
|
||||||
|
`/deliveries` is a searchable send log with server-side filters by domain
|
||||||
|
and application. A row identifies its message and nothing more — time,
|
||||||
|
sender, recipient, subject and status `queued` (accepted, not yet
|
||||||
|
delivered), `sent` (handed off successfully), `deferred` (Postfix is
|
||||||
|
retrying), `bounced` (final failure), or `rejected` (refused — for example
|
||||||
|
by a [level-2 rate limit](#rate-limiting--level-2-domain-and-application));
|
||||||
|
*Details* opens that row's own page (`/deliveries/{id}`). That page carries
|
||||||
|
the sending domain, the application it was submitted under, the Postfix
|
||||||
|
queue id and the journal id, beside the message's history — when it was
|
||||||
|
accepted and what Postfix later reported for the recipient — and, under
|
||||||
|
both, the `mail.log` lines for its queue id: the connection to the
|
||||||
|
receiving server, the server's reply, and the status that reply was filed
|
||||||
|
as. Rows outlive `mail.log`, so an older message's lines may have rotated
|
||||||
|
away; the page says so. Retention is controlled by
|
||||||
|
`SEND_LOG_RETENTION_DAYS`.
|
||||||
|
|
||||||
|
### Exporting and importing a single domain
|
||||||
|
|
||||||
|
Domain page → *Export domain* to write the file, *Backup* → *Import a
|
||||||
|
domain* to read it back in. This moves one domain — its DKIM key and its
|
||||||
|
applications' **working** SASL passwords — to a different SelfPost instance
|
||||||
|
without regenerating anything, so DNS (the DKIM TXT record) doesn't need to
|
||||||
|
change. Unlike a full restore (see [Full backup and
|
||||||
|
restore](#full-backup-and-restore)), this works across different
|
||||||
|
hostnames/instances. *Import* is global-administrator only; *export* is
|
||||||
|
available to any user who can access the domain, **including a domain-admin**
|
||||||
|
for a domain assigned to them — so a domain-admin can walk away with that
|
||||||
|
domain's working SASL passwords in the clear. Weigh that when deciding which
|
||||||
|
domains to assign to a domain-admin account.
|
||||||
|
|
||||||
|
A domain export is a secret in the same way a full backup is, and can be
|
||||||
|
encrypted the same way — see [Encrypting a backup or
|
||||||
|
export](#encrypting-a-backup-or-export).
|
||||||
|
|||||||
@@ -1,648 +0,0 @@
|
|||||||
# Plan: code-review (full-tree review follow-ups)
|
|
||||||
|
|
||||||
**Status:** agreed
|
|
||||||
**Date:** 2026-08-13
|
|
||||||
**Reviewer:** Cursor Grok 4.6 (whole-tree authorship review). This is **not**
|
|
||||||
the Fable pre-release security audit in [development.md](../development.md) §
|
|
||||||
Model routing; a Fable pass is a later step on the P0 diff.
|
|
||||||
**Version:** patch for defects; docs/UI follow-ups have no schema.
|
|
||||||
**Order:** **P0 before inbound-relay.** P0 is a shipped RBAC hole, not a
|
|
||||||
feature. Remaining phases after P0, or interleaved with inbound-relay by
|
|
||||||
agreement.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Goal
|
|
||||||
|
|
||||||
Record the 2026-08-13 full-tree review (architecture, complexity, quality,
|
|
||||||
docs, maintainability, logic, refactor, licence, legacy, stubs, GUI, disputed
|
|
||||||
decisions, edge cases, tests, duplication) and a phased implementation
|
|
||||||
checklist with a recommended model per step, using the routing table in
|
|
||||||
[development.md](../development.md).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Verdict
|
|
||||||
|
|
||||||
SelfPost is a compact, well-bounded 1.x product: one image, one SQLite file,
|
|
||||||
thin `domain`/`app` services for multi-store writes, a fail-open journal
|
|
||||||
milter with a Postfix level-1 backstop, and documentation that is unusually
|
|
||||||
honest about accepted risks. Complexity matches the scale (~10.7k production
|
|
||||||
Go lines, ~5.8k unit-test lines, ~1.2k HTML, 749 CSS, 281 JS). Comments
|
|
||||||
explain decisions rather than restating code.
|
|
||||||
|
|
||||||
The outstanding defect is **send-log authorization for domain administrators**
|
|
||||||
(confidentiality). After that, the work is tightening a few fail-open paths,
|
|
||||||
catching docs that froze at “single administrator”, small GUI bugs from the
|
|
||||||
1.2.x layout pass, and filling test gaps around auth/RBAC. Do **not** use this
|
|
||||||
review as a licence to rewrite layers, squash migrations in 1.x, or add CSRF tokens
|
|
||||||
without revisiting the ADR.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## How to read this file
|
|
||||||
|
|
||||||
Findings are grouped by the sixteen review questions. Each finding has a
|
|
||||||
severity (**H**igh / **M**edium / **L**ow / **I**nfo). The implementation
|
|
||||||
checklist at the end is the work queue; it names the model for each step.
|
|
||||||
|
|
||||||
**Models** (from [development.md](../development.md)):
|
|
||||||
|
|
||||||
| Kind of work | Model |
|
|
||||||
|---|---|
|
|
||||||
| Security, infra, mail path, permissions, open-relay risk | **Opus** |
|
|
||||||
| UI / JS / CSS, templates, documentation (English) | **Sonnet** |
|
|
||||||
| Trivial mechanics: retarget links, grep, compose bump, comment fixes | **Haiku** |
|
|
||||||
| Security **review** of a diff (not authorship) | **Fable** |
|
|
||||||
|
|
||||||
Reviewers must not be the author of the code under review.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. Architecture / structure
|
|
||||||
|
|
||||||
**Proportionate.** Composition root in `cmd/panel` (HTTP + journal-milter +
|
|
||||||
log-tailer, one `*store.Store`). `internal/domain` and `internal/app` own
|
|
||||||
multi-store writes and rollback. Adapters (`postfix`, `milter`, `logtail`,
|
|
||||||
`dnscheck`, `health`, `backup`, `secretfile`) are the only infrastructure-aware
|
|
||||||
code. Interfaces exist where they break import cycles or enable fakes
|
|
||||||
(`domain.Applications`, `app.SenderMaps`, `milter.Store`, `logtail.StatusStore`)
|
|
||||||
— not as a DI framework.
|
|
||||||
|
|
||||||
Handlers may call `store` directly for single-table reads (documented in
|
|
||||||
[architecture.md](../architecture.md) § Code layers). That is followed for
|
|
||||||
sessions, send-log queries, users, and DMARC settings. It is not a layering
|
|
||||||
violation; it is an incomplete service boundary that will hurt if those
|
|
||||||
surfaces keep growing.
|
|
||||||
|
|
||||||
No circular Go imports. `MaxOpenConns(1)` on SQLite is an intentional
|
|
||||||
single-connection trade-off for the three in-process roles.
|
|
||||||
|
|
||||||
| Sev | Finding |
|
|
||||||
|---|---|
|
|
||||||
| **M** | Users, send-log listing, and global DMARC settings have no service; handlers talk to `store`. Fine at current size; do not invent a service until a second writer appears. |
|
|
||||||
| **L** | `auth.RequireGlobal` (`internal/web/auth/middleware.go`) is unused; handlers duplicate `requireGlobal`. Either wire the middleware on `/users`, `/backup`, `/status`, `/mail-queue`, `/system-log` or delete the unused helper. |
|
|
||||||
| **L** | `HandleAccount` / `handlers_account.go` still use the pre-1.2.3 “account” name while the route is `/settings`. |
|
|
||||||
| **I** | Package comment on `internal/store` still says “the administrator account” after migration `0005` replaced `admin` with `users`. |
|
|
||||||
|
|
||||||
**Do not:** introduce a repository layer, split the panel binary, or move
|
|
||||||
SQLite behind an interface “for testability” — the existing fakes are enough.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. Complexity vs project scale
|
|
||||||
|
|
||||||
The code is **not over-engineered**. A few files are large because the problem
|
|
||||||
is large, not because of unused abstraction:
|
|
||||||
|
|
||||||
| File | ~Lines | Note |
|
|
||||||
|---|---|---|
|
|
||||||
| `internal/health/machine.go` | 622 | Cohesive `/proc` sampler |
|
|
||||||
| `internal/logtail/logtail.go` | 528 | Follow + rotate + reconcile + retention |
|
|
||||||
| `internal/web/handlers/handlers_monitor.go` | 481 | Send-log UI + authz (this is where P0 lives) |
|
|
||||||
| `internal/web/view/templates/domain_detail.html` | 476 | DNS + apps + limits + export; composition debt |
|
|
||||||
| `internal/secretfile/secretfile.go` | ~423 | Isolated crypto envelope |
|
|
||||||
| `internal/web/view/static/panel.css` | 749 | Tokens + layout; comment-heavy by design |
|
|
||||||
|
|
||||||
Comments are long and mostly load-bearing (threat, fail-open, why not the
|
|
||||||
obvious alternative). The cost is scanability: some files are 30–40% prose.
|
|
||||||
That matches the project’s disclosed AI-authorship style
|
|
||||||
([development.md](../development.md) § Authorship). Do not strip comments in
|
|
||||||
the name of “cleanup”. Update the stale ones (see §4).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. Code quality
|
|
||||||
|
|
||||||
Naming matches the docs (`domain` / `application`, level-1 / level-2). Errors
|
|
||||||
on the mail path log-and-continue (intentional fail-open). Panel paths log and
|
|
||||||
return 4xx/5xx. `crypto/rand` failure panics in `auth/token.go` — acceptable.
|
|
||||||
|
|
||||||
Context is used for process lifetime and DNS timeouts, not for SQLite (correct
|
|
||||||
with one connection). Dashboard DNS checks write distinct `rows[i]` from
|
|
||||||
goroutines; Go 1.22+ loop semantics make that safe (`go.mod` is 1.26).
|
|
||||||
|
|
||||||
Magic numbers are mostly named (`reservationTTL`, `renewThreshold`, CSP/HSTS).
|
|
||||||
Env defaults live in `loadConfig`.
|
|
||||||
|
|
||||||
| Sev | Finding |
|
|
||||||
|---|---|
|
|
||||||
| **M** | `sessionStore.Create` logs a DB error and still returns the token (`internal/web/auth/session.go`). Login sets the cookie; the next request bounces to `/login`. Fail closed: no cookie, error page. |
|
|
||||||
| **M** | `app.Service.Delete` removes the registry row **before** SASL / rate-limit cleanup. SASL failure → orphaned `sasldb2` account that can still authenticate. Domain delete does SASL first (`domain/service.go`). Align app delete with that order (or compensate: restore the row on SASL failure). |
|
|
||||||
| **L** | Login/setup `rateLimiter` sweeps expired buckets only when creating a **new** key. Many unique IPs grow the map until restart. Cap the map or sweep on a timer. |
|
|
||||||
| **L** | `parseTrustedProxies` skips invalid CIDRs instead of refusing to start. Silent misconfiguration of `TRUSTED_PROXY_CIDR`. |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. Documentation completeness vs code; comments
|
|
||||||
|
|
||||||
Docs are a first-class artefact (env regression test, architecture as-built,
|
|
||||||
security accepted-risks). The drift is concentrated where **domain-admin
|
|
||||||
shipped in 1.2.0** and several files still argue “single-user”.
|
|
||||||
|
|
||||||
| Sev | Finding |
|
|
||||||
|---|---|
|
|
||||||
| **M** | [guide.md](../guide.md) Operations never mentions **Users** (`/users`) or the domain-admin role. Architecture and product do. An operator reading only the guide does not know the panel is multi-user. |
|
|
||||||
| **M** | [security.md](../security.md) CSRF ADR still says the panel is single-user and “revisit if multi-user”. Multi-user shipped. The origin-check decision can stand; the **rationale and revisit trigger must be rewritten**. |
|
|
||||||
| **M** | [security.md](../security.md) says passwords are “bcrypt (or argon2)”. Code is bcrypt only. |
|
|
||||||
| **M** | `internal/backup` package comment claims the panel **regenerates** Postfix/OpenDKIM maps from SQLite on every start after restore. Startup only runs `CheckRestore` (`cmd/panel/main.go`). Maps/keys are **in** the tarball. Heal path is the Status **Reload** button. |
|
|
||||||
| **L** | Architecture route table omits `/license` and the `/account` → `/settings` 308. |
|
|
||||||
| **L** | Guide Settings section: “change the administrator username and/or password” — global Settings also has the default DMARC `rua=` address. |
|
|
||||||
| **L** | Guide does not warn that restoring an **older** backup can resurrect sessions (architecture does). |
|
|
||||||
| **L** | Guide rate-limiting section does not stress that level 2 is **fail-open** (store error or missing client IP → mail continues; level 1 is the backstop). |
|
|
||||||
| **L** | [roadmap.md](../roadmap.md) and [plans/dmarc-reports.md](dmarc-reports.md) still say `admin.dmarc_report_email` after `0005` moved it to `settings`. |
|
|
||||||
| **L** | `setupManager` comments still say “admin row”; the fact is `users` / `UserExists()`. “Plan B.1 / C.4” comments are opaque to outsiders; keep them, they are history, not errors. |
|
|
||||||
| **I** | E2e coverage summary in development.md omits logrotate and supervisor-process checks that actually run. |
|
|
||||||
| **I** | [plans/logrotate-mode.md](logrotate-mode.md) is **done** but still in `docs/plans/` (active-plans directory). History belongs in git / CHANGELOG. |
|
|
||||||
|
|
||||||
Comments in production code are generally **high quality**. Missing comments
|
|
||||||
are on domain-admin authorization policy in `sendLogData` (the P0 hole has no
|
|
||||||
comment stating the intended invariant) and on `rateLimiter` memory bounds.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. Human readability and maintainability
|
|
||||||
|
|
||||||
A new maintainer can follow the tree from [architecture.md](../architecture.md)
|
|
||||||
into `cmd/panel` → `internal/web/web.go` → services. Tests document *why*
|
|
||||||
(milter in-flight, queue-id anchoring, CSRF matrix).
|
|
||||||
|
|
||||||
Friction:
|
|
||||||
|
|
||||||
- `domain_detail.html` is the hardest HTML file to edit (repeated DNS
|
|
||||||
host/type/value blocks, checkbox “Edit” panels).
|
|
||||||
- `panel.css` structure-tied selectors (`.muted + form > select:first-of-type`)
|
|
||||||
will break on a copy change.
|
|
||||||
- Dual `CurrentUser` + `Principal` is redundant but works (`withPrincipal`
|
|
||||||
sets both).
|
|
||||||
- `assignedDomains` loads **all** domains then filters in Go, while
|
|
||||||
`store.listUserDomainNames` already exists and is unused by handlers.
|
|
||||||
|
|
||||||
None of this blocks maintenance at current size. Prefer small extractions
|
|
||||||
(DNS partial, `tryAdmit`) over a layer rewrite.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. Logical errors
|
|
||||||
|
|
||||||
### H — Domain-admin send-log list leaks other domains
|
|
||||||
|
|
||||||
Detail page checks membership (`HandleDelivery`). The **list** does not.
|
|
||||||
|
|
||||||
`sendLogData` in `internal/web/handlers/handlers_monitor.go`:
|
|
||||||
|
|
||||||
- Empty `SendLogFilter.Domain` means “all rows” (`internal/store/sendlog.go`).
|
|
||||||
- For a non-global user, a disallowed `?domain=` is cleared to `""`. The
|
|
||||||
assigned domain is filled in **only when there is exactly one**.
|
|
||||||
- A domain-admin with **0 or ≥2** assigned domains and no (or a forged)
|
|
||||||
domain filter therefore sees **every** send-log row (From, To, Subject).
|
|
||||||
- `?app=` is applied to SQL **before** it is checked against the user’s
|
|
||||||
application logins. The allowlist only updates the template’s selected
|
|
||||||
filter. Forged `?app=<foreign-login>` with an empty domain filter returns
|
|
||||||
that application’s rows.
|
|
||||||
|
|
||||||
The deliveries table’s domain dropdown still lists only assigned domains, so
|
|
||||||
the leak is silent.
|
|
||||||
|
|
||||||
**Invariant to implement:** a non-global principal’s `QuerySendLog` /
|
|
||||||
`CountSendLog` are always constrained to assigned domain names; if that set is
|
|
||||||
empty, the result is empty. Validate `AppLogin` against the allowlist
|
|
||||||
**before** the query.
|
|
||||||
|
|
||||||
### M — Level-2 check/reserve race
|
|
||||||
|
|
||||||
`enforceLimit` calls `flight.count` then `flight.reserve` under **separate**
|
|
||||||
mutex acquisitions (`internal/milter/ratelimit.go`, `inflight.go`). Two MAIL
|
|
||||||
FROM handlers can both observe `n == max-1` and both reserve. In-flight
|
|
||||||
tracking closes the *stored-count* race (and
|
|
||||||
`TestRateLimitCountsInFlightMessages` covers the **sequential** case). It does
|
|
||||||
not close parallel check-then-act. Severity is tempered by fail-open and
|
|
||||||
Postfix level-1. Fix: one `tryAdmit(key, since, max)` under the inflight
|
|
||||||
mutex.
|
|
||||||
|
|
||||||
### M — Session create fail-open
|
|
||||||
|
|
||||||
See §3. Not a stolen-session bug (hash never lands in the DB); it is a
|
|
||||||
logged-in-looking cookie that cannot be looked up.
|
|
||||||
|
|
||||||
### M — App delete ordering
|
|
||||||
|
|
||||||
See §3. Orphaned SASL is a mail-path consistency bug.
|
|
||||||
|
|
||||||
### L — Domain export `Version` ignored on import
|
|
||||||
|
|
||||||
`internal/domain/transfer.go` stamps `buildinfo.Version`; import checks format
|
|
||||||
only. Lower risk than full-backup `CheckRestore`; still a cross-version footgun.
|
|
||||||
|
|
||||||
### I — Journal milter fail-open; origin CSRF fail-open; queue-reconcile
|
|
||||||
`bounced`
|
|
||||||
|
|
||||||
Documented accepted risks in [security.md](../security.md). Not defects.
|
|
||||||
Revisit the CSRF ADR’s *framing* (multi-user), not necessarily the mechanism.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. Refactoring and optimisation
|
|
||||||
|
|
||||||
Worth doing, in order:
|
|
||||||
|
|
||||||
1. `tryAdmit` (correctness, not speed).
|
|
||||||
2. `SendLogFilter` domain IN-list (correctness).
|
|
||||||
3. DNS field partial + settings credentials partial (drift).
|
|
||||||
4. One helper for the five `panel.js` show/hide field pairs.
|
|
||||||
5. `assignedDomains` via SQL for the current user (clarity, not performance).
|
|
||||||
|
|
||||||
Not worth doing now:
|
|
||||||
|
|
||||||
- Service layer for users / send-log.
|
|
||||||
- Replacing SQLite, HTMX, or the single-container model.
|
|
||||||
- Squashing migrations `0001`–`0005`.
|
|
||||||
- CSRF tokens (see §12).
|
|
||||||
- Rewriting `machine.go` or `logtail.go` for size.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. Licence (AGPL-3.0)
|
|
||||||
|
|
||||||
Packaging is largely correct: root `LICENSE` ≡ embedded `internal/legal/LICENSE`
|
|
||||||
(test), unauthenticated `/license`, footer copyright + Source + “No warranty”
|
|
||||||
on login/setup, image copies `LICENSE`/`NOTICE`, Go deps are BSD-family, htmx
|
|
||||||
is 0BSD. Network-use §13 is stated in `NOTICE` and the README.
|
|
||||||
|
|
||||||
| Sev | Finding |
|
|
||||||
|---|---|
|
|
||||||
| **M** | IBM Plex WOFF2 files are shipped without the SIL OFL 1.1 text. OFL requires the licence to travel with the font. Add `OFL.txt` next to the fonts (and mention the path in `NOTICE`). |
|
|
||||||
| **M** | `NOTICE` tells modifiers to change the Source URL in `layout.html`. The URL is `legal.SourceURL` in `internal/legal/legal.go`, injected by `view.go`. |
|
|
||||||
| **L** | `/license` serves LICENSE only, not NOTICE. Optional: serve NOTICE at `/notice` or append attributions. |
|
|
||||||
| **L** | SPDX headers only on `cmd/panel` and `cmd/selfpost-backup`. AGPL does not require per-file SPDX; either add them everywhere or drop the two so the convention is consistent. |
|
|
||||||
| **I** | Debian package licences are pointed at packages.debian.org rather than a pinned list — normal for an image that installs from bookworm. |
|
|
||||||
|
|
||||||
No AGPL-incompatible Go dependency found in `go.mod`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. Legacy code and migrations
|
|
||||||
|
|
||||||
| Migration | Role | Removal |
|
|
||||||
|---|---|---|
|
|
||||||
| `0001_init.sql` | Core schema (including historical `admin`) | Keep for all **1.x** (`PRAGMA user_version` chain) |
|
|
||||||
| `0002_sessions.sql` | DB sessions | Keep for 1.x |
|
|
||||||
| `0003_logtail_state.sql` | Tailer offset | Keep for 1.x |
|
|
||||||
| `0004_dmarc_report_email.sql` | DMARC columns on `admin` | Keep for 1.x; `0005` moves the data |
|
|
||||||
| `0005_panel_users.sql` | `users` / `user_domains`; `DROP TABLE admin` | Keep for 1.x |
|
|
||||||
|
|
||||||
Squash is deferred to **2.x** — [roadmap.md](../roadmap.md) `schema-squash`.
|
|
||||||
Until then do not delete, rename, or reorder these files. Document the 1.x
|
|
||||||
rule in architecture § Persistence (one sentence).
|
|
||||||
|
|
||||||
Compat shims to keep until a major:
|
|
||||||
|
|
||||||
- `GET/POST /account` → 308 `/settings`.
|
|
||||||
- Domain rate-limit rows may still have an unused IP list column; enforcement
|
|
||||||
ignores it.
|
|
||||||
|
|
||||||
`sessions.username` is a string, not a `user_id` FK. Renames update the column;
|
|
||||||
a missed rename would orphan sessions. Acceptable; a FK would be a 1.x
|
|
||||||
migration if usernames become mutable in more places.
|
|
||||||
|
|
||||||
**Delete** `docs/plans/logrotate-mode.md` once this review is the active plan
|
|
||||||
(status `done`; history is git / CHANGELOG `[1.2.3]`).
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 10. Stubs and claimed-but-unimplemented behaviour
|
|
||||||
|
|
||||||
| Item | Status |
|
|
||||||
|---|---|
|
|
||||||
| Inbound relay | Agreed plan, **no code stubs**, no `INBOUND_RELAY_*` env. Correct. |
|
|
||||||
| DMARC report **ingestion** | Candidate. UI copy already promises “a future release will be able to receive reports in the panel”. Settings `rua=` and DNS guidance **are** implemented. |
|
|
||||||
| `panel-docs` | Candidate. Status blurbs were removed in 1.2.2 in favour of this item. |
|
|
||||||
| `CONTRIBUTING.md` | Candidate, file absent. Matches roadmap. |
|
|
||||||
| CSRF tokens | Explicitly not implemented (ADR). |
|
|
||||||
| `auth.RequireGlobal` | Dead helper, not a feature stub. |
|
|
||||||
|
|
||||||
The DMARC “future release” sentence is the only user-visible promise of
|
|
||||||
unimplemented behaviour. Soften it to “SelfPost does not receive inbound mail”
|
|
||||||
or keep it and treat `dmarc-reports` as the fulfilment — product call, Sonnet
|
|
||||||
copy.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 11. GUI: hacks and layout composition
|
|
||||||
|
|
||||||
The panel is CSP-strict (no inline script/style; `TestNoTemplateUsesInlineScriptOrStyle`).
|
|
||||||
No `!important`. Progressive enhancement is real (pages work without JS).
|
|
||||||
Adaptive polling in `panel.js` is a **documented** workaround: HTMX
|
|
||||||
`hx-trigger="every Ns [expr]"` uses `new Function`, which CSP would break.
|
|
||||||
|
|
||||||
| Sev | Finding |
|
|
||||||
|---|---|
|
|
||||||
| **M** | `RateLimitErr` uses `class="flash error"`. `.flash` is the **success** surface; `.error` only recolors text. There is no `.flash.error` rule. Validation failures look like success (red text on green). `domain_detail.html` + `panel.css`. |
|
|
||||||
| **M** | User **Delete** has no `data-confirm` and no confirm page. App delete / regen / rate-limit clear do; domain delete has `domain_delete.html`. One mis-click removes a panel user. |
|
|
||||||
| **M** | `domain_detail.html` repeats Host/Type/Value/`code-row` for DNS status **and** publishable records. Extract a partial (same pattern as `encrypt_fields.html`). |
|
|
||||||
| **M** | `settings.html` duplicates the credentials form (global split vs domain-admin narrow card). Drift already visible in the muted help text. |
|
|
||||||
| **L** | Adaptive polling: `outerHTML` swap every 5 s can steal clicks / focus; poll failures retry silently. Consider `aria-live="polite"` and a visible retry/error. Do not switch back to `hx-trigger="every"` under this CSP. |
|
|
||||||
| **L** | Checkbox-driven Edit panels instead of `<details>` (commented in the template). Works without JS; no `aria-expanded`. |
|
|
||||||
| **L** | Five near-identical show/hide helpers in `panel.js`. Encrypt/import fields can flash visible before `DOMContentLoaded`. |
|
|
||||||
| **L** | `hx-get` query params in `deliveries_rows.html` are not `urlquery`-encoded. Safe while domain/app charset is locked down. |
|
|
||||||
| **L** | Applications on a domain page are unpaginated. Fine until an operator has dozens of apps. |
|
|
||||||
| **L** | `<label>` used as a heading on DNS/status readouts (no `for`). |
|
|
||||||
| **I** | `{{define "wide"}}` override and `main:has(> .card.narrow)` are non-obvious but tested. Keep; do not “simplify” into per-page CSS files. |
|
|
||||||
|
|
||||||
`data-confirm` is skipped when JS is off (documented in `panel.js` only).
|
|
||||||
Domain delete already uses a real page; user delete should follow that
|
|
||||||
pattern or at least get `data-confirm`.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 12. Weakly documented disputed decisions
|
|
||||||
|
|
||||||
These are real choices. Several are in [security.md](../security.md); the
|
|
||||||
problem is **stale framing** after domain-admin, not silence.
|
|
||||||
|
|
||||||
| Decision | Where | Gap |
|
|
||||||
|---|---|---|
|
|
||||||
| CSRF via origin / `Sec-Fetch-Site`; no tokens; POST with neither header allowed | security.md ADR | Still argued as “single-user”. Revisit trigger already fired. **Rewrite the ADR**; implementing tokens is a separate product call. |
|
|
||||||
| Journal-milter fail-open | architecture, milter comments | Guide rate-limit section should say L2 is best-effort. |
|
|
||||||
| Unencrypted backup/export by default | security.md | OK. Domain-admin can **export working SASL passwords** for assigned domains (`HandleExportDomain` uses `lookupDomain`). Guide/security should say so. |
|
|
||||||
| Queue reconcile marks lost lines `bounced` | security.md | OK. |
|
|
||||||
| Sliding session, no absolute cap; HTMX GET does not renew | architecture, guide | OK. |
|
|
||||||
| Restore can resurrect sessions from an older backup | architecture | Missing from the operator guide. |
|
|
||||||
| L2 skipped when client IP is unknown | milter + unit test | Not in the guide. |
|
|
||||||
| Backup encryption optional | security.md | OK. |
|
|
||||||
| Supervisord socket `0770` so the panel can `postfix reload` | supervisord.conf | Compromised panel ≈ mail-stack control. Documented as intentional; keep. |
|
|
||||||
| `workflow_dispatch` on `release.yml` derives version from `GITHUB_REF_NAME` | `.github/workflows/release.yml` | A manual run from `main` can publish a non-semver tag. Guard: only `vX.Y.Z` or an explicit version input. |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 13. Edge cases
|
|
||||||
|
|
||||||
Covered above: 0 / 1 / ≥2 assigned domains on the send log; forged
|
|
||||||
`domain`/`app` query params; empty allowlist must not mean “all”.
|
|
||||||
|
|
||||||
Others:
|
|
||||||
|
|
||||||
- **Last global administrator** cannot be demoted/deleted (UI + server). Good.
|
|
||||||
- **Domain-admin with no domains** (all assigned domains deleted →
|
|
||||||
`user_domains` cascade): today they see the full send log (P0). After the
|
|
||||||
fix they should see an empty log, not an error.
|
|
||||||
- **Missing `mail.log`** after rotation: treated as empty, not an error
|
|
||||||
(tested). Good.
|
|
||||||
- **Backup download after headers committed**: truncated file possible
|
|
||||||
(streaming trade-off). Encrypted domain export is sealed in memory first.
|
|
||||||
Acceptable; do not buffer full backups.
|
|
||||||
- **`parsePage`**: huge `p` yields a large offset and an empty page, not a
|
|
||||||
500. Fine.
|
|
||||||
- **Concurrent domain DNS on the dashboard**: safe under Go 1.22+.
|
|
||||||
- **Import domain** is global-only; **export** is any principal who can
|
|
||||||
access the domain. Intentional once documented.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 14. Tests
|
|
||||||
|
|
||||||
**Strengths.** Milter L2 + in-flight, DNS grading, logtail follow/rotate/
|
|
||||||
reconcile, secretfile tamper, SASL argv hygiene (`--` before login), template
|
|
||||||
CSP/nav/legal footer, env-key ↔ guide regression, e2e mail path (AUTH, DKIM,
|
|
||||||
queued→sent, L1/L2, fail-open, hostname gate, session vs restart). Test
|
|
||||||
comments are better than average.
|
|
||||||
|
|
||||||
**Documented?** How to run tests: [development.md](../development.md) §
|
|
||||||
Testing. There is no e2e README (package comment in `test/e2e/main_test.go`
|
|
||||||
is the stand-in). Individual tests are not inventoried in docs — that is
|
|
||||||
fine; the e2e **summary** should mention logrotate.
|
|
||||||
|
|
||||||
**Gaps (high value):**
|
|
||||||
|
|
||||||
| Area | Gap |
|
|
||||||
|---|---|
|
|
||||||
| RBAC | **No** tests for `authz.go`, `CanAccessDomain`, domain-admin send-log scoping, `/users` 404 for domain-admin, backup 404. This is why P0 shipped. |
|
|
||||||
| Auth HTTP | No `HandleLogin` / `HandleSetup` tests (TTL, constant-time, setup complete → 404). No tests for `auth/ratelimit.go` `Allow`. |
|
|
||||||
| Sessions store | No `store/sessions*_test.go` (covered only via `auth_test` wrappers). |
|
|
||||||
| Backup as operator path | Create + `CheckRestore` unit-tested; **no** extract-onto-`/data`-and-boot test; panel `HandleBackup` POST untested. |
|
|
||||||
| Handlers | No tests for users CRUD, domain add/delete, account POST, DNS recheck endpoints. |
|
|
||||||
| `postfix.Queue` | Parser only; exec path untested (e2e does not open Mail queue). |
|
|
||||||
|
|
||||||
**Weak / low-value (keep, do not grow this style):**
|
|
||||||
|
|
||||||
- `TestDecryptErrorMessage` — substring mapping.
|
|
||||||
- `TestBackupPageOffersEncryption` — `strings.Contains` over HTML.
|
|
||||||
- Many `templates_test.go` cases — structural guards (CSP, nav). Valuable as
|
|
||||||
guards, not as behaviour tests.
|
|
||||||
- E2e `testNoAuthRejected` vs `testForeignRelayRejected` — nearly the same
|
|
||||||
unauthenticated send.
|
|
||||||
|
|
||||||
**E2e hygiene:**
|
|
||||||
|
|
||||||
- Fatal string in `testLevel1RateLimit` says `RATE_LIMIT_MESSAGES_PER_IP=5`;
|
|
||||||
override is `50` (`test/e2e/negative_test.go` vs `compose.override.yml`).
|
|
||||||
- `coredns/coredns:latest` is unpinned.
|
|
||||||
- `TestImageBuildPreservesLogrotateMode` chmods the source conf then rebuilds
|
|
||||||
— can race a dirty tree.
|
|
||||||
|
|
||||||
Do not add snapshot tests of entire pages. Add **authorization** tests that
|
|
||||||
would have caught P0.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 15. Duplication and local patches
|
|
||||||
|
|
||||||
| Local patch | Systemic fix |
|
|
||||||
|---|---|
|
|
||||||
| Send-log domain/app allowlist after/around the query | Store filter: `Domains []string` required for non-global; validate app login first |
|
|
||||||
| `assignedDomains` loads all domains | Use `listUserDomainNames` / `ListDomainsForUser` |
|
|
||||||
| `requireGlobal` on each handler | Optional: `auth.RequireGlobal` on those muxes |
|
|
||||||
| Five JS field-sync helpers | One `data-show-when` helper |
|
|
||||||
| DNS host/type/value markup × many | Template partial |
|
|
||||||
| Settings credentials form × 2 | Partial |
|
|
||||||
| `web/validate` vs `app/validate` | Keep separate (different alphabets); do not merge |
|
|
||||||
|
|
||||||
The send-log allowlist is the textbook “local patch instead of a store
|
|
||||||
invariant”.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 16. Other improvements
|
|
||||||
|
|
||||||
- Pin CoreDNS in e2e.
|
|
||||||
- Guard `release.yml` `workflow_dispatch` versioning (**Opus**, infra).
|
|
||||||
- Optional: `Resync` once after a successful `CheckRestore` (heal drifted
|
|
||||||
maps). Small, mail-path, **Opus**. Not required if the tarball is the
|
|
||||||
restore story — but then **fix the backup package comment**.
|
|
||||||
- Optional: serve `NOTICE` next to `/license`.
|
|
||||||
- Do not start inbound-relay until P0 is closed.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Implementation checklist
|
|
||||||
|
|
||||||
Work top to bottom. Commit per phase (or per coherent sub-step) when asked.
|
|
||||||
Update [CHANGELOG.md](../../CHANGELOG.md) `[Unreleased]` with each user-visible
|
|
||||||
change. After Go changes: `go build`, `go vet`, `go test ./...`.
|
|
||||||
|
|
||||||
### P0 — Domain-admin send-log authorization (defect)
|
|
||||||
|
|
||||||
**Model: Opus.** Tests in the same change. **Fable** on the diff after it
|
|
||||||
lands (reviewer ≠ author).
|
|
||||||
|
|
||||||
- [x] Extend `SendLogFilter` so a non-empty domain list is an `IN` constraint.
|
|
||||||
Empty list for a non-global user → zero rows, not “all”. Done as
|
|
||||||
`Domains` + `AllDomains`: the zero value matches nothing, so a caller
|
|
||||||
that states no scope cannot read the journal.
|
|
||||||
- [x] `sendLogData`: for `!p.IsGlobal()`, always constrain to assigned domain
|
|
||||||
names; validate `AppLogin` against the user’s apps **before** query.
|
|
||||||
- [x] Tests: domain-admin with 0, 1, and 2 assigned domains; unfiltered list;
|
|
||||||
forged `?domain=` and `?app=`; detail page still 404s on a foreign id
|
|
||||||
(already true — keep a regression test).
|
|
||||||
- [x] Comment the invariant next to `sendLogData` (the comment that was
|
|
||||||
missing).
|
|
||||||
|
|
||||||
**Done when:** a domain-admin cannot read another domain’s send-log rows via
|
|
||||||
the list, the fragment, or query parameters. `go test ./...` green.
|
|
||||||
|
|
||||||
### P1 — Fail-closed consistency (mail path / auth)
|
|
||||||
|
|
||||||
**Model: Opus.**
|
|
||||||
|
|
||||||
- [x] `inflight.tryAdmit` (count + reserve under one lock). Extend milter
|
|
||||||
tests with overlapping `MailFrom` (true concurrency, not sequential).
|
|
||||||
Two tests: concurrent `MailFrom` sessions gated so they all read the
|
|
||||||
stored count before anyone reserves (exactly one admitted), and a
|
|
||||||
saturation test on `tryAdmit` that overshoots the ceiling whenever count
|
|
||||||
and reserve are separate critical sections.
|
|
||||||
- [x] `sessionStore.Create` returns an error; login does not set a cookie on
|
|
||||||
failure.
|
|
||||||
- [x] `app.Service.Delete`: SASL (and rate-limit row) before or compensating
|
|
||||||
with the registry row; match domain-delete ordering. Test the failure
|
|
||||||
path with a fake SASL that errors.
|
|
||||||
|
|
||||||
**Done when:** unit tests cover the race and the two fail-closed paths.
|
|
||||||
|
|
||||||
### P2 — Security/operator docs that are wrong today
|
|
||||||
|
|
||||||
**Model: Sonnet** (English docs). No code behaviour change except copy.
|
|
||||||
|
|
||||||
- [x] Rewrite the CSRF ADR in [security.md](../security.md) for a panel that
|
|
||||||
already has global + domain-admin. Keep the origin-check mechanism
|
|
||||||
unless a new decision says otherwise. New revisit trigger (e.g. untrusted
|
|
||||||
domain-admins, or a requirement that does not depend on browser
|
|
||||||
headers).
|
|
||||||
- [x] Drop “or argon2” unless argon2 is implemented.
|
|
||||||
- [x] [guide.md](../guide.md): Users / roles; Settings DMARC field; L2
|
|
||||||
fail-open; restore can resurrect sessions; domain-admin can export
|
|
||||||
working SASL passwords for assigned domains.
|
|
||||||
- [x] Architecture route table: `/license`, `/account` → `/settings`.
|
|
||||||
- [x] Fix `internal/backup` package comment (restore = extract tarball +
|
|
||||||
`CheckRestore`; maps come from the archive; Reload heals drift).
|
|
||||||
- [x] `admin.dmarc_report_email` → `settings` in roadmap + dmarc-reports plan.
|
|
||||||
- [x] development.md e2e summary: logrotate + process checks.
|
|
||||||
- [x] `setupManager` / `store` package comments: `users`, not `admin` row.
|
|
||||||
|
|
||||||
**Done when:** an operator who reads only the guide knows the panel has two
|
|
||||||
roles, and security.md no longer calls the panel single-user.
|
|
||||||
|
|
||||||
### P3 — GUI defects from the 1.2.x layout pass
|
|
||||||
|
|
||||||
**Model: Sonnet.**
|
|
||||||
|
|
||||||
- [x] `.flash.error` (or stop using `.flash` for `RateLimitErr`) — danger
|
|
||||||
surface, not success.
|
|
||||||
- [x] User delete: `data-confirm` at minimum; prefer a confirm page like
|
|
||||||
domain delete. Done as a confirm page (`GET/POST /users/{uid}/delete`),
|
|
||||||
matching `domain_delete.html`.
|
|
||||||
- [x] DNS field partial; settings credentials partial.
|
|
||||||
- [x] Optional: `urlquery` on deliveries fragment params; `aria-live` on
|
|
||||||
polled regions; confirm-without-JS note next to the CSRF accepted risks.
|
|
||||||
|
|
||||||
**Done when:** a rate-limit validation error is visually an error; user delete
|
|
||||||
cannot be a single unmarked click.
|
|
||||||
|
|
||||||
### P4 — Tests and e2e hygiene
|
|
||||||
|
|
||||||
**Model: Opus** for auth/RBAC/limiter tests; **Haiku** for the L1 fatal-string
|
|
||||||
typo; **Sonnet** if e2e docs need a paragraph.
|
|
||||||
|
|
||||||
- [x] `auth/ratelimit.go` unit tests (window, lockout, sweep). Also the
|
|
||||||
per-key scope: one locked-out address must not lock out the others.
|
|
||||||
- [x] Login/setup handler tests (happy path + lockout + setup expiry). The
|
|
||||||
lockout test also states that a correct password does not bypass it, and
|
|
||||||
that the two refusals are byte-identical (no username enumeration).
|
|
||||||
- [x] Domain-admin 404 on `/users`, `/backup`, `/mail-queue`, `/system-log`,
|
|
||||||
`/status` — as a table of every global-only route (`internal/web/handlers/authz_test.go`),
|
|
||||||
including the write routes, plus the same 404 for a request with no
|
|
||||||
principal and a positive control so the table cannot pass on a handler
|
|
||||||
that always 404s.
|
|
||||||
- [x] Fix e2e L1 fatal string (`50`, not `5`).
|
|
||||||
- [x] Pin `coredns` image: tag `1.14.6`, not a digest — the tag is a multi-arch
|
|
||||||
manifest and the stand has to come up on arm64 developer machines.
|
|
||||||
- [ ] Optional later: backup extract + `CheckRestore` + panel boot (heavy;
|
|
||||||
e2e or integration). Not a P4 blocker.
|
|
||||||
|
|
||||||
**Done when:** P0 cannot regress without a red test; e2e L1 message matches
|
|
||||||
the override.
|
|
||||||
|
|
||||||
### P5 — Licence and release infra
|
|
||||||
|
|
||||||
**Model: Sonnet** for OFL/NOTICE prose; **Opus** for `release.yml`; **Haiku**
|
|
||||||
for SPDX consistency and deleting the done logrotate plan.
|
|
||||||
|
|
||||||
- [ ] Add SIL OFL 1.1 text beside the Plex WOFF2 files; point `NOTICE` at it.
|
|
||||||
- [ ] `NOTICE` Source URL instructions → `internal/legal/legal.go`.
|
|
||||||
- [ ] `release.yml`: `workflow_dispatch` must not publish `main` as a version
|
|
||||||
(require `vX.Y.Z` or an explicit `version` input that matches SemVer).
|
|
||||||
- [ ] Delete [plans/logrotate-mode.md](logrotate-mode.md) (done; git keeps it).
|
|
||||||
- [ ] Decide SPDX-everywhere vs SPDX-nowhere; do not leave two files special
|
|
||||||
without a one-line note in development.md.
|
|
||||||
|
|
||||||
**Done when:** OFL travels with the fonts; a dispatch from `main` cannot tag
|
|
||||||
`ghcr.io/...:main`.
|
|
||||||
|
|
||||||
### P6 — Optional cleanup (do not start until P0–P3 are done)
|
|
||||||
|
|
||||||
**Model: Sonnet** unless noted.
|
|
||||||
|
|
||||||
- [ ] Use `auth.RequireGlobal` or delete it (**Haiku** if delete).
|
|
||||||
- [ ] Rename `handlers_account.go` / `HandleAccount` to settings (**Haiku**).
|
|
||||||
- [ ] `ListDomainsForUser` instead of load-all-and-filter.
|
|
||||||
- [ ] Cap or periodically sweep the login limiter map (**Opus**, small).
|
|
||||||
- [ ] Collapse `panel.js` field-sync helpers.
|
|
||||||
- [ ] Soften or keep DMARC “future release” UI copy (product call).
|
|
||||||
- [ ] Optional startup `Resync` after restore (**Opus**). Only if P2’s comment
|
|
||||||
fix is judged insufficient.
|
|
||||||
|
|
||||||
### P7 — Security review of the P0–P1 diff
|
|
||||||
|
|
||||||
**Model: Fable.** Not authorship.
|
|
||||||
|
|
||||||
- [ ] Review the send-log authz change, `tryAdmit`, session create, and app
|
|
||||||
delete ordering against [security.md](../security.md). Close each finding
|
|
||||||
with a fix or an accepted-risk entry.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## What not to do
|
|
||||||
|
|
||||||
- Do not squash SQLite migrations in **1.x** (see roadmap `schema-squash` for 2.x).
|
|
||||||
- Do not implement inbound-relay, DMARC ingestion, or in-panel docs as part of
|
|
||||||
this plan.
|
|
||||||
- Do not add CSRF tokens in the same breath as rewriting the ADR. Tokens are a
|
|
||||||
new decision.
|
|
||||||
- Do not “simplify” comments that record threat models.
|
|
||||||
- Do not introduce a general service/repository layer for users.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Done when (this plan)
|
|
||||||
|
|
||||||
1. P0 is shipped and covered by tests.
|
|
||||||
2. P2 has removed “single-user” from the CSRF ADR and documented Users in the
|
|
||||||
operator guide.
|
|
||||||
3. P3 flash/delete bugs are gone.
|
|
||||||
4. P7 has run on the P0–P1 diff.
|
|
||||||
5. This file’s remaining boxes are either checked or explicitly dropped in
|
|
||||||
[roadmap.md](../roadmap.md) with a reason.
|
|
||||||
6. [CHANGELOG.md](../../CHANGELOG.md) `[Unreleased]` lists the user-visible
|
|
||||||
items (authz, docs, GUI).
|
|
||||||
|
|
||||||
After that, delete this plan (history in git) and return the recommended
|
|
||||||
order on the roadmap to inbound-relay.
|
|
||||||
@@ -0,0 +1,187 @@
|
|||||||
|
# Plan: domain-stats-auto-ratelimit
|
||||||
|
|
||||||
|
**Status:** candidate
|
||||||
|
**Date:** 2026-08-17
|
||||||
|
**Version:** `1.x` MINOR; migrations must stay compatible with `1.0.0`.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Give the operator **30-day sending statistics** per domain and per application
|
||||||
|
(total volume, peak and average rate), and an optional **auto** level-2 rate
|
||||||
|
limit that sets `max_messages` from the average rate (avg × multiplier) over the
|
||||||
|
level-1 window.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
**In:**
|
||||||
|
|
||||||
|
- Rolling **30-day** stats on each domain page (domain aggregate + per-app rows):
|
||||||
|
message count, peak msg/h, average msg/h.
|
||||||
|
- Level-2 rate limit mode **manual** (today) or **auto** for domain and
|
||||||
|
application scopes.
|
||||||
|
- Auto formula: `max_messages = ceil(avg_hourly × multiplier)`, window =
|
||||||
|
level-1 window (`RATE_LIMIT_WINDOW_SECONDS`); capped at level 1.
|
||||||
|
- Background recalculation (e.g. every 6 h, alongside send-log prune); milter
|
||||||
|
reads stored `max_messages` / `window_seconds` only (no aggregates on the
|
||||||
|
hot path).
|
||||||
|
- Panel UI: stats card, manual/auto toggle, multiplier field, read-only computed
|
||||||
|
limit in auto mode, optional «Recalculate now».
|
||||||
|
- RBAC: domain-admin sees stats and may configure auto/manual for assigned
|
||||||
|
domains only; same authz as existing rate-limit handlers.
|
||||||
|
- Tests, [guide.md](../guide.md), [CHANGELOG.md](../../CHANGELOG.md); security
|
||||||
|
review (Fable) for rate-limit path changes.
|
||||||
|
|
||||||
|
**Out:**
|
||||||
|
|
||||||
|
- Changing level 1 (Postfix env) — auto only fills level 2 under the L1 cap.
|
||||||
|
- Automated IP warmup schedules ([guide.md](../guide.md) § IP warmup stays
|
||||||
|
operator-driven).
|
||||||
|
- Prometheus/Grafana, alerting, APIs.
|
||||||
|
- Counting level-1 refusals or `rejected` rows as sent volume.
|
||||||
|
- Per-client-IP analytics.
|
||||||
|
|
||||||
|
## Data source
|
||||||
|
|
||||||
|
All metrics come from SQLite `send_log`, same rules as
|
||||||
|
[`CountMessages`](../../internal/store/ratelimits.go):
|
||||||
|
|
||||||
|
- One message = one distinct `queue_id` (many recipients = one count).
|
||||||
|
- `status != rejected` (level-2 refusals never queued).
|
||||||
|
- Level-1 refusals are **not** in `send_log` — stats under-count refusals;
|
||||||
|
document in UI copy.
|
||||||
|
|
||||||
|
Retention today is env `SEND_LOG_RETENTION_DAYS` (default 90). Stats use the
|
||||||
|
last **30 days** of rows still present. If retention < 30 days (after
|
||||||
|
[send-log-retention](send-log-retention.md)), the stats window is
|
||||||
|
`min(30, retention)` with a warning.
|
||||||
|
|
||||||
|
### Metrics
|
||||||
|
|
||||||
|
| Metric | Definition |
|
||||||
|
|---|---|
|
||||||
|
| **total** | `COUNT(DISTINCT queue_id)` in the stats window |
|
||||||
|
| **peak rate** | maximum messages in any **hourly** bucket in that window (msg/h) |
|
||||||
|
| **avg rate** | `total / hours_in_window`, where `hours_in_window = min(720, age of domain/app in hours, retention hours)` |
|
||||||
|
|
||||||
|
Keys: `send_log.domain` (domain scope), `send_log.app_login` (application scope).
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart LR
|
||||||
|
milter["journal-milter"] --> sendLog["send_log"]
|
||||||
|
sendLog --> statsQuery["StatsQuery 30d"]
|
||||||
|
statsQuery --> domainPage["domain page stats card"]
|
||||||
|
statsQuery --> autoJob["auto recalc job"]
|
||||||
|
autoJob --> rateLimits["rate_limits"]
|
||||||
|
rateLimits --> milter
|
||||||
|
```
|
||||||
|
|
||||||
|
1. **[`internal/store/stats.go`](../../internal/store/stats.go)** — `SendStats`
|
||||||
|
with `Total`, `PeakPerHour`, `AvgPerHour`; `DomainSendStats(name, since)` /
|
||||||
|
`AppSendStats(login, since)`.
|
||||||
|
2. Hourly buckets: `strftime('%Y-%m-%d %H', created_at)` + `GROUP BY`; subquery
|
||||||
|
for peak; total via distinct `queue_id`.
|
||||||
|
3. Indexes `idx_send_log_domain` and `idx_send_log_created_at` exist; add
|
||||||
|
composite `(domain, created_at)` only if profiling shows need.
|
||||||
|
4. **Auto recalc** — panel goroutine (same interval as send-log prune): for each
|
||||||
|
`rate_limits` row with `mode = auto`, recompute `max_messages`, set
|
||||||
|
`auto_updated_at`. Milter unchanged except reading new columns via existing
|
||||||
|
`RateLimit` lookup.
|
||||||
|
|
||||||
|
### Auto rate limit
|
||||||
|
|
||||||
|
Extend [`RateLimit`](../../internal/store/ratelimits.go):
|
||||||
|
|
||||||
|
```go
|
||||||
|
type RateLimit struct {
|
||||||
|
// existing: Scope, RefID, AllowedIPs, MaxMessages, WindowSeconds
|
||||||
|
Mode string // "manual" | "auto"
|
||||||
|
AutoMultiplier float64 // default 2.5 when Mode == "auto"
|
||||||
|
AutoUpdatedAt time.Time
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Formula:**
|
||||||
|
|
||||||
|
```
|
||||||
|
avg_hourly = total_messages_in_window / hours_in_window
|
||||||
|
max_messages = ceil(avg_hourly * auto_multiplier)
|
||||||
|
window_seconds = L1 window (not editable in auto mode)
|
||||||
|
max_messages = min(max_messages, L1 max)
|
||||||
|
```
|
||||||
|
|
||||||
|
When `total == 0`: auto limit stays **inactive** (same as empty manual limit);
|
||||||
|
UI explains that traffic is required before auto can apply.
|
||||||
|
|
||||||
|
**Application overrides** ([`handlers_ratelimit.go`](../../internal/web/handlers/handlers_ratelimit.go)):
|
||||||
|
|
||||||
|
- Trusted IPs required.
|
||||||
|
- Auto app ceiling **strictly above** domain limit when domain limit is active.
|
||||||
|
- Ceiling ≤ L1.
|
||||||
|
|
||||||
|
**Fail-open:** store errors during recalc must not weaken enforcement of the
|
||||||
|
last successfully written limit; recalc failures are logged only.
|
||||||
|
|
||||||
|
### Migration (`0006_rate_limit_auto.sql`)
|
||||||
|
|
||||||
|
```sql
|
||||||
|
ALTER TABLE rate_limits ADD COLUMN mode TEXT NOT NULL DEFAULT 'manual'
|
||||||
|
CHECK (mode IN ('manual', 'auto'));
|
||||||
|
ALTER TABLE rate_limits ADD COLUMN auto_multiplier REAL;
|
||||||
|
ALTER TABLE rate_limits ADD COLUMN auto_updated_at TEXT;
|
||||||
|
```
|
||||||
|
|
||||||
|
Existing rows → `manual`.
|
||||||
|
|
||||||
|
### Domain export
|
||||||
|
|
||||||
|
Today rate limits are **not** exported. This plan adds them (including
|
||||||
|
`mode`, `auto_multiplier`) to domain transfer JSON — document as a boundary
|
||||||
|
change in [guide.md](../guide.md) § Export.
|
||||||
|
|
||||||
|
## Panel UI
|
||||||
|
|
||||||
|
- Domain page ([`domain_detail.html`](../../internal/web/view/templates/domain_detail.html)):
|
||||||
|
- **Sending statistics (30 days)** — total, peak msg/h, avg msg/h.
|
||||||
|
- Per-application stats in the app list.
|
||||||
|
- Rate limit: Manual / Auto, multiplier (e.g. 1.5–5.0, default 2.5), read-only
|
||||||
|
computed max/window in auto mode, «Recalculate now».
|
||||||
|
- Optional later: «30d» column on domain list (global admin only).
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
- `internal/store/stats_test.go` — fixtures → total / peak / avg.
|
||||||
|
- `internal/store/ratelimits_test.go` — auto recalc, L1 cap, app > domain.
|
||||||
|
- Handler tests — auto form validation, multiplier bounds.
|
||||||
|
- Milter tests — enforced limit matches last recalculated values.
|
||||||
|
|
||||||
|
`go test` / `go vet` on touched packages.
|
||||||
|
|
||||||
|
## Done when
|
||||||
|
|
||||||
|
- Domain and app 30-day stats visible on the domain page; domain-admin scoping
|
||||||
|
enforced.
|
||||||
|
- Manual/auto toggle works for domain and app; auto recalc updates `rate_limits`
|
||||||
|
and milter enforces stored ceilings.
|
||||||
|
- Zero-traffic auto stays inactive with clear UI copy.
|
||||||
|
- [guide.md](../guide.md) and [CHANGELOG.md](../../CHANGELOG.md) updated;
|
||||||
|
security review passed.
|
||||||
|
|
||||||
|
## Risks
|
||||||
|
|
||||||
|
- Heavy aggregation on large `send_log` tables — mitigate with indexes or
|
||||||
|
nightly rollups (phase 2).
|
||||||
|
- Stats without level-1 visibility — mitigate with operator-facing caveat.
|
||||||
|
- Auto limit too tight after a spike — multiplier is operator-tuned; show peak
|
||||||
|
alongside avg in auto UI.
|
||||||
|
|
||||||
|
## Dependencies
|
||||||
|
|
||||||
|
- [`send-log-retention`](send-log-retention.md) is a separate roadmap item but
|
||||||
|
should land before or in parallel so operators can set retention ≥ 30 days
|
||||||
|
from the panel.
|
||||||
|
|
||||||
|
**Version:** `1.x` MINOR.
|
||||||
@@ -3,8 +3,9 @@
|
|||||||
**Status:** agreed
|
**Status:** agreed
|
||||||
**Version:** target bump **1.x** MINOR; **`2.x` possible** — to be settled once
|
**Version:** target bump **1.x** MINOR; **`2.x` possible** — to be settled once
|
||||||
the implementation lands (do not fix a major in advance).
|
the implementation lands (do not fix a major in advance).
|
||||||
**Order:** after [code-review.md](code-review.md) P0 (and preferably P0–P3);
|
**Order:** the 2026-08-13 full-tree review follow-ups are closed (CHANGELOG
|
||||||
this remains the largest remaining 1.x+ **feature**. The domain-admin role
|
`[Unreleased]`), so this is next up as the largest remaining 1.x+ **feature**.
|
||||||
|
The domain-admin role
|
||||||
and `internal/web` split have shipped — see [CHANGELOG](../../CHANGELOG.md)
|
and `internal/web` split have shipped — see [CHANGELOG](../../CHANGELOG.md)
|
||||||
`[1.2.0]`.
|
`[1.2.0]`.
|
||||||
|
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
# Plan: logrotate-mode (mail.log stops rotating in some images)
|
|
||||||
|
|
||||||
**Status:** done
|
|
||||||
**Version:** patch; no schema, no configuration surface.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Summary
|
|
||||||
|
|
||||||
`mail.log` stopped rotating when `/etc/logrotate.d/mail` landed in the image
|
|
||||||
with group/other write permission (e.g. build context from a Windows tar sync).
|
|
||||||
logrotate ignores such configs but exits 0, so the loop looked healthy while
|
|
||||||
the log grew without bound.
|
|
||||||
|
|
||||||
## What shipped
|
|
||||||
|
|
||||||
- [`build/Dockerfile`](../../build/Dockerfile): `COPY --chmod` pins config
|
|
||||||
(`0644`) and script (`0755`) modes so the image no longer depends on checkout
|
|
||||||
file modes.
|
|
||||||
- [`build/logrotate-loop.sh`](../../build/logrotate-loop.sh): preflight and
|
|
||||||
per-iteration checks refuse group/other-writable configs; logrotate stderr
|
|
||||||
mentioning `Ignoring` is fatal.
|
|
||||||
- [`test/e2e/logrotate_check.go`](../../test/e2e/logrotate_check.go): asserts
|
|
||||||
mode `644`, forced `logrotate -f`, and that a group-writable context file
|
|
||||||
still produces `644` in the image.
|
|
||||||
|
|
||||||
`create 0640 postfix selfpost` in [`build/logrotate-mail.conf`](../../build/logrotate-mail.conf)
|
|
||||||
is unchanged — required for panel readability after rotation.
|
|
||||||
@@ -0,0 +1,141 @@
|
|||||||
|
# Plan: queue-retries (Postfix retry policy in the panel)
|
||||||
|
|
||||||
|
**Status:** agreed
|
||||||
|
**Date:** 2026-08-13
|
||||||
|
**Version:** patch; no schema, no configuration surface.
|
||||||
|
**Order:** small panel item; does not wait on inbound-relay.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Show the operator how Postfix retries deferred mail: first retry delay, later
|
||||||
|
backoff cap, and how long a message stays in the queue before it bounces. The
|
||||||
|
numbers come from this container's effective Postfix config, not from
|
||||||
|
hard-coded copy.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
**In:**
|
||||||
|
|
||||||
|
- A static «How delivery retries work» card on `/mail-queue` (global
|
||||||
|
administrator). Not inside the HTMX poll fragment — the snapshot is taken at
|
||||||
|
panel start.
|
||||||
|
- The same human-readable intervals in `/deliveries/{id}` history for
|
||||||
|
`deferred` and `bounced` (domain administrators never see Mail queue).
|
||||||
|
- Operator docs: [guide.md](../guide.md) Mail queue bullet;
|
||||||
|
[architecture.md](../architecture.md) notes the one-shot `postconf -h` at
|
||||||
|
panel start. [CHANGELOG.md](../../CHANGELOG.md) `### Added`.
|
||||||
|
|
||||||
|
**Out:**
|
||||||
|
|
||||||
|
- Changing Postfix retry parameters, or exposing them as panel settings
|
||||||
|
([product.md](../product.md): Postfix is used as-is).
|
||||||
|
- An `attempts` column on `send_log`, or «attempt 3 of N» — Postfix has no
|
||||||
|
attempt budget; it is time-based.
|
||||||
|
- Counting `status=deferred` lines in `mail.log` or reading `postcat`. Each
|
||||||
|
attempt is already on the delivery page's log table; the journal stores only
|
||||||
|
the last status.
|
||||||
|
- Duplicating the card on Status (summary + link to Mail queue already exist).
|
||||||
|
- Re-reading `postconf` on every HTTP request.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
Acceptance is still synchronous SMTP. Delivery stays in Postfix's on-disk
|
||||||
|
queue. SelfPost does not enqueue, retry, or deliver.
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart LR
|
||||||
|
smtpAccept["SMTP 250 accepted"] --> postfixQueue["Postfix queue"]
|
||||||
|
postfixQueue -->|"deferred: backoff until queue lifetime"| retry["Retry MX"]
|
||||||
|
retry -->|sent| done["sent"]
|
||||||
|
retry -->|lifetime elapsed or 5xx| bounce["bounced"]
|
||||||
|
postfixQueue --> mailQueuePage["/mail-queue policy card"]
|
||||||
|
postfixQueue --> deliveryPage["/deliveries/id history copy"]
|
||||||
|
```
|
||||||
|
|
||||||
|
[build/postfix-config.sh](../../build/postfix-config.sh) does not set
|
||||||
|
`queue_run_delay`, `minimal_backoff_time`, `maximal_backoff_time`,
|
||||||
|
`maximal_queue_lifetime`, `bounce_queue_lifetime`, or `delay_warning_time`.
|
||||||
|
Debian/Postfix 3.x compiled-in defaults therefore apply unless the operator
|
||||||
|
overrides them (`postconf -e` inside the container).
|
||||||
|
|
||||||
|
### Loading the numbers
|
||||||
|
|
||||||
|
Once, when the HTTP role starts ([cmd/panel/httpserver.go](../../cmd/panel/httpserver.go),
|
||||||
|
after `postfix-config.sh` has run):
|
||||||
|
|
||||||
|
```
|
||||||
|
postconf -h queue_run_delay minimal_backoff_time maximal_backoff_time maximal_queue_lifetime bounce_queue_lifetime delay_warning_time
|
||||||
|
```
|
||||||
|
|
||||||
|
`postconf -h`, not a parse of `/etc/postfix/main.cf`: stock values are not
|
||||||
|
written to the file. `postconf` is the effective config, including a manual
|
||||||
|
override.
|
||||||
|
|
||||||
|
- Fixed argv, no user input — same pattern as
|
||||||
|
[postfix.Queue](../../internal/postfix/queue.go) /
|
||||||
|
[security.md](../security.md).
|
||||||
|
- Cache on `handlers.Config` (via `web.Config`). The HTMX fragment does not
|
||||||
|
call `postconf`.
|
||||||
|
- A live `postconf -e` is visible after the next panel (or container) restart.
|
||||||
|
While the process is up, the panel shows the start-up snapshot.
|
||||||
|
- Parse Postfix time units (`300s`, `5d`, `1h`, a bare number is seconds) in
|
||||||
|
`internal/postfix`. Format human strings (`5 minutes`, `5 days`,
|
||||||
|
`about 1 hour 7 minutes`) in one place so the Mail queue card and
|
||||||
|
`deliveryEvents` cannot drift.
|
||||||
|
- If `postconf` is missing (unit tests on Windows, binary outside the
|
||||||
|
container): log a warning, fall back to Postfix 3.x compiled-in defaults
|
||||||
|
(`300s` / `4000s` / `5d` / `0`), and put a muted note on the card. Tests
|
||||||
|
stub the lookup (as `queueIDs` in the log-tailer) or pass a fixture on
|
||||||
|
`Config`. Do not fail panel start.
|
||||||
|
|
||||||
|
Typical stock values, for orientation only — the UI prints whatever
|
||||||
|
`postconf` returned:
|
||||||
|
|
||||||
|
| Parameter | Stock | Meaning |
|
||||||
|
|---|---|---|
|
||||||
|
| `queue_run_delay` / `minimal_backoff_time` | `300s` | First retry and deferred-queue scan |
|
||||||
|
| `maximal_backoff_time` | `4000s` | Cap on the doubling gap (~1 h 7 min) |
|
||||||
|
| `maximal_queue_lifetime` | `5d` | Then bounce |
|
||||||
|
| `delay_warning_time` | `0` | No delay warning to the sender |
|
||||||
|
|
||||||
|
## Panel copy
|
||||||
|
|
||||||
|
Mail queue card facts: first retry; later retries (doubling, capped);
|
||||||
|
kept in queue; then bounced. Short prose: there is no fixed attempt count; a
|
||||||
|
`deferred` message stays in this listing until it is delivered or the queue
|
||||||
|
lifetime runs out.
|
||||||
|
|
||||||
|
`deliveryEvents(row, policy)`:
|
||||||
|
|
||||||
|
- `deferred`: retries, first after X, then with increasing gaps up to Y, for
|
||||||
|
up to Z.
|
||||||
|
- `bounced`: or Postfix gave up after Z in the queue.
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
- Duration parser: `5d`, `300s`, `4000s`, `1h`, `0`, bare number.
|
||||||
|
- `/mail-queue` handler: card shows the fixture policy's human strings, not a
|
||||||
|
live `postconf`.
|
||||||
|
- Delivery page / `deliveryEvents`: `deferred` and `bounced` contain those
|
||||||
|
strings ([handlers_monitor_test.go](../../internal/web/handlers/handlers_monitor_test.go)).
|
||||||
|
- [templates_test.go](../../internal/web/view/templates_test.go): pass the new
|
||||||
|
fields if rendering `mail_queue` requires them.
|
||||||
|
|
||||||
|
`go test` / `go vet` on the touched packages.
|
||||||
|
|
||||||
|
## Done when
|
||||||
|
|
||||||
|
- `/mail-queue` states this Postfix's first retry, backoff cap, and queue
|
||||||
|
lifetime.
|
||||||
|
- A `deferred` / `bounced` delivery page uses the same intervals.
|
||||||
|
- A manual `postconf -e maximal_queue_lifetime=2d` followed by a panel restart
|
||||||
|
changes what the panel prints.
|
||||||
|
- Guide and architecture describe the snapshot; CHANGELOG has an Added entry.
|
||||||
|
|
||||||
|
## Risks
|
||||||
|
|
||||||
|
- Showing compiled-in fallbacks when `postconf` failed would mislead if the
|
||||||
|
operator had overridden them — mitigate with the muted note on the card.
|
||||||
|
- Inventing a max-attempt count would be false; the copy must stay time-based.
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
# Plan: send-log-retention
|
||||||
|
|
||||||
|
**Status:** candidate
|
||||||
|
**Date:** 2026-08-17
|
||||||
|
**Version:** `1.x` MINOR; no schema migration required (uses existing `settings` table).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Let the **global administrator** change how long delivery journal rows
|
||||||
|
(`send_log`, `/deliveries`) are kept, from the panel — without editing `.env`.
|
||||||
|
|
||||||
|
## Context (as-built)
|
||||||
|
|
||||||
|
Retention **already exists**, but only via environment:
|
||||||
|
|
||||||
|
- `SEND_LOG_RETENTION_DAYS` (default **90**) in `.env` / Compose.
|
||||||
|
- [`cmd/panel/main.go`](../../cmd/panel/main.go) passes it to
|
||||||
|
[`logtail.Run`](../../internal/logtail/logtail.go).
|
||||||
|
- [`retentionLoop`](../../internal/logtail/logtail.go) prunes via
|
||||||
|
[`DeleteSendLogBefore`](../../internal/store/sendlog.go) every **6 hours**.
|
||||||
|
- No panel control; [`handlers_monitor.go`](../../internal/web/handlers/handlers_monitor.go)
|
||||||
|
hardcodes «ninety days» in copy.
|
||||||
|
- Migration `0001_init.sql` describes `settings` as the place for «retention
|
||||||
|
overrides», but no UI writes that key yet.
|
||||||
|
|
||||||
|
This plan moves the **effective** retention into SQLite `settings`, with env as
|
||||||
|
bootstrap only.
|
||||||
|
|
||||||
|
## Scope
|
||||||
|
|
||||||
|
**In:**
|
||||||
|
|
||||||
|
- Settings card on `/settings` (global administrator only): **Send log
|
||||||
|
retention (days)**.
|
||||||
|
- Key `send_log_retention_days` in [`settings`](../../internal/store/settings.go).
|
||||||
|
- Validation: integer range **7–365** (exact bounds fixed at implementation).
|
||||||
|
- On first use: if setting missing, seed from env
|
||||||
|
(`SEND_LOG_RETENTION_DAYS`, default 90) at panel start or first save.
|
||||||
|
- Log-tailer reads the setting **each prune cycle** (no container restart).
|
||||||
|
- Delivery pages and guide copy show the **current** retention, not a hardcoded
|
||||||
|
90.
|
||||||
|
- Tests; [guide.md](../guide.md); [CHANGELOG.md](../../CHANGELOG.md).
|
||||||
|
|
||||||
|
**Out:**
|
||||||
|
|
||||||
|
- Per-domain retention (instance-wide only).
|
||||||
|
- `mail.log` rotation (logrotate, 14 daily files — unchanged).
|
||||||
|
- Immediate prune on save when lowering retention (next 6 h cycle is enough;
|
||||||
|
optional «Prune now» not in v1).
|
||||||
|
- Domain-admin access to this setting.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```mermaid
|
||||||
|
flowchart LR
|
||||||
|
settingsPage["/settings form"] --> sqlite["settings.send_log_retention_days"]
|
||||||
|
env["SEND_LOG_RETENTION_DAYS bootstrap"] --> sqlite
|
||||||
|
sqlite --> retentionLoop["logtail retentionLoop"]
|
||||||
|
retentionLoop --> prune["DeleteSendLogBefore"]
|
||||||
|
```
|
||||||
|
|
||||||
|
1. **Read path** — `GetSendLogRetentionDays()`: settings value if valid, else env
|
||||||
|
default.
|
||||||
|
2. **Write path** — POST `/settings` (global admin): validate, `SetSetting`,
|
||||||
|
flash confirmation.
|
||||||
|
3. **Prune path** — change [`logtail.retentionLoop`](../../internal/logtail/logtail.go)
|
||||||
|
to accept `func() int` or `RetentionReader` that queries settings each cycle
|
||||||
|
(same 6 h ticker).
|
||||||
|
4. **Copy** — inject retention days into delivery list/detail templates and
|
||||||
|
remove hardcoded «ninety days».
|
||||||
|
|
||||||
|
`SEND_LOG_RETENTION_DAYS` remains documented in [guide.md](../guide.md) as the
|
||||||
|
**initial default** until changed in Settings.
|
||||||
|
|
||||||
|
## Relation to domain-stats-auto-ratelimit
|
||||||
|
|
||||||
|
[domain-stats-auto-ratelimit](domain-stats-auto-ratelimit.md) uses a **30-day**
|
||||||
|
stats window. Requires effective retention ≥ 30 for full accuracy. When
|
||||||
|
retention < 30:
|
||||||
|
|
||||||
|
- Stats UI shows a warning and uses `min(30, retention)` as the window, or
|
||||||
|
- Settings validation warns when saving a value below 30 while stats/auto are
|
||||||
|
enabled (pick one at implementation; document in guide).
|
||||||
|
|
||||||
|
Recommended roadmap order: **send-log-retention** before or parallel with
|
||||||
|
domain-stats-auto-ratelimit.
|
||||||
|
|
||||||
|
## Panel UI
|
||||||
|
|
||||||
|
New card on [`settings.html`](../../internal/web/view/templates/settings.html)
|
||||||
|
(global admin block, near rate limits or under a «Deliveries» heading):
|
||||||
|
|
||||||
|
- Number input: retention days (7–365).
|
||||||
|
- Muted copy: rows older than this are deleted from `/deliveries`; main driver
|
||||||
|
of `/data` growth; does not affect `mail.log` rotation.
|
||||||
|
|
||||||
|
Domain administrators keep the narrow credentials-only settings page.
|
||||||
|
|
||||||
|
## Tests
|
||||||
|
|
||||||
|
- Save/load setting; reject out-of-range values.
|
||||||
|
- `retentionLoop` uses updated value without process restart (mock reader).
|
||||||
|
- Bootstrap: empty settings → env default used for prune.
|
||||||
|
- Template/delivery copy reflects configured days.
|
||||||
|
|
||||||
|
`go test` / `go vet` on touched packages.
|
||||||
|
|
||||||
|
## Done when
|
||||||
|
|
||||||
|
- Global admin can set retention on `/settings`; value persists in SQLite.
|
||||||
|
- Prune uses the panel value on the next cycle; env remains bootstrap default.
|
||||||
|
- Guide documents panel vs env; CHANGELOG entry added.
|
||||||
|
- Hardcoded «ninety days» removed from delivery UI.
|
||||||
|
|
||||||
|
## Risks
|
||||||
|
|
||||||
|
- Operator lowers retention while bookmarking old delivery URLs — existing
|
||||||
|
behaviour; copy already notes pruned rows are gone.
|
||||||
|
- Settings change without restart — must be tested so log-tailer never keeps a
|
||||||
|
stale int from panel start only.
|
||||||
|
|
||||||
|
**Version:** `1.x` MINOR.
|
||||||
+3
-1
@@ -59,7 +59,9 @@ domain administrators with assigned domains). The optional **inbound relay** is
|
|||||||
the main agreed **1.x+** extension still on the
|
the main agreed **1.x+** extension still on the
|
||||||
[roadmap](roadmap.md) — it targets a 1.x MINOR bump by default; a 2.x major
|
[roadmap](roadmap.md) — it targets a 1.x MINOR bump by default; a 2.x major
|
||||||
remains possible pending implementation. Items marked *candidate* in the
|
remains possible pending implementation. Items marked *candidate* in the
|
||||||
roadmap require explicit approval before coding.
|
roadmap require explicit approval before coding (including **send-log retention
|
||||||
|
in Settings**, **30-day send statistics**, and **auto level-2 rate limits** —
|
||||||
|
see linked plans there).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
+61
-15
@@ -28,38 +28,46 @@ in `git log` and [CHANGELOG.md](../CHANGELOG.md).
|
|||||||
|
|
||||||
| ID | Topic | Status | Plan |
|
| ID | Topic | Status | Plan |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| code-review | Full-tree review follow-ups (authz, docs, GUI, tests) | **agreed** | [plans/code-review.md](plans/code-review.md) |
|
| queue-retries | Postfix retry policy in the panel (queue lifetime, backoff) | **agreed** | [plans/queue-retries.md](plans/queue-retries.md) |
|
||||||
| inbound-relay | Inbound relay (backup-MX / forwarding) | **agreed** | [plans/inbound-relay.md](plans/inbound-relay.md) |
|
| inbound-relay | Inbound relay (backup-MX / forwarding) | **agreed** | [plans/inbound-relay.md](plans/inbound-relay.md) |
|
||||||
|
| send-log-retention | Send-log retention days in panel Settings | candidate | [plans/send-log-retention.md](plans/send-log-retention.md) |
|
||||||
|
| domain-stats-auto-ratelimit | 30-day send stats + auto level-2 rate limit | candidate | [plans/domain-stats-auto-ratelimit.md](plans/domain-stats-auto-ratelimit.md) |
|
||||||
| contributing | `CONTRIBUTING.md` | candidate | — |
|
| contributing | `CONTRIBUTING.md` | candidate | — |
|
||||||
| dmarc-reports | DMARC aggregate report ingestion and panel UI | candidate | [plans/dmarc-reports.md](plans/dmarc-reports.md) |
|
| dmarc-reports | DMARC aggregate report ingestion and panel UI | candidate | [plans/dmarc-reports.md](plans/dmarc-reports.md) |
|
||||||
| panel-docs | In-panel operator documentation | candidate | — |
|
| panel-docs | In-panel operator documentation | candidate | — |
|
||||||
| schema-squash | Squash SQLite migrations into a 2.x baseline | **2.x** | — |
|
| schema-squash | Squash SQLite migrations into a 2.x baseline | **2.x** | — |
|
||||||
|
|
||||||
**Recommended order** (not binding): **code-review P0** first (shipped
|
**Recommended order** (not binding): **queue-retries** is a small panel item
|
||||||
domain-admin send-log leak — a defect, not a feature), then the rest of that
|
that can land first or in parallel; the next feature is **inbound-relay**.
|
||||||
plan as listed, then **inbound-relay**. Candidates need explicit agreement
|
**send-log-retention** can land before or beside **domain-stats-auto-ratelimit**
|
||||||
before they join the queue.
|
(panel retention ≥ 30 days helps the stats window). The 2026-08-13 full-tree
|
||||||
|
review follow-ups (send-log authorization,
|
||||||
|
fail-closed paths, docs, GUI, tests, licence) are closed — history in
|
||||||
|
[CHANGELOG.md](../CHANGELOG.md) `[Unreleased]` and git. Candidates need
|
||||||
|
explicit agreement before they join the queue.
|
||||||
|
|
||||||
After a context reset, pick an item marked `agreed` or `in progress`, then work
|
After a context reset, pick an item marked `agreed` or `in progress`, then work
|
||||||
the checklist in its linked plan.
|
the checklist in its linked plan.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
## code-review
|
## queue-retries
|
||||||
|
|
||||||
**Goal:** close the 2026-08-13 full-tree review: domain-admin send-log
|
**Goal:** show on Mail queue and on a delivery's history how this Postfix
|
||||||
authorization, a few fail-closed paths, docs that still say “single-user”,
|
retries deferred mail — first delay, backoff cap, queue lifetime — reading
|
||||||
GUI flash/delete bugs, test gaps, licence/release hygiene.
|
the effective config (`postconf -h`) once at panel start so a manual
|
||||||
|
override is visible.
|
||||||
|
|
||||||
**Boundary:** defects and docs/UI follow-ups inside the current 1.x product.
|
**Boundary:** explanation only. Postfix stays as-is; no attempt counter, no
|
||||||
Not inbound-relay, not DMARC ingestion, not a layer rewrite.
|
panel knobs for queue lifetime, no schema change. Domain administrators see
|
||||||
|
the intervals on `/deliveries/{id}` (they cannot open Mail queue).
|
||||||
|
|
||||||
**Done when:** see the criteria in
|
**Done when:** see the criteria in
|
||||||
[plans/code-review.md](plans/code-review.md).
|
[plans/queue-retries.md](plans/queue-retries.md).
|
||||||
|
|
||||||
**Dependencies / risks:** P0 is confidentiality between panel roles; it
|
**Dependencies / risks:** `postconf` unavailable outside the container
|
||||||
jumps the feature queue. Implementation models are in the plan (Opus / Sonnet
|
(fallback + muted note). Copy must stay time-based — Postfix has no max
|
||||||
/ Haiku / Fable per [development.md](development.md)).
|
attempt count.
|
||||||
**Version:** patch.
|
**Version:** patch.
|
||||||
|
|
||||||
---
|
---
|
||||||
@@ -85,6 +93,44 @@ implementation lands.
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## send-log-retention
|
||||||
|
|
||||||
|
**Goal:** global administrator sets how many days of delivery journal rows
|
||||||
|
(`send_log`, `/deliveries`) are kept, from `/settings` — stored in SQLite
|
||||||
|
`settings`, with `SEND_LOG_RETENTION_DAYS` as bootstrap default only.
|
||||||
|
|
||||||
|
**Boundary:** instance-wide retention; not per-domain. Does not change
|
||||||
|
`mail.log` rotation. Today retention is env-only (default 90 days); the panel
|
||||||
|
has no control.
|
||||||
|
|
||||||
|
**Done when:** see [plans/send-log-retention.md](plans/send-log-retention.md).
|
||||||
|
|
||||||
|
**Dependencies / risks:** log-tailer must re-read settings each prune cycle;
|
||||||
|
delivery UI must stop hardcoding «ninety days».
|
||||||
|
**Version:** `1.x` MINOR; `candidate` until explicitly agreed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## domain-stats-auto-ratelimit
|
||||||
|
|
||||||
|
**Goal:** 30-day sending statistics per domain and application (total, peak and
|
||||||
|
average msg/h) on the domain page, plus optional **auto** level-2 rate limits
|
||||||
|
computed as `ceil(avg_hourly × multiplier)` over the level-1 window.
|
||||||
|
|
||||||
|
**Boundary:** extension of v1.0 manual L2 limits; does not change Postfix
|
||||||
|
level 1. Stats exclude level-1 refusals (not in send log). Auto with zero
|
||||||
|
traffic stays inactive.
|
||||||
|
|
||||||
|
**Done when:** see
|
||||||
|
[plans/domain-stats-auto-ratelimit.md](plans/domain-stats-auto-ratelimit.md).
|
||||||
|
|
||||||
|
**Dependencies / risks:** send log data and preferably
|
||||||
|
[send-log-retention](#send-log-retention) ≥ 30 days; aggregate query cost on
|
||||||
|
large logs; rate-limit path needs security review.
|
||||||
|
**Version:** `1.x` MINOR; `candidate` until explicitly agreed.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## contributing
|
## contributing
|
||||||
|
|
||||||
**Goal:** `CONTRIBUTING.md` in the root — the dev loop, the checks to run
|
**Goal:** `CONTRIBUTING.md` in the root — the dev loop, the checks to run
|
||||||
|
|||||||
+12
-6
@@ -5,7 +5,12 @@ meet; the full v1.0 audit passed. The pre-release review (plan § D, 2026-08-06)
|
|||||||
covered the whole diff from the v1.0 audit (Phase 11) to HEAD and the checklist
|
covered the whole diff from the v1.0 audit (Phase 11) to HEAD and the checklist
|
||||||
in full: no exploitable findings; one defence-in-depth change — `--` before the
|
in full: no exploitable findings; one defence-in-depth change — `--` before the
|
||||||
login in the `saslpasswd2` argv
|
login in the `saslpasswd2` argv
|
||||||
([internal/app/sasl.go](../internal/app/sasl.go)). (2) **Accepted risks** —
|
([internal/app/sasl.go](../internal/app/sasl.go)). The 2026-08-14 review
|
||||||
|
(code-review plan § P7, Fable; reviewer ≠ author) covered the P0–P1 diff of the
|
||||||
|
2026-08-13 full-tree review against this document — send-log authorization for
|
||||||
|
domain administrators, the atomic level-2 admit (`tryAdmit`), fail-closed
|
||||||
|
session creation, and application-delete ordering: no findings, and nothing
|
||||||
|
needed adding to the accepted risks. (2) **Accepted risks** —
|
||||||
deliberate departures beyond the mandatory, recorded so the decision is not
|
deliberate departures beyond the mandatory, recorded so the decision is not
|
||||||
lost.
|
lost.
|
||||||
|
|
||||||
@@ -81,10 +86,11 @@ The panel is exposed to the internet — the items below are **not optional**.
|
|||||||
|
|
||||||
### Backup and domain export
|
### Backup and domain export
|
||||||
|
|
||||||
- Both files are secrets: a full backup carries DKIM keys, `sasldb2`, and the
|
- Both files are secrets: a full backup carries DKIM keys, `sasldb2`, the
|
||||||
administrator's password hash; a domain export carries the DKIM key and
|
administrator's password hash, `docker-compose.yml`, `.env`, and the TLS
|
||||||
**working** application passwords in the clear (otherwise a transfer without
|
private key from `certs/` when present; a domain export carries the DKIM key
|
||||||
recreating credentials would be impossible).
|
and **working** application passwords in the clear (otherwise a transfer
|
||||||
|
without recreating credentials would be impossible).
|
||||||
- Both downloads can be encrypted with a password (a checkbox on the form):
|
- Both downloads can be encrypted with a password (a checkbox on the form):
|
||||||
scrypt (N=2¹⁵, r=8, p=1) → AES-256-GCM, streamed in 64 KiB chunks, each
|
scrypt (N=2¹⁵, r=8, p=1) → AES-256-GCM, streamed in 64 KiB chunks, each
|
||||||
authenticated with the header, the chunk number, and an end-of-stream flag —
|
authenticated with the header, the chunk number, and an end-of-stream flag —
|
||||||
@@ -193,7 +199,7 @@ domain-admin's browser sending a request still needs that domain-admin's own
|
|||||||
cookie, so a token would not add a boundary between roles that the
|
cookie, so a token would not add a boundary between roles that the
|
||||||
authorization checks (`Principal.CanAccessDomain`,
|
authorization checks (`Principal.CanAccessDomain`,
|
||||||
[internal/web/auth/principal.go](../internal/web/auth/principal.go); route
|
[internal/web/auth/principal.go](../internal/web/auth/principal.go); route
|
||||||
gating in [internal/web/auth/middleware.go](../internal/web/auth/middleware.go))
|
gating in [internal/web/handlers/authz.go](../internal/web/handlers/authz.go))
|
||||||
don't already enforce. The remaining case is an external site making a
|
don't already enforce. The remaining case is an external site making a
|
||||||
logged-in user's browser send a request, which the origin check covers without
|
logged-in user's browser send a request, which the origin check covers without
|
||||||
touching a single template.
|
touching a single template.
|
||||||
|
|||||||
+129
-57
@@ -1,23 +1,26 @@
|
|||||||
// Package backup implements SelfPost's full-server backup and the restore
|
// Package backup implements SelfPost's full-server backup and the restore
|
||||||
// version guard (architecture.md § Persistence). A full backup is a
|
// version guard (architecture.md § Persistence). A full backup is a
|
||||||
// gzip-compressed tar of the consolidated persistent state under /data — the
|
// gzip-compressed tar of the consolidated persistent state under /data — the
|
||||||
// SQLite database (as a consistent snapshot), the per-domain DKIM keys and the
|
// SQLite database (as a consistent snapshot), the per-domain DKIM keys, the
|
||||||
// SASL database — plus a manifest recording the SelfPost version that produced
|
// SASL database, and the Postfix queue — plus docker-compose.yml, .env, and
|
||||||
// it. TLS certificates (the reverse proxy's responsibility) and the Postfix
|
// certs/ from the operator's deploy directory, and a manifest recording the
|
||||||
// queue are deliberately excluded (architecture.md § Persistence).
|
// SelfPost version that produced it. Postfix delivery logs under log/ are
|
||||||
|
// excluded (diagnostics, not state).
|
||||||
//
|
//
|
||||||
// Restore is not a separate code path in the panel: a backup is extracted into
|
// Restore is not a separate code path in the panel: a backup is extracted into
|
||||||
// the /data bind mount before first start, and the archive already carries
|
// the operator's project directory (data/, docker-compose.yml, .env, certs/)
|
||||||
// everything the mail path needs — DKIM keys, sasldb2, and Postfix's sender
|
// before first start. The archive carries everything needed to bring the
|
||||||
// map — so nothing needs to be regenerated from SQLite for the daemons to
|
// instance back — DKIM keys, sasldb2, sender map, queue, and deploy files —
|
||||||
// start correctly. The only restore-specific step the panel runs is
|
// so the operator only adjusts hostname or proxy settings on a new host. The
|
||||||
// CheckRestore, which refuses to boot if the manifest's version does not match
|
// restore-specific steps the panel runs are CheckRestore, which refuses to
|
||||||
// the running binary, so schema/format skew between versions cannot silently
|
// boot if the manifest's version does not match the running binary so
|
||||||
// corrupt state (architecture.md § Persistence). If a daemon's on-disk state
|
// schema/format skew between versions cannot silently corrupt state
|
||||||
// ever drifts from what SQLite records — for example after a manual edit
|
// (architecture.md § Persistence), and a one-time Resync of OpenDKIM's tables
|
||||||
// under /data — the Status page's "Reload configuration" button re-derives
|
// and the Postfix sender map from SQLite on that first boot, so any drift
|
||||||
// OpenDKIM's tables and the Postfix sender map from the database; that is a
|
// between the archive and the database is healed before mail flows. If
|
||||||
// deliberate, operator-triggered heal, not something restore does on its own.
|
// on-disk state drifts again later — for example after a manual edit under
|
||||||
|
// /data — the Status page's "Reload configuration" button runs the same
|
||||||
|
// Resync on demand.
|
||||||
package backup
|
package backup
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -39,11 +42,21 @@ import (
|
|||||||
// FormatFull identifies a full-server backup manifest.
|
// FormatFull identifies a full-server backup manifest.
|
||||||
const FormatFull = "selfpost-full-backup"
|
const FormatFull = "selfpost-full-backup"
|
||||||
|
|
||||||
// ManifestName is the manifest's filename, both inside the archive and, after a
|
// ManifestName is the manifest's filename inside the data directory. After
|
||||||
// restore extraction, at the root of the data directory where CheckRestore
|
// restore extraction it lives at data/manifest.json under the project root;
|
||||||
// looks for it.
|
// CheckRestore reads it from the /data bind mount.
|
||||||
const ManifestName = "manifest.json"
|
const ManifestName = "manifest.json"
|
||||||
|
|
||||||
|
// DataArchivePrefix is the path prefix for every /data entry in the archive.
|
||||||
|
const DataArchivePrefix = "data/"
|
||||||
|
|
||||||
|
// ComposeFileName and EnvFileName are required deploy files at the archive root.
|
||||||
|
const (
|
||||||
|
ComposeFileName = "docker-compose.yml"
|
||||||
|
EnvFileName = ".env"
|
||||||
|
CertsDirName = "certs"
|
||||||
|
)
|
||||||
|
|
||||||
// Manifest is the small JSON document embedded in every backup archive. Its
|
// Manifest is the small JSON document embedded in every backup archive. Its
|
||||||
// Version is the single fact that makes restore safe: the panel refuses to
|
// Version is the single fact that makes restore safe: the panel refuses to
|
||||||
// boot a data directory whose manifest version does not match its own binary
|
// boot a data directory whose manifest version does not match its own binary
|
||||||
@@ -57,21 +70,23 @@ type Manifest struct {
|
|||||||
// Params configures a backup. DataDir is the consolidated state root (/data);
|
// Params configures a backup. DataDir is the consolidated state root (/data);
|
||||||
// DBPath is the live SQLite file within it, snapshotted consistently rather than
|
// DBPath is the live SQLite file within it, snapshotted consistently rather than
|
||||||
// copied byte-for-byte while it may be mid-write; Version is stamped into the
|
// copied byte-for-byte while it may be mid-write; Version is stamped into the
|
||||||
// manifest.
|
// manifest; DeployRoot is the host project directory mounted read-only (holds
|
||||||
|
// docker-compose.yml, .env, and optionally certs/). OnWarn is called for
|
||||||
|
// non-fatal issues such as a missing certs/ directory.
|
||||||
type Params struct {
|
type Params struct {
|
||||||
DataDir string
|
DataDir string
|
||||||
DBPath string
|
DBPath string
|
||||||
Version string
|
Version string
|
||||||
|
DeployRoot string
|
||||||
|
OnWarn func(string)
|
||||||
}
|
}
|
||||||
|
|
||||||
// excludedFromArchive lists the data-directory entries a backup never carries.
|
// excludedFromArchive lists the data-directory entries a backup never carries.
|
||||||
// The live database files are replaced by a consistent VACUUM INTO snapshot
|
// The live database files are replaced by a consistent VACUUM INTO snapshot
|
||||||
// written under the canonical name; the setup token is transient bootstrap
|
// written under the canonical name; the setup token is transient bootstrap
|
||||||
// state; a stale manifest from a previous restore must not be re-captured (a
|
// state; a stale manifest from a previous restore must not be re-captured (a
|
||||||
// fresh one is written instead); a "tls" directory holds the reverse proxy's
|
// fresh one is written instead); a "tls" directory under /data is skipped when
|
||||||
// certificates, which are explicitly out of scope for a SelfPost backup
|
// an operator pointed TLS_CERT_FILE inside /data; and "log" is Postfix's raw
|
||||||
// (architecture.md § Persistence) — excluding it keeps that guarantee even when
|
|
||||||
// an operator points TLS_CERT_FILE inside /data; and "log" is Postfix's raw
|
|
||||||
// delivery log plus its fourteen rotated files, which is diagnostic output, not
|
// delivery log plus its fourteen rotated files, which is diagnostic output, not
|
||||||
// state to restore, and by far the largest thing under /data.
|
// state to restore, and by far the largest thing under /data.
|
||||||
var excludedFromArchive = map[string]bool{
|
var excludedFromArchive = map[string]bool{
|
||||||
@@ -85,16 +100,22 @@ var excludedFromArchive = map[string]bool{
|
|||||||
ManifestName: true,
|
ManifestName: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create writes a gzip-compressed tar backup to w. Archive entries are named
|
// Create writes a gzip-compressed tar backup to w. Archive layout:
|
||||||
// relative to DataDir, so extracting the archive into the /data bind mount
|
//
|
||||||
// reconstructs the state in place (architecture.md § Persistence). The SQLite
|
// data/manifest.json, data/selfpost.db, data/<rest of /data>
|
||||||
// database is added as a consistent snapshot under "selfpost.db"; everything
|
// docker-compose.yml, .env, certs/...
|
||||||
// else under DataDir is copied as-is except the entries in
|
//
|
||||||
// excludedFromArchive.
|
// Extract the archive into an empty project directory, then docker compose up.
|
||||||
func Create(w io.Writer, p Params) error {
|
func Create(w io.Writer, p Params) error {
|
||||||
if p.DataDir == "" || p.DBPath == "" {
|
if p.DataDir == "" || p.DBPath == "" {
|
||||||
return fmt.Errorf("backup: DataDir and DBPath are required")
|
return fmt.Errorf("backup: DataDir and DBPath are required")
|
||||||
}
|
}
|
||||||
|
if p.DeployRoot == "" {
|
||||||
|
return fmt.Errorf("backup: DeployRoot is required (mount the project directory at SELFPOST_DEPLOY_ROOT)")
|
||||||
|
}
|
||||||
|
if err := validateDeployRoot(p.DeployRoot); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
snapshot, cleanup, err := snapshotDB(p.DBPath)
|
snapshot, cleanup, err := snapshotDB(p.DBPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -114,17 +135,21 @@ func Create(w io.Writer, p Params) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("backup: encode manifest: %w", err)
|
return fmt.Errorf("backup: encode manifest: %w", err)
|
||||||
}
|
}
|
||||||
if err := writeTarBytes(tw, ManifestName, 0o600, manifestJSON); err != nil {
|
if err := writeTarBytes(tw, DataArchivePrefix+ManifestName, 0o600, manifestJSON); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// The consistent SQLite snapshot, under the canonical filename the panel
|
// The consistent SQLite snapshot, under the canonical filename the panel
|
||||||
// opens on start (the live file and its WAL/SHM are excluded from the walk).
|
// opens on start (the live file and its WAL/SHM are excluded from the walk).
|
||||||
if err := writeTarFile(tw, "selfpost.db", 0o640, snapshot); err != nil {
|
if err := writeTarFile(tw, DataArchivePrefix+"selfpost.db", 0o640, snapshot); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := addTree(tw, p.DataDir); err != nil {
|
if err := addTree(tw, p.DataDir, DataArchivePrefix, excludedFromArchive); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := addDeployFiles(tw, p.DeployRoot, p.OnWarn); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,33 +162,79 @@ func Create(w io.Writer, p Params) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// addTree walks dataDir and adds every regular file (and directory, to preserve
|
// ValidateDeployRoot checks that the operator project directory is mounted and
|
||||||
// empty ones and modes) to tw under its path relative to dataDir, skipping the
|
// contains the files a full backup requires. Call before streaming a response.
|
||||||
// excluded entries. Non-regular, non-directory entries (symlinks, sockets) are
|
func ValidateDeployRoot(deployRoot string) error {
|
||||||
// skipped: /data holds none in normal operation, and copying them into a backup
|
if deployRoot == "" {
|
||||||
// would be meaningless or unsafe.
|
return fmt.Errorf("backup: DeployRoot is required (mount the project directory at SELFPOST_DEPLOY_ROOT)")
|
||||||
func addTree(tw *tar.Writer, dataDir string) error {
|
}
|
||||||
return filepath.WalkDir(dataDir, func(path string, d fs.DirEntry, err error) error {
|
return validateDeployRoot(deployRoot)
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateDeployRoot(deployRoot string) error {
|
||||||
|
for _, name := range []string{ComposeFileName, EnvFileName} {
|
||||||
|
path := filepath.Join(deployRoot, name)
|
||||||
|
if _, err := os.Stat(path); err != nil {
|
||||||
|
return fmt.Errorf("backup: deploy root %q is missing %s: %w", deployRoot, name, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func addDeployFiles(tw *tar.Writer, deployRoot string, onWarn func(string)) error {
|
||||||
|
for _, name := range []string{ComposeFileName, EnvFileName} {
|
||||||
|
src := filepath.Join(deployRoot, name)
|
||||||
|
info, err := os.Stat(src)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("backup: stat deploy file %s: %w", name, err)
|
||||||
|
}
|
||||||
|
if !info.Mode().IsRegular() {
|
||||||
|
return fmt.Errorf("backup: deploy file %s is not a regular file", name)
|
||||||
|
}
|
||||||
|
if err := writeTarFile(tw, name, info.Mode().Perm(), src); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
certsDir := filepath.Join(deployRoot, CertsDirName)
|
||||||
|
if _, err := os.Stat(certsDir); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
if onWarn != nil {
|
||||||
|
onWarn("certs/ not found in deploy root; backup will not include TLS material")
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("backup: stat %s: %w", CertsDirName, err)
|
||||||
|
}
|
||||||
|
return addTree(tw, certsDir, CertsDirName+"/", nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// addTree walks root and adds every regular file (and directory, to preserve
|
||||||
|
// empty ones and modes) to tw under archivePrefix + path relative to root.
|
||||||
|
// When exclude is non-nil, top-level names relative to root are skipped.
|
||||||
|
// Non-regular, non-directory entries (symlinks, sockets) are skipped.
|
||||||
|
func addTree(tw *tar.Writer, root, archivePrefix string, exclude map[string]bool) error {
|
||||||
|
return filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
rel, err := filepath.Rel(dataDir, path)
|
rel, err := filepath.Rel(root, path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if rel == "." {
|
if rel == "." {
|
||||||
return nil // the data root itself is implicit
|
return nil
|
||||||
}
|
}
|
||||||
// filepath.Rel yields OS separators; tar names use forward slashes.
|
name := archivePrefix + filepath.ToSlash(rel)
|
||||||
name := filepath.ToSlash(rel)
|
if exclude != nil {
|
||||||
// Exclude by top-level name (the live DB, setup token and stale manifest
|
top := strings.Split(filepath.ToSlash(rel), "/")[0]
|
||||||
// all live at the data root).
|
if exclude[top] {
|
||||||
if excludedFromArchive[name] {
|
|
||||||
if d.IsDir() {
|
if d.IsDir() {
|
||||||
return fs.SkipDir
|
return fs.SkipDir
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
info, err := d.Info()
|
info, err := d.Info()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -181,7 +252,7 @@ func addTree(tw *tar.Writer, dataDir string) error {
|
|||||||
case info.Mode().IsRegular():
|
case info.Mode().IsRegular():
|
||||||
return writeTarFile(tw, name, info.Mode().Perm(), path)
|
return writeTarFile(tw, name, info.Mode().Perm(), path)
|
||||||
default:
|
default:
|
||||||
return nil // skip symlinks/sockets/devices
|
return nil
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -269,33 +340,34 @@ func snapshotDB(dbPath string) (path string, cleanup func(), err error) {
|
|||||||
// directory), its version must match binaryVersion or the panel refuses to
|
// directory), its version must match binaryVersion or the panel refuses to
|
||||||
// start, telling the operator which image tag to use. On a match the manifest
|
// start, telling the operator which image tag to use. On a match the manifest
|
||||||
// is consumed (deleted) so it guards only the first boot after a restore and
|
// is consumed (deleted) so it guards only the first boot after a restore and
|
||||||
// never blocks a later in-place image upgrade. Absence of the manifest is the
|
// never blocks a later in-place image upgrade, and restored is true so the
|
||||||
// normal case and returns nil.
|
// caller can heal drifted daemon maps once. Absence of the manifest is the
|
||||||
func CheckRestore(manifestPath, binaryVersion string) error {
|
// normal case and returns restored == false with a nil error.
|
||||||
|
func CheckRestore(manifestPath, binaryVersion string) (restored bool, err error) {
|
||||||
data, err := os.ReadFile(manifestPath)
|
data, err := os.ReadFile(manifestPath)
|
||||||
if os.IsNotExist(err) {
|
if os.IsNotExist(err) {
|
||||||
return nil // ordinary start, not a restore
|
return false, nil // ordinary start, not a restore
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("backup: read restore manifest: %w", err)
|
return false, fmt.Errorf("backup: read restore manifest: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
var m Manifest
|
var m Manifest
|
||||||
if err := json.Unmarshal(data, &m); err != nil {
|
if err := json.Unmarshal(data, &m); err != nil {
|
||||||
return fmt.Errorf("backup: restore manifest %s is not valid JSON: %w", manifestPath, err)
|
return false, fmt.Errorf("backup: restore manifest %s is not valid JSON: %w", manifestPath, err)
|
||||||
}
|
}
|
||||||
if m.Format != FormatFull {
|
if m.Format != FormatFull {
|
||||||
return fmt.Errorf("backup: %s is not a SelfPost full backup manifest (format %q)", manifestPath, m.Format)
|
return false, fmt.Errorf("backup: %s is not a SelfPost full backup manifest (format %q)", manifestPath, m.Format)
|
||||||
}
|
}
|
||||||
if m.Version != binaryVersion {
|
if m.Version != binaryVersion {
|
||||||
return fmt.Errorf(
|
return false, fmt.Errorf(
|
||||||
"backup: this backup was created by SelfPost %s but this image is %s — restore into the matching image (selfpost:%s)",
|
"backup: this backup was created by SelfPost %s but this image is %s — restore into the matching image (selfpost:%s)",
|
||||||
m.Version, binaryVersion, m.Version)
|
m.Version, binaryVersion, m.Version)
|
||||||
}
|
}
|
||||||
// Version matches: consume the manifest so subsequent normal starts (and
|
// Version matches: consume the manifest so subsequent normal starts (and
|
||||||
// in-place upgrades) are not gated by it.
|
// in-place upgrades) are not gated by it.
|
||||||
if err := os.Remove(manifestPath); err != nil {
|
if err := os.Remove(manifestPath); err != nil {
|
||||||
return fmt.Errorf("backup: consume restore manifest: %w", err)
|
return false, fmt.Errorf("backup: consume restore manifest: %w", err)
|
||||||
}
|
}
|
||||||
return nil
|
return true, nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,10 +15,15 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// seedDataDir builds a realistic /data tree: a migrated SQLite database plus the
|
// seedDataDir builds a realistic /data tree: a migrated SQLite database plus the
|
||||||
// DKIM key, SASL and transient files a backup must include or exclude.
|
// DKIM key, SASL and transient files a backup must include or exclude. It also
|
||||||
func seedDataDir(t *testing.T) (dataDir, dbPath string) {
|
// seeds a deploy root beside data/ with compose, .env, and certs/.
|
||||||
|
func seedDataDir(t *testing.T) (dataDir, dbPath, deployRoot string) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
dataDir = t.TempDir()
|
deployRoot = t.TempDir()
|
||||||
|
dataDir = filepath.Join(deployRoot, "data")
|
||||||
|
if err := os.MkdirAll(dataDir, 0o750); err != nil {
|
||||||
|
t.Fatalf("mkdir data: %v", err)
|
||||||
|
}
|
||||||
dbPath = filepath.Join(dataDir, "selfpost.db")
|
dbPath = filepath.Join(dataDir, "selfpost.db")
|
||||||
|
|
||||||
st, err := store.Open(dbPath)
|
st, err := store.Open(dbPath)
|
||||||
@@ -35,6 +40,7 @@ func seedDataDir(t *testing.T) (dataDir, dbPath string) {
|
|||||||
writeFile(t, filepath.Join(dataDir, "opendkim", "keys", "example.com", "selfpost.private"), "PRIVATE KEY")
|
writeFile(t, filepath.Join(dataDir, "opendkim", "keys", "example.com", "selfpost.private"), "PRIVATE KEY")
|
||||||
writeFile(t, filepath.Join(dataDir, "sasl", "sasldb2"), "SASLDB")
|
writeFile(t, filepath.Join(dataDir, "sasl", "sasldb2"), "SASLDB")
|
||||||
writeFile(t, filepath.Join(dataDir, "postfix", "sender_login_maps"), "@example.com login")
|
writeFile(t, filepath.Join(dataDir, "postfix", "sender_login_maps"), "@example.com login")
|
||||||
|
writeFile(t, filepath.Join(dataDir, "postfix", "queue", "deferred", "sample"), "queue-file")
|
||||||
// Transient files that must NOT be archived.
|
// Transient files that must NOT be archived.
|
||||||
writeFile(t, filepath.Join(dataDir, "setup-token"), "secret-token")
|
writeFile(t, filepath.Join(dataDir, "setup-token"), "secret-token")
|
||||||
writeFile(t, filepath.Join(dataDir, "selfpost.db-wal"), "wal")
|
writeFile(t, filepath.Join(dataDir, "selfpost.db-wal"), "wal")
|
||||||
@@ -43,7 +49,11 @@ func seedDataDir(t *testing.T) (dataDir, dbPath string) {
|
|||||||
// state, and the bulkiest thing under /data.
|
// state, and the bulkiest thing under /data.
|
||||||
writeFile(t, filepath.Join(dataDir, "log", "mail.log"), "Aug 8 07:26:41 mail postfix/smtp[1]: ABC: to=<a@example.net>, status=sent (ok)")
|
writeFile(t, filepath.Join(dataDir, "log", "mail.log"), "Aug 8 07:26:41 mail postfix/smtp[1]: ABC: to=<a@example.net>, status=sent (ok)")
|
||||||
writeFile(t, filepath.Join(dataDir, "log", "mail.log.1"), "older")
|
writeFile(t, filepath.Join(dataDir, "log", "mail.log.1"), "older")
|
||||||
return dataDir, dbPath
|
writeFile(t, filepath.Join(deployRoot, ComposeFileName), "services:\n selfpost:\n image: test\n")
|
||||||
|
writeFile(t, filepath.Join(deployRoot, EnvFileName), "SELFPOST_HOSTNAME=mail.example.com\n")
|
||||||
|
writeFile(t, filepath.Join(deployRoot, CertsDirName, "fullchain.pem"), "CERT")
|
||||||
|
writeFile(t, filepath.Join(deployRoot, CertsDirName, "privkey.pem"), "KEY")
|
||||||
|
return dataDir, dbPath, deployRoot
|
||||||
}
|
}
|
||||||
|
|
||||||
func writeFile(t *testing.T, path, content string) {
|
func writeFile(t *testing.T, path, content string) {
|
||||||
@@ -87,21 +97,26 @@ func readArchive(t *testing.T, data []byte) map[string]string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateIncludesStateExcludesTransient(t *testing.T) {
|
func TestCreateIncludesStateExcludesTransient(t *testing.T) {
|
||||||
dataDir, dbPath := seedDataDir(t)
|
dataDir, dbPath, deployRoot := seedDataDir(t)
|
||||||
|
|
||||||
var buf bytes.Buffer
|
var buf bytes.Buffer
|
||||||
if err := Create(&buf, Params{DataDir: dataDir, DBPath: dbPath, Version: "1.2.3"}); err != nil {
|
if err := Create(&buf, Params{DataDir: dataDir, DBPath: dbPath, Version: "1.2.3", DeployRoot: deployRoot}); err != nil {
|
||||||
t.Fatalf("Create: %v", err)
|
t.Fatalf("Create: %v", err)
|
||||||
}
|
}
|
||||||
files := readArchive(t, buf.Bytes())
|
files := readArchive(t, buf.Bytes())
|
||||||
|
|
||||||
// Present.
|
// Present.
|
||||||
for _, name := range []string{
|
for _, name := range []string{
|
||||||
ManifestName,
|
DataArchivePrefix + ManifestName,
|
||||||
"selfpost.db",
|
DataArchivePrefix + "selfpost.db",
|
||||||
"opendkim/keys/example.com/selfpost.private",
|
DataArchivePrefix + "opendkim/keys/example.com/selfpost.private",
|
||||||
"sasl/sasldb2",
|
DataArchivePrefix + "sasl/sasldb2",
|
||||||
"postfix/sender_login_maps",
|
DataArchivePrefix + "postfix/sender_login_maps",
|
||||||
|
DataArchivePrefix + "postfix/queue/deferred/sample",
|
||||||
|
ComposeFileName,
|
||||||
|
EnvFileName,
|
||||||
|
CertsDirName + "/fullchain.pem",
|
||||||
|
CertsDirName + "/privkey.pem",
|
||||||
} {
|
} {
|
||||||
if _, ok := files[name]; !ok {
|
if _, ok := files[name]; !ok {
|
||||||
t.Errorf("archive missing %s", name)
|
t.Errorf("archive missing %s", name)
|
||||||
@@ -109,8 +124,11 @@ func TestCreateIncludesStateExcludesTransient(t *testing.T) {
|
|||||||
}
|
}
|
||||||
// Excluded.
|
// Excluded.
|
||||||
for _, name := range []string{
|
for _, name := range []string{
|
||||||
"setup-token", "selfpost.db-wal", "selfpost.db-shm",
|
DataArchivePrefix + "setup-token",
|
||||||
"log/mail.log", "log/mail.log.1",
|
DataArchivePrefix + "selfpost.db-wal",
|
||||||
|
DataArchivePrefix + "selfpost.db-shm",
|
||||||
|
DataArchivePrefix + "log/mail.log",
|
||||||
|
DataArchivePrefix + "log/mail.log.1",
|
||||||
} {
|
} {
|
||||||
if _, ok := files[name]; ok {
|
if _, ok := files[name]; ok {
|
||||||
t.Errorf("archive should not contain %s", name)
|
t.Errorf("archive should not contain %s", name)
|
||||||
@@ -119,7 +137,7 @@ func TestCreateIncludesStateExcludesTransient(t *testing.T) {
|
|||||||
|
|
||||||
// Manifest is well-formed and carries the version.
|
// Manifest is well-formed and carries the version.
|
||||||
var m Manifest
|
var m Manifest
|
||||||
if err := json.Unmarshal([]byte(files[ManifestName]), &m); err != nil {
|
if err := json.Unmarshal([]byte(files[DataArchivePrefix+ManifestName]), &m); err != nil {
|
||||||
t.Fatalf("manifest json: %v", err)
|
t.Fatalf("manifest json: %v", err)
|
||||||
}
|
}
|
||||||
if m.Format != FormatFull || m.Version != "1.2.3" {
|
if m.Format != FormatFull || m.Version != "1.2.3" {
|
||||||
@@ -128,7 +146,7 @@ func TestCreateIncludesStateExcludesTransient(t *testing.T) {
|
|||||||
|
|
||||||
// The archived selfpost.db is a real, openable SQLite snapshot with our data.
|
// The archived selfpost.db is a real, openable SQLite snapshot with our data.
|
||||||
snapPath := filepath.Join(t.TempDir(), "restored.db")
|
snapPath := filepath.Join(t.TempDir(), "restored.db")
|
||||||
if err := os.WriteFile(snapPath, []byte(files["selfpost.db"]), 0o640); err != nil {
|
if err := os.WriteFile(snapPath, []byte(files[DataArchivePrefix+"selfpost.db"]), 0o640); err != nil {
|
||||||
t.Fatalf("write snapshot: %v", err)
|
t.Fatalf("write snapshot: %v", err)
|
||||||
}
|
}
|
||||||
st, err := store.Open(snapPath)
|
st, err := store.Open(snapPath)
|
||||||
@@ -145,6 +163,14 @@ func TestCreateIncludesStateExcludesTransient(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestCreateRequiresDeployRoot(t *testing.T) {
|
||||||
|
dataDir, dbPath, _ := seedDataDir(t)
|
||||||
|
var buf bytes.Buffer
|
||||||
|
if err := Create(&buf, Params{DataDir: dataDir, DBPath: dbPath, Version: "1.0.0"}); err == nil {
|
||||||
|
t.Fatal("Create without DeployRoot succeeded")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func writeManifest(t *testing.T, dir, format, version string) string {
|
func writeManifest(t *testing.T, dir, format, version string) string {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
path := filepath.Join(dir, ManifestName)
|
path := filepath.Join(dir, ManifestName)
|
||||||
@@ -156,17 +182,25 @@ func writeManifest(t *testing.T, dir, format, version string) string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestCheckRestoreNoManifestIsNormalStart(t *testing.T) {
|
func TestCheckRestoreNoManifestIsNormalStart(t *testing.T) {
|
||||||
if err := CheckRestore(filepath.Join(t.TempDir(), "manifest.json"), "1.0.0"); err != nil {
|
restored, err := CheckRestore(filepath.Join(t.TempDir(), "manifest.json"), "1.0.0")
|
||||||
|
if err != nil {
|
||||||
t.Errorf("CheckRestore with no manifest = %v, want nil", err)
|
t.Errorf("CheckRestore with no manifest = %v, want nil", err)
|
||||||
}
|
}
|
||||||
|
if restored {
|
||||||
|
t.Error("CheckRestore with no manifest reported a restore")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCheckRestoreMatchConsumesManifest(t *testing.T) {
|
func TestCheckRestoreMatchConsumesManifest(t *testing.T) {
|
||||||
dir := t.TempDir()
|
dir := t.TempDir()
|
||||||
path := writeManifest(t, dir, FormatFull, "1.0.0")
|
path := writeManifest(t, dir, FormatFull, "1.0.0")
|
||||||
if err := CheckRestore(path, "1.0.0"); err != nil {
|
restored, err := CheckRestore(path, "1.0.0")
|
||||||
|
if err != nil {
|
||||||
t.Fatalf("CheckRestore matching = %v, want nil", err)
|
t.Fatalf("CheckRestore matching = %v, want nil", err)
|
||||||
}
|
}
|
||||||
|
if !restored {
|
||||||
|
t.Fatal("CheckRestore matching did not report a restore")
|
||||||
|
}
|
||||||
if _, err := os.Stat(path); !os.IsNotExist(err) {
|
if _, err := os.Stat(path); !os.IsNotExist(err) {
|
||||||
t.Errorf("manifest should be consumed after a matching restore, stat err = %v", err)
|
t.Errorf("manifest should be consumed after a matching restore, stat err = %v", err)
|
||||||
}
|
}
|
||||||
@@ -175,10 +209,13 @@ func TestCheckRestoreMatchConsumesManifest(t *testing.T) {
|
|||||||
func TestCheckRestoreVersionMismatchRefusesAndKeeps(t *testing.T) {
|
func TestCheckRestoreVersionMismatchRefusesAndKeeps(t *testing.T) {
|
||||||
dir := t.TempDir()
|
dir := t.TempDir()
|
||||||
path := writeManifest(t, dir, FormatFull, "1.0.0")
|
path := writeManifest(t, dir, FormatFull, "1.0.0")
|
||||||
err := CheckRestore(path, "2.0.0")
|
restored, err := CheckRestore(path, "2.0.0")
|
||||||
if err == nil {
|
if err == nil {
|
||||||
t.Fatal("CheckRestore mismatch = nil, want error")
|
t.Fatal("CheckRestore mismatch = nil, want error")
|
||||||
}
|
}
|
||||||
|
if restored {
|
||||||
|
t.Error("CheckRestore mismatch reported a restore")
|
||||||
|
}
|
||||||
if !strings.Contains(err.Error(), "1.0.0") || !strings.Contains(err.Error(), "2.0.0") {
|
if !strings.Contains(err.Error(), "1.0.0") || !strings.Contains(err.Error(), "2.0.0") {
|
||||||
t.Errorf("error should name both versions: %v", err)
|
t.Errorf("error should name both versions: %v", err)
|
||||||
}
|
}
|
||||||
@@ -190,7 +227,11 @@ func TestCheckRestoreVersionMismatchRefusesAndKeeps(t *testing.T) {
|
|||||||
func TestCheckRestoreWrongFormatRejected(t *testing.T) {
|
func TestCheckRestoreWrongFormatRejected(t *testing.T) {
|
||||||
dir := t.TempDir()
|
dir := t.TempDir()
|
||||||
path := writeManifest(t, dir, "something-else", "1.0.0")
|
path := writeManifest(t, dir, "something-else", "1.0.0")
|
||||||
if err := CheckRestore(path, "1.0.0"); err == nil {
|
restored, err := CheckRestore(path, "1.0.0")
|
||||||
|
if err == nil {
|
||||||
t.Error("CheckRestore accepted a non-backup manifest")
|
t.Error("CheckRestore accepted a non-backup manifest")
|
||||||
}
|
}
|
||||||
|
if restored {
|
||||||
|
t.Error("CheckRestore wrong format reported a restore")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,6 +167,14 @@ func (o *OpenDKIM) Reload() error {
|
|||||||
return o.reload()
|
return o.reload()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetReloadHook replaces how configuration is applied after a rebuild. Tests
|
||||||
|
// that cannot reach supervisord use this to verify file regeneration alone.
|
||||||
|
func (o *OpenDKIM) SetReloadHook(fn func() error) {
|
||||||
|
if fn != nil {
|
||||||
|
o.reload = fn
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// renderTables builds the KeyTable and SigningTable byte contents for a domain
|
// renderTables builds the KeyTable and SigningTable byte contents for a domain
|
||||||
// set, sorted by name so the output is deterministic. Every domain is
|
// set, sorted by name so the output is deterministic. Every domain is
|
||||||
// re-checked for shell/config-injection safety before being written
|
// re-checked for shell/config-injection safety before being written
|
||||||
|
|||||||
@@ -14,8 +14,9 @@ import (
|
|||||||
var License []byte
|
var License []byte
|
||||||
|
|
||||||
// SourceURL is where Corresponding Source for the published upstream
|
// SourceURL is where Corresponding Source for the published upstream
|
||||||
// releases lives. Operators who ship a modified version must point their
|
// releases lives. It is injected into the panel footer by view.go.
|
||||||
// users at their own sources instead (NOTICE; AGPL-3.0 §13).
|
// Operators who ship a modified version must change this constant so the
|
||||||
|
// footer points at their own sources (NOTICE; AGPL-3.0 §13).
|
||||||
const SourceURL = "https://github.com/mixeme/selfpost"
|
const SourceURL = "https://github.com/mixeme/selfpost"
|
||||||
|
|
||||||
// CopyrightLine is the short copyright notice shown in the panel footer.
|
// CopyrightLine is the short copyright notice shown in the panel footer.
|
||||||
|
|||||||
@@ -19,3 +19,22 @@ func TestEmbeddedLicenseMatchesRoot(t *testing.T) {
|
|||||||
t.Fatal("embedded LICENSE is empty")
|
t.Fatal("embedded LICENSE is empty")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NOTICE used to tell modifiers to edit layout.html for the Source URL. The
|
||||||
|
// footer reads legal.SourceURL; a fork that only changed the template would
|
||||||
|
// still advertise the upstream repo.
|
||||||
|
func TestNoticePointsAtSourceURLConstant(t *testing.T) {
|
||||||
|
notice, err := os.ReadFile(filepath.Join("..", "..", "NOTICE"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read NOTICE: %v", err)
|
||||||
|
}
|
||||||
|
if !bytes.Contains(notice, []byte("internal/legal/legal.go")) {
|
||||||
|
t.Error("NOTICE must tell modifiers to update SourceURL in internal/legal/legal.go")
|
||||||
|
}
|
||||||
|
if bytes.Contains(notice, []byte("layout.html")) {
|
||||||
|
t.Error("NOTICE still tells modifiers to edit layout.html for the Source URL")
|
||||||
|
}
|
||||||
|
if !bytes.Contains(notice, []byte("internal/web/view/static/OFL.txt")) {
|
||||||
|
t.Error("NOTICE must point at the OFL text that travels with the Plex fonts")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -75,6 +75,14 @@ func (p *Postfix) Reload() error {
|
|||||||
return p.reload()
|
return p.reload()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetReloadHook replaces how configuration is applied after a rebuild. Tests
|
||||||
|
// that cannot reach supervisord use this to verify file regeneration alone.
|
||||||
|
func (p *Postfix) SetReloadHook(fn func() error) {
|
||||||
|
if fn != nil {
|
||||||
|
p.reload = fn
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// renderSenderLoginMaps builds the sender_login_maps file contents. Keys are
|
// renderSenderLoginMaps builds the sender_login_maps file contents. Keys are
|
||||||
// sorted for deterministic output and the logins under each key are sorted and
|
// sorted for deterministic output and the logins under each key are sorted and
|
||||||
// de-duplicated. Every address and login is re-checked for injection safety
|
// de-duplicated. Every address and login is re-checked for injection safety
|
||||||
|
|||||||
@@ -75,6 +75,32 @@ func (s *Store) ListDomains() ([]Domain, error) {
|
|||||||
return out, rows.Err()
|
return out, rows.Err()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ListDomainsForUser returns domains assigned to userID with application counts,
|
||||||
|
// ordered by name.
|
||||||
|
func (s *Store) ListDomainsForUser(userID int64) ([]Domain, error) {
|
||||||
|
rows, err := s.db.Query(`
|
||||||
|
SELECT d.id, d.name, d.dkim_selector, d.dmarc_rua, d.created_at,
|
||||||
|
(SELECT COUNT(*) FROM applications a WHERE a.domain_id = d.id)
|
||||||
|
FROM domains d
|
||||||
|
INNER JOIN user_domains ud ON ud.domain_id = d.id
|
||||||
|
WHERE ud.user_id = ?
|
||||||
|
ORDER BY d.name`, userID)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("list domains for user: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []Domain
|
||||||
|
for rows.Next() {
|
||||||
|
d, err := scanDomain(rows)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
out = append(out, d)
|
||||||
|
}
|
||||||
|
return out, rows.Err()
|
||||||
|
}
|
||||||
|
|
||||||
// GetDomain returns a single domain (with its application count) by id, or
|
// GetDomain returns a single domain (with its application count) by id, or
|
||||||
// ErrDomainNotFound.
|
// ErrDomainNotFound.
|
||||||
func (s *Store) GetDomain(id int64) (Domain, error) {
|
func (s *Store) GetDomain(id int64) (Domain, error) {
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ func New(st *store.Store, cfg Config, v *view.Engine, setupTokenPath string) *Mo
|
|||||||
loginLimiter: newRateLimiter(10, 15*time.Minute),
|
loginLimiter: newRateLimiter(10, 15*time.Minute),
|
||||||
trustedProxies: cfg.TrustedProxyCIDRs,
|
trustedProxies: cfg.TrustedProxyCIDRs,
|
||||||
}
|
}
|
||||||
|
m.setupLimiter.startSweeper()
|
||||||
|
m.loginLimiter.startSweeper()
|
||||||
m.setup = newSetupManager(st, cfg.Hostname, setupTokenPath)
|
m.setup = newSetupManager(st, cfg.Hostname, setupTokenPath)
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,15 +44,3 @@ func CurrentUser(r *http.Request) string {
|
|||||||
}
|
}
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
// RequireGlobal wraps a handler that only global administrators may reach.
|
|
||||||
func RequireGlobal(next http.Handler) http.Handler {
|
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
p, ok := CurrentPrincipal(r.Context())
|
|
||||||
if !ok || !p.IsGlobal() {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
next.ServeHTTP(w, r)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -5,11 +5,14 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const defaultMaxBuckets = 4096
|
||||||
|
|
||||||
// rateLimiter is a simple fixed-window per-key counter used to throttle the
|
// rateLimiter is a simple fixed-window per-key counter used to throttle the
|
||||||
// setup and login routes (security.md). Keys are client IPs.
|
// setup and login routes (security.md). Keys are client IPs.
|
||||||
type rateLimiter struct {
|
type rateLimiter struct {
|
||||||
max int
|
max int
|
||||||
window time.Duration
|
window time.Duration
|
||||||
|
maxBuckets int
|
||||||
|
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
buckets map[string]*rlBucket
|
buckets map[string]*rlBucket
|
||||||
@@ -24,10 +27,23 @@ func newRateLimiter(max int, window time.Duration) *rateLimiter {
|
|||||||
return &rateLimiter{
|
return &rateLimiter{
|
||||||
max: max,
|
max: max,
|
||||||
window: window,
|
window: window,
|
||||||
|
maxBuckets: defaultMaxBuckets,
|
||||||
buckets: make(map[string]*rlBucket),
|
buckets: make(map[string]*rlBucket),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *rateLimiter) startSweeper() {
|
||||||
|
go func() {
|
||||||
|
ticker := time.NewTicker(r.window)
|
||||||
|
defer ticker.Stop()
|
||||||
|
for range ticker.C {
|
||||||
|
r.mu.Lock()
|
||||||
|
r.sweep(time.Now())
|
||||||
|
r.mu.Unlock()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|
||||||
func (r *rateLimiter) Allow(key string) bool {
|
func (r *rateLimiter) Allow(key string) bool {
|
||||||
now := time.Now()
|
now := time.Now()
|
||||||
r.mu.Lock()
|
r.mu.Lock()
|
||||||
@@ -35,6 +51,7 @@ func (r *rateLimiter) Allow(key string) bool {
|
|||||||
|
|
||||||
b := r.buckets[key]
|
b := r.buckets[key]
|
||||||
if b == nil || now.After(b.windowEnds) {
|
if b == nil || now.After(b.windowEnds) {
|
||||||
|
r.makeRoom(now)
|
||||||
r.buckets[key] = &rlBucket{count: 1, windowEnds: now.Add(r.window)}
|
r.buckets[key] = &rlBucket{count: 1, windowEnds: now.Add(r.window)}
|
||||||
r.sweep(now)
|
r.sweep(now)
|
||||||
return true
|
return true
|
||||||
@@ -46,6 +63,32 @@ func (r *rateLimiter) Allow(key string) bool {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *rateLimiter) makeRoom(now time.Time) {
|
||||||
|
if r.maxBuckets <= 0 || len(r.buckets) < r.maxBuckets {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
r.sweep(now)
|
||||||
|
for len(r.buckets) >= r.maxBuckets {
|
||||||
|
r.evictOldest()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *rateLimiter) evictOldest() {
|
||||||
|
var oldestKey string
|
||||||
|
var oldestEnds time.Time
|
||||||
|
first := true
|
||||||
|
for k, b := range r.buckets {
|
||||||
|
if first || b.windowEnds.Before(oldestEnds) {
|
||||||
|
oldestKey = k
|
||||||
|
oldestEnds = b.windowEnds
|
||||||
|
first = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if oldestKey != "" {
|
||||||
|
delete(r.buckets, oldestKey)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (r *rateLimiter) sweep(now time.Time) {
|
func (r *rateLimiter) sweep(now time.Time) {
|
||||||
for k, b := range r.buckets {
|
for k, b := range r.buckets {
|
||||||
if now.After(b.windowEnds) {
|
if now.After(b.windowEnds) {
|
||||||
|
|||||||
@@ -98,3 +98,28 @@ func expire(r *rateLimiter, key string) {
|
|||||||
b.windowEnds = time.Now().Add(-time.Second)
|
b.windowEnds = time.Now().Add(-time.Second)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A long-running panel can see many unique client addresses. Finished buckets
|
||||||
|
// are swept on every new window, and a hard cap evicts the oldest when the map
|
||||||
|
// would otherwise grow without bound.
|
||||||
|
func TestRateLimiterCapsBucketCount(t *testing.T) {
|
||||||
|
r := newRateLimiter(1, time.Minute)
|
||||||
|
r.maxBuckets = 3
|
||||||
|
|
||||||
|
for i, key := range []string{"203.0.113.7", "198.51.100.9", "192.0.2.5"} {
|
||||||
|
if !r.Allow(key) {
|
||||||
|
t.Fatalf("attempt %d for %s was refused under the cap", i+1, key)
|
||||||
|
}
|
||||||
|
expire(r, key)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !r.Allow("203.0.113.8") {
|
||||||
|
t.Fatal("a fourth address was refused even though room was made")
|
||||||
|
}
|
||||||
|
|
||||||
|
r.mu.Lock()
|
||||||
|
defer r.mu.Unlock()
|
||||||
|
if len(r.buckets) > 3 {
|
||||||
|
t.Fatalf("bucket count = %d, want at most 3", len(r.buckets))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -32,17 +32,7 @@ func (h *Handlers) assignedDomains(p auth.Principal) ([]store.Domain, error) {
|
|||||||
if p.IsGlobal() {
|
if p.IsGlobal() {
|
||||||
return h.store.ListDomains()
|
return h.store.ListDomains()
|
||||||
}
|
}
|
||||||
all, err := h.store.ListDomains()
|
return h.store.ListDomainsForUser(p.ID)
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
var out []store.Domain
|
|
||||||
for _, d := range all {
|
|
||||||
if p.CanAccessDomain(d.ID) {
|
|
||||||
out = append(out, d)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func domainNameSet(domains []store.Domain) map[string]bool {
|
func domainNameSet(domains []store.Domain) map[string]bool {
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ var globalOnlyRoutes = []route{
|
|||||||
// case the send-log leak (P0, code-review.md) showed is easy to get wrong.
|
// case the send-log leak (P0, code-review.md) showed is easy to get wrong.
|
||||||
func TestGlobalOnlyRoutesAnswerADomainAdmin404(t *testing.T) {
|
func TestGlobalOnlyRoutesAnswerADomainAdmin404(t *testing.T) {
|
||||||
h, domains := serverWithTwoDomains(t)
|
h, domains := serverWithTwoDomains(t)
|
||||||
p := domainAdmin(domains["first.example.ru"].ID)
|
p := domainAdmin(t, h.store, "global-only", domains["first.example.ru"].ID)
|
||||||
|
|
||||||
for _, rt := range globalOnlyRoutes {
|
for _, rt := range globalOnlyRoutes {
|
||||||
rec := call(h, rt, p)
|
rec := call(h, rt, p)
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ type Config struct {
|
|||||||
MailLogPath string
|
MailLogPath string
|
||||||
DataDir string
|
DataDir string
|
||||||
DBPath string
|
DBPath string
|
||||||
|
DeployRoot string
|
||||||
Version string
|
Version string
|
||||||
TLSCertFile string
|
TLSCertFile string
|
||||||
OpenDKIMSocket string
|
OpenDKIMSocket string
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/mixeme/selfpost/internal/backup"
|
"github.com/mixeme/selfpost/internal/backup"
|
||||||
@@ -70,6 +71,11 @@ func (h *Handlers) HandleBackup(w http.ResponseWriter, r *http.Request) {
|
|||||||
h.renderBackupPageWith(w, r, http.StatusBadRequest, "", pwErr)
|
h.renderBackupPageWith(w, r, http.StatusBadRequest, "", pwErr)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
if err := backup.ValidateDeployRoot(h.cfg.DeployRoot); err != nil {
|
||||||
|
logf("panel: full backup: %v", err)
|
||||||
|
h.renderBackupPageWith(w, r, http.StatusBadRequest, "", deployBackupErr(err))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
stamp := time.Now().UTC().Format("20060102-150405")
|
stamp := time.Now().UTC().Format("20060102-150405")
|
||||||
filename := fmt.Sprintf("selfpost-backup-%s.tar.gz", stamp)
|
filename := fmt.Sprintf("selfpost-backup-%s.tar.gz", stamp)
|
||||||
@@ -108,6 +114,10 @@ func (h *Handlers) HandleBackup(w http.ResponseWriter, r *http.Request) {
|
|||||||
DataDir: h.cfg.DataDir,
|
DataDir: h.cfg.DataDir,
|
||||||
DBPath: h.cfg.DBPath,
|
DBPath: h.cfg.DBPath,
|
||||||
Version: h.cfg.Version,
|
Version: h.cfg.Version,
|
||||||
|
DeployRoot: h.cfg.DeployRoot,
|
||||||
|
OnWarn: func(msg string) {
|
||||||
|
logf("panel: full backup: %s", msg)
|
||||||
|
},
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
logf("panel: full backup failed: %v", err)
|
logf("panel: full backup failed: %v", err)
|
||||||
return
|
return
|
||||||
@@ -310,6 +320,14 @@ func decryptErrorMessage(err error) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// deployBackupErr phrases a pre-flight backup failure for the operator.
|
||||||
|
func deployBackupErr(err error) string {
|
||||||
|
if strings.Contains(err.Error(), "DeployRoot") || strings.Contains(err.Error(), "deploy root") {
|
||||||
|
return "Full backup needs the project directory mounted read-only at /selfpost-deploy — add <code>.:/selfpost-deploy:ro</code> to docker-compose.yml and recreate the container."
|
||||||
|
}
|
||||||
|
return "Could not create the backup: " + err.Error()
|
||||||
|
}
|
||||||
|
|
||||||
// importErrorMessage maps a domain-import failure (already logged by the caller)
|
// importErrorMessage maps a domain-import failure (already logged by the caller)
|
||||||
// to an HTTP status and a user-facing message. Duplicate domain/login are called
|
// to an HTTP status and a user-facing message. Duplicate domain/login are called
|
||||||
// out specifically; other failures — validation errors describing what is wrong
|
// out specifically; other failures — validation errors describing what is wrong
|
||||||
|
|||||||
@@ -222,34 +222,41 @@ func TestSendLogScopedToAssignedDomains(t *testing.T) {
|
|||||||
h, domains := serverWithTwoDomains(t)
|
h, domains := serverWithTwoDomains(t)
|
||||||
|
|
||||||
for name, tc := range map[string]struct {
|
for name, tc := range map[string]struct {
|
||||||
principal auth.Principal
|
username string
|
||||||
|
domainIDs []int64
|
||||||
want []string
|
want []string
|
||||||
unwanted []string
|
unwanted []string
|
||||||
}{
|
}{
|
||||||
"global sees both": {
|
"global sees both": {
|
||||||
globalPrincipal, []string{"First message", "Second message"}, nil,
|
"", nil, []string{"First message", "Second message"}, nil,
|
||||||
},
|
},
|
||||||
"one assigned domain": {
|
"one assigned domain": {
|
||||||
domainAdmin(domains["first.example.ru"].ID),
|
"one-domain", []int64{domains["first.example.ru"].ID},
|
||||||
[]string{"First message"}, []string{"Second message", "second-app"},
|
[]string{"First message"}, []string{"Second message", "second-app"},
|
||||||
},
|
},
|
||||||
"two assigned domains": {
|
"two assigned domains": {
|
||||||
domainAdmin(domains["first.example.ru"].ID, domains["second.example.ru"].ID),
|
"two-domains", []int64{domains["first.example.ru"].ID, domains["second.example.ru"].ID},
|
||||||
[]string{"First message", "Second message"}, nil,
|
[]string{"First message", "Second message"}, nil,
|
||||||
},
|
},
|
||||||
// Every assigned domain deleted cascades the assignments away. That
|
// Every assigned domain deleted cascades the assignments away. That
|
||||||
// leaves a principal entitled to nothing, which is an empty log — the
|
// leaves a principal entitled to nothing, which is an empty log — the
|
||||||
// case that used to hand over the whole journal.
|
// case that used to hand over the whole journal.
|
||||||
"no assigned domains": {
|
"no assigned domains": {
|
||||||
domainAdmin(), []string{"No messages logged yet."},
|
"no-domains", nil, []string{"No messages logged yet."},
|
||||||
[]string{"First message", "Second message"},
|
[]string{"First message", "Second message"},
|
||||||
},
|
},
|
||||||
} {
|
} {
|
||||||
|
var p auth.Principal
|
||||||
|
if tc.username == "" {
|
||||||
|
p = globalPrincipal
|
||||||
|
} else {
|
||||||
|
p = domainAdmin(t, h.store, tc.username, tc.domainIDs...)
|
||||||
|
}
|
||||||
for view, handler := range map[string]http.HandlerFunc{
|
for view, handler := range map[string]http.HandlerFunc{
|
||||||
"page": h.HandleDeliveries,
|
"page": h.HandleDeliveries,
|
||||||
"fragment": h.HandleDeliveriesRows,
|
"fragment": h.HandleDeliveriesRows,
|
||||||
} {
|
} {
|
||||||
out := getBodyAs(t, handler, "/deliveries", tc.principal)
|
out := getBodyAs(t, handler, "/deliveries", p)
|
||||||
for _, want := range tc.want {
|
for _, want := range tc.want {
|
||||||
if !strings.Contains(out, want) {
|
if !strings.Contains(out, want) {
|
||||||
t.Errorf("%s (%s): missing %q:\n%s", name, view, want, out)
|
t.Errorf("%s (%s): missing %q:\n%s", name, view, want, out)
|
||||||
@@ -270,7 +277,7 @@ func TestSendLogScopedToAssignedDomains(t *testing.T) {
|
|||||||
// trusted for having been rendered by us.
|
// trusted for having been rendered by us.
|
||||||
func TestSendLogIgnoresForgedFilters(t *testing.T) {
|
func TestSendLogIgnoresForgedFilters(t *testing.T) {
|
||||||
h, domains := serverWithTwoDomains(t)
|
h, domains := serverWithTwoDomains(t)
|
||||||
p := domainAdmin(domains["first.example.ru"].ID)
|
p := domainAdmin(t, h.store, "forged-filter", domains["first.example.ru"].ID)
|
||||||
|
|
||||||
for _, target := range []string{
|
for _, target := range []string{
|
||||||
"/deliveries?domain=second.example.ru",
|
"/deliveries?domain=second.example.ru",
|
||||||
@@ -299,7 +306,7 @@ func TestDeliveryPageForeignDomainNotFound(t *testing.T) {
|
|||||||
rec := httptest.NewRecorder()
|
rec := httptest.NewRecorder()
|
||||||
req := httptest.NewRequest(http.MethodGet, "/deliveries/"+itoa(rows[0].ID), nil)
|
req := httptest.NewRequest(http.MethodGet, "/deliveries/"+itoa(rows[0].ID), nil)
|
||||||
req.SetPathValue("id", itoa(rows[0].ID))
|
req.SetPathValue("id", itoa(rows[0].ID))
|
||||||
req = auth.RequestWithPrincipal(req, domainAdmin(domains["first.example.ru"].ID))
|
req = auth.RequestWithPrincipal(req, domainAdmin(t, h.store, "foreign-detail", domains["first.example.ru"].ID))
|
||||||
h.HandleDelivery(rec, req)
|
h.HandleDelivery(rec, req)
|
||||||
if rec.Code != http.StatusNotFound {
|
if rec.Code != http.StatusNotFound {
|
||||||
t.Errorf("delivery page for a foreign domain = %d, want 404", rec.Code)
|
t.Errorf("delivery page for a foreign domain = %d, want 404", rec.Code)
|
||||||
@@ -343,13 +350,37 @@ func serverWithTwoDomains(t *testing.T) (*Handlers, map[string]store.Domain) {
|
|||||||
|
|
||||||
var globalPrincipal = auth.Principal{ID: 1, Username: "admin", Role: auth.RoleGlobal}
|
var globalPrincipal = auth.Principal{ID: 1, Username: "admin", Role: auth.RoleGlobal}
|
||||||
|
|
||||||
func domainAdmin(domainIDs ...int64) auth.Principal {
|
func domainAdmin(t *testing.T, st *store.Store, username string, domainIDs ...int64) auth.Principal {
|
||||||
return auth.Principal{
|
t.Helper()
|
||||||
ID: 2,
|
const hash = "test-hash"
|
||||||
Username: "domain-admin",
|
if len(domainIDs) == 0 {
|
||||||
Role: auth.RoleDomainAdmin,
|
placeholder, err := st.AddDomain(username+".placeholder.invalid", "mail")
|
||||||
Domains: domainIDs,
|
if err != nil {
|
||||||
|
t.Fatalf("add placeholder domain: %v", err)
|
||||||
}
|
}
|
||||||
|
id, err := st.CreateUser(username, hash, store.RoleDomainAdmin, []int64{placeholder.ID})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create domain admin %s: %v", username, err)
|
||||||
|
}
|
||||||
|
if err := st.DeleteDomain(placeholder.ID); err != nil {
|
||||||
|
t.Fatalf("delete placeholder domain: %v", err)
|
||||||
|
}
|
||||||
|
domainIDs = nil
|
||||||
|
u, err := st.GetUser(id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get domain admin %s: %v", username, err)
|
||||||
|
}
|
||||||
|
return auth.Principal{ID: u.ID, Username: u.Username, Role: u.Role, Domains: u.DomainIDs}
|
||||||
|
}
|
||||||
|
id, err := st.CreateUser(username, hash, store.RoleDomainAdmin, domainIDs)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("create domain admin %s: %v", username, err)
|
||||||
|
}
|
||||||
|
u, err := st.GetUser(id)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("get domain admin %s: %v", username, err)
|
||||||
|
}
|
||||||
|
return auth.Principal{ID: u.ID, Username: u.Username, Role: u.Role, Domains: u.DomainIDs}
|
||||||
}
|
}
|
||||||
|
|
||||||
// serverWithDelivery builds a panel over a store holding one delivery, written
|
// serverWithDelivery builds a panel over a store holding one delivery, written
|
||||||
|
|||||||
+24
-24
@@ -14,8 +14,8 @@ import (
|
|||||||
"golang.org/x/crypto/bcrypt"
|
"golang.org/x/crypto/bcrypt"
|
||||||
)
|
)
|
||||||
|
|
||||||
// HandleAccount serves the signed-in user's account settings.
|
// HandleSettings serves the signed-in user's panel settings.
|
||||||
func (h *Handlers) HandleAccount(w http.ResponseWriter, r *http.Request) {
|
func (h *Handlers) HandleSettings(w http.ResponseWriter, r *http.Request) {
|
||||||
switch r.Method {
|
switch r.Method {
|
||||||
case http.MethodGet:
|
case http.MethodGet:
|
||||||
p, ok := h.principal(r)
|
p, ok := h.principal(r)
|
||||||
@@ -25,20 +25,20 @@ func (h *Handlers) HandleAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
u, err := h.store.GetUser(p.ID)
|
u, err := h.store.GetUser(p.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logf("panel: account: get user failed: %v", err)
|
logf("panel: settings: get user failed: %v", err)
|
||||||
http.Error(w, "internal error", http.StatusInternalServerError)
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
h.renderAccount(w, r, http.StatusOK, "", u.Username, u.DMARCReportEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusOK, "", u.Username, u.DMARCReportEmail, p.IsGlobal())
|
||||||
case http.MethodPost:
|
case http.MethodPost:
|
||||||
h.submitAccount(w, r)
|
h.submitSettings(w, r)
|
||||||
default:
|
default:
|
||||||
w.Header().Set("Allow", "GET, POST")
|
w.Header().Set("Allow", "GET, POST")
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) renderAccount(w http.ResponseWriter, r *http.Request, status int, formErr, formUsername, formDMARCEmail string, showDMARC bool) {
|
func (h *Handlers) renderSettings(w http.ResponseWriter, r *http.Request, status int, formErr, formUsername, formDMARCEmail string, showDMARC bool) {
|
||||||
var reportAuth dnscheck.Result
|
var reportAuth dnscheck.Result
|
||||||
if showDMARC && formDMARCEmail != "" {
|
if showDMARC && formDMARCEmail != "" {
|
||||||
if hub := dnscheck.EmailDomain(formDMARCEmail); hub != "" {
|
if hub := dnscheck.EmailDomain(formDMARCEmail); hub != "" {
|
||||||
@@ -58,13 +58,13 @@ func (h *Handlers) renderAccount(w http.ResponseWriter, r *http.Request, status
|
|||||||
data["ReportAuthDNS"] = reportAuth
|
data["ReportAuthDNS"] = reportAuth
|
||||||
data["ReportAuthHub"] = dnscheck.EmailDomain(formDMARCEmail)
|
data["ReportAuthHub"] = dnscheck.EmailDomain(formDMARCEmail)
|
||||||
data["Error"] = formErr
|
data["Error"] = formErr
|
||||||
data["Flash"] = accountFlash(r)
|
data["Flash"] = settingsFlash(r)
|
||||||
data["L1Messages"] = h.l1Messages()
|
data["L1Messages"] = h.l1Messages()
|
||||||
data["L1Window"] = h.l1Window()
|
data["L1Window"] = h.l1Window()
|
||||||
h.view.Render(w, status, "settings", data)
|
h.view.Render(w, status, "settings", data)
|
||||||
}
|
}
|
||||||
|
|
||||||
func accountFlash(r *http.Request) string {
|
func settingsFlash(r *http.Request) string {
|
||||||
switch r.URL.Query().Get("updated") {
|
switch r.URL.Query().Get("updated") {
|
||||||
case "username":
|
case "username":
|
||||||
return "Username changed."
|
return "Username changed."
|
||||||
@@ -85,16 +85,16 @@ func accountFlash(r *http.Request) string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
func (h *Handlers) submitSettings(w http.ResponseWriter, r *http.Request) {
|
||||||
if !h.auth.AllowLoginAttempt(r) {
|
if !h.auth.AllowLoginAttempt(r) {
|
||||||
p, _ := h.principal(r)
|
p, _ := h.principal(r)
|
||||||
h.renderAccount(w, r, http.StatusTooManyRequests,
|
h.renderSettings(w, r, http.StatusTooManyRequests,
|
||||||
"Too many attempts. Please wait and try again.", auth.CurrentUser(r), "", p.IsGlobal())
|
"Too many attempts. Please wait and try again.", auth.CurrentUser(r), "", p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := r.ParseForm(); err != nil {
|
if err := r.ParseForm(); err != nil {
|
||||||
p, _ := h.principal(r)
|
p, _ := h.principal(r)
|
||||||
h.renderAccount(w, r, http.StatusBadRequest, "Invalid form submission.", auth.CurrentUser(r), "", p.IsGlobal())
|
h.renderSettings(w, r, http.StatusBadRequest, "Invalid form submission.", auth.CurrentUser(r), "", p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,7 +105,7 @@ func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
user, err := h.store.GetUser(p.ID)
|
user, err := h.store.GetUser(p.ID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logf("panel: account: get user failed: %v", err)
|
logf("panel: settings: get user failed: %v", err)
|
||||||
http.Error(w, "internal error", http.StatusInternalServerError)
|
http.Error(w, "internal error", http.StatusInternalServerError)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -123,21 +123,21 @@ func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(current)); err != nil {
|
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(current)); err != nil {
|
||||||
h.renderAccount(w, r, http.StatusUnauthorized, "Current password is incorrect.", username, dmarcEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusUnauthorized, "Current password is incorrect.", username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
renaming := username != user.Username
|
renaming := username != user.Username
|
||||||
if renaming {
|
if renaming {
|
||||||
if err := validate.Username(username); err != nil {
|
if err := validate.Username(username); err != nil {
|
||||||
h.renderAccount(w, r, http.StatusBadRequest, err.Error(), username, dmarcEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusBadRequest, err.Error(), username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if p.IsGlobal() {
|
if p.IsGlobal() {
|
||||||
if err := validate.Email(dmarcEmail); err != nil {
|
if err := validate.Email(dmarcEmail); err != nil {
|
||||||
h.renderAccount(w, r, http.StatusBadRequest, err.Error(), username, dmarcEmail, true)
|
h.renderSettings(w, r, http.StatusBadRequest, err.Error(), username, dmarcEmail, true)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,16 +147,16 @@ func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
repassword := password != "" || confirm != ""
|
repassword := password != "" || confirm != ""
|
||||||
if repassword {
|
if repassword {
|
||||||
if password != confirm {
|
if password != confirm {
|
||||||
h.renderAccount(w, r, http.StatusBadRequest, "New passwords do not match.", username, dmarcEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusBadRequest, "New passwords do not match.", username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err := validate.AdminPassword(password); err != nil {
|
if err := validate.AdminPassword(password); err != nil {
|
||||||
h.renderAccount(w, r, http.StatusBadRequest, err.Error(), username, dmarcEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusBadRequest, err.Error(), username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if !renaming && !repassword && !emailChanging {
|
if !renaming && !repassword && !emailChanging {
|
||||||
h.renderAccount(w, r, http.StatusBadRequest,
|
h.renderSettings(w, r, http.StatusBadRequest,
|
||||||
"Nothing to change: enter a new username, password, or DMARC report address.", username, dmarcEmail, p.IsGlobal())
|
"Nothing to change: enter a new username, password, or DMARC report address.", username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -165,8 +165,8 @@ func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
if repassword {
|
if repassword {
|
||||||
newHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
newHash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logf("panel: account: hashing password failed: %v", err)
|
logf("panel: settings: hashing password failed: %v", err)
|
||||||
h.renderAccount(w, r, http.StatusInternalServerError,
|
h.renderSettings(w, r, http.StatusInternalServerError,
|
||||||
"Internal error. Please try again.", username, dmarcEmail, p.IsGlobal())
|
"Internal error. Please try again.", username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -174,17 +174,17 @@ func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if err := h.store.UpdateUser(user.ID, username, hash, dmarcEmail); err != nil {
|
if err := h.store.UpdateUser(user.ID, username, hash, dmarcEmail); err != nil {
|
||||||
logf("panel: account: update user failed: %v", err)
|
logf("panel: settings: update user failed: %v", err)
|
||||||
msg := "Could not save the changes. Please check the logs and try again."
|
msg := "Could not save the changes. Please check the logs and try again."
|
||||||
if errors.Is(err, store.ErrUserNotFound) {
|
if errors.Is(err, store.ErrUserNotFound) {
|
||||||
msg = "There is no user account to update."
|
msg = "There is no user account to update."
|
||||||
}
|
}
|
||||||
if errors.Is(err, store.ErrUserExists) {
|
if errors.Is(err, store.ErrUserExists) {
|
||||||
msg = "That username is already in use."
|
msg = "That username is already in use."
|
||||||
h.renderAccount(w, r, http.StatusConflict, msg, username, dmarcEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusConflict, msg, username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
h.renderAccount(w, r, http.StatusInternalServerError, msg, username, dmarcEmail, p.IsGlobal())
|
h.renderSettings(w, r, http.StatusInternalServerError, msg, username, dmarcEmail, p.IsGlobal())
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,7 +197,7 @@ func (h *Handlers) submitAccount(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logf("panel: user %d account updated (username: %t, password: %t, dmarc email: %t)", user.ID, renaming, repassword, emailChanging)
|
logf("panel: user %d settings updated (username: %t, password: %t, dmarc email: %t)", user.ID, renaming, repassword, emailChanging)
|
||||||
http.Redirect(w, r, "/settings?updated="+updatedFlag(renaming, repassword, emailChanging), http.StatusSeeOther)
|
http.Redirect(w, r, "/settings?updated="+updatedFlag(renaming, repassword, emailChanging), http.StatusSeeOther)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
Copyright © 2017 IBM Corp. with Reserved Font Name "Plex"
|
||||||
|
|
||||||
|
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||||
|
|
||||||
|
This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
|
||||||
|
|
||||||
|
|
||||||
|
-----------------------------------------------------------
|
||||||
|
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||||
|
-----------------------------------------------------------
|
||||||
|
|
||||||
|
PREAMBLE
|
||||||
|
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||||
|
development of collaborative font projects, to support the font creation
|
||||||
|
efforts of academic and linguistic communities, and to provide a free and
|
||||||
|
open framework in which fonts may be shared and improved in partnership
|
||||||
|
with others.
|
||||||
|
|
||||||
|
The OFL allows the licensed fonts to be used, studied, modified and
|
||||||
|
redistributed freely as long as they are not sold by themselves. The
|
||||||
|
fonts, including any derivative works, can be bundled, embedded,
|
||||||
|
redistributed and/or sold with any software provided that any reserved
|
||||||
|
names are not used by derivative works. The fonts and derivatives,
|
||||||
|
however, cannot be released under any other type of license. The
|
||||||
|
requirement for fonts to remain under this license does not apply
|
||||||
|
to any document created using the fonts or their derivatives.
|
||||||
|
|
||||||
|
DEFINITIONS
|
||||||
|
"Font Software" refers to the set of files released by the Copyright
|
||||||
|
Holder(s) under this license and clearly marked as such. This may
|
||||||
|
include source files, build scripts and documentation.
|
||||||
|
|
||||||
|
"Reserved Font Name" refers to any names specified as such after the
|
||||||
|
copyright statement(s).
|
||||||
|
|
||||||
|
"Original Version" refers to the collection of Font Software components as
|
||||||
|
distributed by the Copyright Holder(s).
|
||||||
|
|
||||||
|
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||||
|
or substituting -- in part or in whole -- any of the components of the
|
||||||
|
Original Version, by changing formats or by porting the Font Software to a
|
||||||
|
new environment.
|
||||||
|
|
||||||
|
"Author" refers to any designer, engineer, programmer, technical
|
||||||
|
writer or other person who contributed to the Font Software.
|
||||||
|
|
||||||
|
PERMISSION & CONDITIONS
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining
|
||||||
|
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||||
|
redistribute, and sell modified and unmodified copies of the Font
|
||||||
|
Software, subject to the following conditions:
|
||||||
|
|
||||||
|
1) Neither the Font Software nor any of its individual components,
|
||||||
|
in Original or Modified Versions, may be sold by itself.
|
||||||
|
|
||||||
|
2) Original or Modified Versions of the Font Software may be bundled,
|
||||||
|
redistributed and/or sold with any software, provided that each copy
|
||||||
|
contains the above copyright notice and this license. These can be
|
||||||
|
included either as stand-alone text files, human-readable headers or
|
||||||
|
in the appropriate machine-readable metadata fields within text or
|
||||||
|
binary files as long as those fields can be easily viewed by the user.
|
||||||
|
|
||||||
|
3) No Modified Version of the Font Software may use the Reserved Font
|
||||||
|
Name(s) unless explicit written permission is granted by the corresponding
|
||||||
|
Copyright Holder. This restriction only applies to the primary font name as
|
||||||
|
presented to the users.
|
||||||
|
|
||||||
|
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||||
|
Software shall not be used to promote, endorse or advertise any
|
||||||
|
Modified Version, except to acknowledge the contribution(s) of the
|
||||||
|
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||||
|
permission.
|
||||||
|
|
||||||
|
5) The Font Software, modified or unmodified, in part or in whole,
|
||||||
|
must be distributed entirely under this license, and must not be
|
||||||
|
distributed under any other license. The requirement for fonts to
|
||||||
|
remain under this license does not apply to any document created
|
||||||
|
using the Font Software.
|
||||||
|
|
||||||
|
TERMINATION
|
||||||
|
This license becomes null and void if any of the above conditions are
|
||||||
|
not met.
|
||||||
|
|
||||||
|
DISCLAIMER
|
||||||
|
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||||
|
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||||
|
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||||
|
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||||
|
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||||
@@ -46,145 +46,81 @@
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
// --- Address list shown only in list mode -----------------------------
|
// --- Conditional field visibility ------------------------------------
|
||||||
// The "Addresses" field applies to list mode only; in wildcard mode the
|
// Several forms hide a block until a select, checkbox or file input says it
|
||||||
// server ignores it, so hiding it removes a field that does nothing. The
|
// applies. One rule table drives them all so the five near-identical helpers
|
||||||
// toggle runs on load too, because the edit form of an existing application
|
// do not drift.
|
||||||
// may already be set to list mode.
|
var showWhenRules = [
|
||||||
function syncAddressField(select) {
|
{
|
||||||
var form = select.closest("form");
|
match: "select[data-list-mode]",
|
||||||
var field = form && form.querySelector("[data-addresses]");
|
target: "[data-addresses]",
|
||||||
if (!field) {
|
visible: function (el) { return el.value === el.dataset.listMode; }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "select[data-custom-mode]",
|
||||||
|
target: "[data-custom-address]",
|
||||||
|
visible: function (el) { return el.value === el.dataset.customMode; }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "select[data-global-role]",
|
||||||
|
target: "[data-domain-pick]",
|
||||||
|
visible: function (el) { return el.value !== el.dataset.globalRole; }
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "input[data-encrypt-toggle]",
|
||||||
|
target: "[data-encrypt-fields]",
|
||||||
|
visible: function (el) { return el.checked; },
|
||||||
|
clearWhenHidden: true
|
||||||
|
},
|
||||||
|
{
|
||||||
|
match: "input[data-import-file]",
|
||||||
|
target: "[data-import-password-fields]",
|
||||||
|
visible: function (el) {
|
||||||
|
var name = (el.files && el.files[0] && el.files[0].name || "").toLowerCase();
|
||||||
|
return name !== "" && !/\.json$/.test(name);
|
||||||
|
},
|
||||||
|
clearWhenHidden: true
|
||||||
|
}
|
||||||
|
];
|
||||||
|
|
||||||
|
function syncShowWhen(control) {
|
||||||
|
var form = control.closest("form");
|
||||||
|
if (!form) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// The mode values come from the server (store.AddressModeList), so the
|
for (var i = 0; i < showWhenRules.length; i++) {
|
||||||
// select carries the one that means "list" rather than this script
|
var rule = showWhenRules[i];
|
||||||
// hard-coding it.
|
if (!control.matches(rule.match)) {
|
||||||
field.hidden = select.value !== select.dataset.listMode;
|
continue;
|
||||||
}
|
}
|
||||||
|
var target = form.querySelector(rule.target);
|
||||||
function initAddressFields(root) {
|
if (!target) {
|
||||||
root.querySelectorAll("select[data-list-mode]").forEach(function (select) {
|
|
||||||
syncAddressField(select);
|
|
||||||
select.addEventListener("change", function () {
|
|
||||||
syncAddressField(select);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Custom DMARC rua address shown only for "custom" mode ------------
|
|
||||||
// Same idea as the address list: the email field only applies when the
|
|
||||||
// operator picks Custom address. With JavaScript blocked the field stays
|
|
||||||
// visible and the server still ignores it for inherit/none.
|
|
||||||
function syncCustomAddressField(select) {
|
|
||||||
var form = select.closest("form");
|
|
||||||
var field = form && form.querySelector("[data-custom-address]");
|
|
||||||
if (!field) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
field.hidden = select.value !== select.dataset.customMode;
|
var show = rule.visible(control);
|
||||||
}
|
target.hidden = !show;
|
||||||
|
if (!show && rule.clearWhenHidden) {
|
||||||
function initCustomAddressFields(root) {
|
target.querySelectorAll("input").forEach(function (input) {
|
||||||
root.querySelectorAll("select[data-custom-mode]").forEach(function (select) {
|
|
||||||
syncCustomAddressField(select);
|
|
||||||
select.addEventListener("change", function () {
|
|
||||||
syncCustomAddressField(select);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Domain pick shown only for domain administrators ------------------
|
|
||||||
// Global administrators manage every domain, so the assignment checkboxes
|
|
||||||
// are irrelevant for that role. The toggle runs on load too, because the
|
|
||||||
// edit form of an existing global user should not flash the fieldset.
|
|
||||||
function syncDomainPickField(select) {
|
|
||||||
var form = select.closest("form");
|
|
||||||
var field = form && form.querySelector("[data-domain-pick]");
|
|
||||||
if (!field) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
field.hidden = select.value === select.dataset.globalRole;
|
|
||||||
}
|
|
||||||
|
|
||||||
function initDomainPickFields(root) {
|
|
||||||
root.querySelectorAll("select[data-global-role]").forEach(function (select) {
|
|
||||||
syncDomainPickField(select);
|
|
||||||
select.addEventListener("change", function () {
|
|
||||||
syncDomainPickField(select);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Encryption password fields shown only when asked for --------------
|
|
||||||
// The backup, export and import forms carry an optional password block. It
|
|
||||||
// is hidden until the checkbox next to it is ticked, and cleared when it is
|
|
||||||
// unticked, so a password typed and then abandoned is never submitted. With
|
|
||||||
// JavaScript blocked the block stays visible and the forms behave exactly as
|
|
||||||
// the server reads them: the checkbox alone decides whether encryption
|
|
||||||
// happens.
|
|
||||||
function syncEncryptFields(box) {
|
|
||||||
var form = box.closest("form");
|
|
||||||
var fields = form && form.querySelector("[data-encrypt-fields]");
|
|
||||||
if (!fields) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
fields.hidden = !box.checked;
|
|
||||||
if (!box.checked) {
|
|
||||||
fields.querySelectorAll("input").forEach(function (input) {
|
|
||||||
input.value = "";
|
input.value = "";
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
function initEncryptFields(root) {
|
|
||||||
root.querySelectorAll("input[data-encrypt-toggle]").forEach(function (box) {
|
|
||||||
syncEncryptFields(box);
|
|
||||||
box.addEventListener("change", function () {
|
|
||||||
syncEncryptFields(box);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Import password field shown based on the chosen file's extension ---
|
|
||||||
// The domain-import file decides for itself whether it is encrypted (the
|
|
||||||
// server checks the envelope magic, not a checkbox), so the panel offers
|
|
||||||
// the password field the same way: reveal it for a .spde file, hide and
|
|
||||||
// clear it for a plain .json one. With no file chosen yet there is nothing
|
|
||||||
// to ask a password for, so the field stays hidden until a file names it.
|
|
||||||
// An unrecognised name leaves the field visible rather than guessing wrong
|
|
||||||
// and hiding a password the file needs.
|
|
||||||
function syncImportPasswordField(input) {
|
|
||||||
var form = input.closest("form");
|
|
||||||
var fields = form && form.querySelector("[data-import-password-fields]");
|
|
||||||
if (!fields) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var name = (input.files && input.files[0] && input.files[0].name || "").toLowerCase();
|
|
||||||
var hide = name === "" || /\.json$/.test(name);
|
|
||||||
fields.hidden = hide;
|
|
||||||
if (hide) {
|
|
||||||
fields.querySelectorAll("input").forEach(function (pw) {
|
|
||||||
pw.value = "";
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function initImportPasswordField(root) {
|
function initShowWhen(root) {
|
||||||
root.querySelectorAll("input[data-import-file]").forEach(function (input) {
|
showWhenRules.forEach(function (rule) {
|
||||||
syncImportPasswordField(input);
|
root.querySelectorAll(rule.match).forEach(function (control) {
|
||||||
input.addEventListener("change", function () {
|
syncShowWhen(control);
|
||||||
syncImportPasswordField(input);
|
control.addEventListener("change", function () {
|
||||||
|
syncShowWhen(control);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
document.addEventListener("DOMContentLoaded", function () {
|
document.addEventListener("DOMContentLoaded", function () {
|
||||||
initAddressFields(document);
|
initShowWhen(document);
|
||||||
initCustomAddressFields(document);
|
|
||||||
initDomainPickFields(document);
|
|
||||||
initEncryptFields(document);
|
|
||||||
initImportPasswordField(document);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// --- Adaptive monitoring polling ---------------------------------------
|
// --- Adaptive monitoring polling ---------------------------------------
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
package view
|
package view
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"io/fs"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -26,6 +28,7 @@ func TestStaticAssetsCarryETag(t *testing.T) {
|
|||||||
// The fonts are the assets this matters most for: they are the largest
|
// The fonts are the assets this matters most for: they are the largest
|
||||||
// thing the panel serves and the ones a browser is most willing to keep.
|
// thing the panel serves and the ones a browser is most willing to keep.
|
||||||
"ibm-plex-sans.woff2", "ibm-plex-mono-400.woff2", "ibm-plex-mono-600.woff2",
|
"ibm-plex-sans.woff2", "ibm-plex-mono-400.woff2", "ibm-plex-mono-600.woff2",
|
||||||
|
"OFL.txt",
|
||||||
} {
|
} {
|
||||||
rec := serveStatic("/static/"+name, nil)
|
rec := serveStatic("/static/"+name, nil)
|
||||||
if rec.Code != http.StatusOK {
|
if rec.Code != http.StatusOK {
|
||||||
@@ -77,3 +80,27 @@ func TestStaticETagsAreContentDerived(t *testing.T) {
|
|||||||
t.Errorf("favicon.png and favicon.svg share the ETag %s", png)
|
t.Errorf("favicon.png and favicon.svg share the ETag %s", png)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// OFL condition 2: the licence text must travel with the Font Software. The
|
||||||
|
// WOFF2 files are embedded; OFL.txt sits next to them so a copy of the panel
|
||||||
|
// (source tree, image, or /static/OFL.txt) always has it.
|
||||||
|
func TestOFLTravelsWithFonts(t *testing.T) {
|
||||||
|
b, err := fs.ReadFile(assetsFS, "static/OFL.txt")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("OFL.txt is not embedded next to the Plex WOFF2 files: %v", err)
|
||||||
|
}
|
||||||
|
body := string(b)
|
||||||
|
if !strings.Contains(body, `Reserved Font Name "Plex"`) {
|
||||||
|
t.Error("OFL.txt is missing the IBM Plex reserved-font-name notice")
|
||||||
|
}
|
||||||
|
if !strings.Contains(body, "SIL OPEN FONT LICENSE Version 1.1") {
|
||||||
|
t.Error("OFL.txt is missing the SIL OFL 1.1 text")
|
||||||
|
}
|
||||||
|
rec := serveStatic("/static/OFL.txt", nil)
|
||||||
|
if rec.Code != http.StatusOK {
|
||||||
|
t.Fatalf("GET /static/OFL.txt: status %d, want 200", rec.Code)
|
||||||
|
}
|
||||||
|
if !strings.Contains(rec.Body.String(), "SIL OPEN FONT LICENSE Version 1.1") {
|
||||||
|
t.Error("GET /static/OFL.txt did not serve the OFL text")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,13 +3,15 @@
|
|||||||
|
|
||||||
<div class="card">
|
<div class="card">
|
||||||
<h2>Full backup</h2>
|
<h2>Full backup</h2>
|
||||||
<p class="muted">Download a full backup of all persistent state — the database,
|
<p class="muted">Download a self-contained backup of the whole instance —
|
||||||
every domain's DKIM key and the application credentials. Use it to move the
|
<code>data/</code> (database, DKIM keys, application credentials, and the
|
||||||
whole server to a new machine: restore it into a container of the
|
Postfix queue), <code>docker-compose.yml</code>, <code>.env</code>, and
|
||||||
<strong>same SelfPost version</strong>, with the same data mount, before first
|
<code>certs/</code>. Extract it into an empty project directory on a new
|
||||||
start. TLS certificates and the mail queue are not included.</p>
|
machine, adjust hostname or proxy settings if needed, and start a container of
|
||||||
|
the <strong>same SelfPost version</strong> before first boot. The reverse-proxy
|
||||||
|
vhost is not included — set that up separately on the new host.</p>
|
||||||
<p class="muted"><strong>The backup file is a secret</strong> (it contains
|
<p class="muted"><strong>The backup file is a secret</strong> (it contains
|
||||||
private keys and credentials). Store and transfer it securely and delete it
|
private keys, TLS material, and credentials). Store and transfer it securely and delete it
|
||||||
once the restore succeeds. Encrypting it below is the simplest way to do that:
|
once the restore succeeds. Encrypting it below is the simplest way to do that:
|
||||||
the download is then a <code>.spbk</code> file (SelfPost backup) that only
|
the download is then a <code>.spbk</code> file (SelfPost backup) that only
|
||||||
the password opens.</p>
|
the password opens.</p>
|
||||||
|
|||||||
@@ -171,8 +171,7 @@
|
|||||||
|
|
||||||
{{if .SameDomainRUA}}
|
{{if .SameDomainRUA}}
|
||||||
<p class="error">The report address is on this sending domain. SelfPost does
|
<p class="error">The report address is on this sending domain. SelfPost does
|
||||||
not receive inbound mail — use a mailbox elsewhere or wait for in-panel report
|
not receive inbound mail — use a mailbox on another domain.</p>
|
||||||
reception in a future release.</p>
|
|
||||||
{{end}}
|
{{end}}
|
||||||
|
|
||||||
{{if .NeedsReportAuth}}
|
{{if .NeedsReportAuth}}
|
||||||
|
|||||||
@@ -42,8 +42,8 @@
|
|||||||
<h2>DMARC aggregate reports</h2>
|
<h2>DMARC aggregate reports</h2>
|
||||||
<p class="muted">Optional default <code>rua=</code> address for every sending
|
<p class="muted">Optional default <code>rua=</code> address for every sending
|
||||||
domain (can be overridden per domain). Use a mailbox on a domain that
|
domain (can be overridden per domain). Use a mailbox on a domain that
|
||||||
receives inbound mail. SelfPost is send-only today; a future release will
|
receives inbound mail. SelfPost does not receive inbound mail — point
|
||||||
be able to receive reports in the panel itself.</p>
|
<code>rua=</code> at a mailbox elsewhere.</p>
|
||||||
|
|
||||||
<label for="dmarc_report_email">Default report address</label>
|
<label for="dmarc_report_email">Default report address</label>
|
||||||
<input id="dmarc_report_email" name="dmarc_report_email" type="email"
|
<input id="dmarc_report_email" name="dmarc_report_email" type="email"
|
||||||
|
|||||||
+6
-3
@@ -40,10 +40,12 @@ type Config struct {
|
|||||||
// the log-tailer role follows in cmd/panel.
|
// the log-tailer role follows in cmd/panel.
|
||||||
MailLogPath string
|
MailLogPath string
|
||||||
// DataDir and DBPath locate the persistent state a full backup archives
|
// DataDir and DBPath locate the persistent state a full backup archives
|
||||||
// (architecture.md § Persistence); Version is stamped into the backup
|
// (architecture.md § Persistence); DeployRoot is the operator project
|
||||||
// manifest. They mirror the panel's own configuration.
|
// directory (docker-compose.yml, .env, certs/); Version is stamped into
|
||||||
|
// the backup manifest. They mirror the panel's own configuration.
|
||||||
DataDir string
|
DataDir string
|
||||||
DBPath string
|
DBPath string
|
||||||
|
DeployRoot string
|
||||||
Version string
|
Version string
|
||||||
// TrustedProxyCIDRs are the reverse-proxy addresses allowed to supply
|
// TrustedProxyCIDRs are the reverse-proxy addresses allowed to supply
|
||||||
// X-Forwarded-For (env TRUSTED_PROXY_CIDR). A request whose
|
// X-Forwarded-For (env TRUSTED_PROXY_CIDR). A request whose
|
||||||
@@ -106,6 +108,7 @@ func New(st *store.Store, domains *domain.Service, apps *app.Service, cfg Config
|
|||||||
MailLogPath: cfg.MailLogPath,
|
MailLogPath: cfg.MailLogPath,
|
||||||
DataDir: cfg.DataDir,
|
DataDir: cfg.DataDir,
|
||||||
DBPath: cfg.DBPath,
|
DBPath: cfg.DBPath,
|
||||||
|
DeployRoot: cfg.DeployRoot,
|
||||||
Version: cfg.Version,
|
Version: cfg.Version,
|
||||||
TLSCertFile: cfg.TLSCertFile,
|
TLSCertFile: cfg.TLSCertFile,
|
||||||
OpenDKIMSocket: cfg.OpenDKIMSocket,
|
OpenDKIMSocket: cfg.OpenDKIMSocket,
|
||||||
@@ -158,7 +161,7 @@ func (s *Server) Handler() http.Handler {
|
|||||||
authed.HandleFunc("POST /applications/{aid}/delete", h.HandleDeleteApplication)
|
authed.HandleFunc("POST /applications/{aid}/delete", h.HandleDeleteApplication)
|
||||||
authed.HandleFunc("POST /reload", h.HandleReload)
|
authed.HandleFunc("POST /reload", h.HandleReload)
|
||||||
|
|
||||||
authed.HandleFunc("/settings", h.HandleAccount)
|
authed.HandleFunc("/settings", h.HandleSettings)
|
||||||
authed.HandleFunc("/account", redirectSettings)
|
authed.HandleFunc("/account", redirectSettings)
|
||||||
|
|
||||||
authed.HandleFunc("GET /users", h.HandleUsers)
|
authed.HandleFunc("GET /users", h.HandleUsers)
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// checkLogrotateConfigMode verifies the image pins /etc/logrotate.d/mail at 0644
|
// checkLogrotateConfigMode verifies the image pins /etc/logrotate.d/mail at 0644
|
||||||
// so logrotate will not silently ignore it (docs/plans/logrotate-mode.md).
|
// so logrotate will not silently ignore it (docs/development.md § Building
|
||||||
|
// binaries and the image).
|
||||||
func checkLogrotateConfigMode(s *stack) error {
|
func checkLogrotateConfigMode(s *stack) error {
|
||||||
mode, err := s.execIn("selfpost", "stat", "-c", "%a", "/etc/logrotate.d/mail")
|
mode, err := s.execIn("selfpost", "stat", "-c", "%a", "/etc/logrotate.d/mail")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user