From b76f1ef1a033674c4953f40856ba9853b4e24c87 Mon Sep 17 00:00:00 2001 From: Mix Date: Thu, 15 Oct 2026 17:30:33 +0300 Subject: [PATCH] release: 2.6.1: port 25 ends DATA only at CRLF.CRLF Cut without asking, as the owner said on 2026-10-15. The inbound relay's smtp/inet listener sets smtpd_forbid_bare_newline=normalize, the SMTP-smuggling defence Postfix 3.7.11 leaves off (aaa9412, port25-bare-newline, the first of the three rows from own-mta-builds). Rolled out to the test server as 2.6.0-post.aaa9412 (the same code): the container healthy, every program RUNNING; the server runs the inbound relay, and postconf -P shows smtp/inet/smtpd_forbid_bare_newline = normalize next to syslog_name postfix/inbound; no warning or fatal in docker logs. No migration, schema 11. CHANGELOG cut; pin 2.6.1 in deploy/docker-compose.yml, README, guide (and its sample restore message); development.md "from pin" and the row; roadmap row shipped and the recommended order. No tag. Co-Authored-By: Claude Opus 5.5 --- CHANGELOG.md | 6 ++++++ README.md | 6 +++--- deploy/docker-compose.yml | 2 +- docs/development.md | 3 ++- docs/guide.md | 8 ++++---- docs/roadmap.md | 6 ++++-- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce40aaf..d0329f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ Format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/); version ## [Unreleased] +## [2.6.1] - 2026-10-15 + +The inbound relay's port 25 ends a message only at the standard +`.`: the SMTP-smuggling defence Postfix 3.7 leaves off. +No migration; schema 11. + ### Security - **Port 25 could be made to read a second transaction out of a message's diff --git a/README.md b/README.md index 5abafc1..1ef0e58 100644 --- a/README.md +++ b/README.md @@ -112,8 +112,8 @@ outbound mail will not reach the real internet without DNS, PTR, and port 25. > local image and pulls nothing: > > ```sh -> docker build -f build/Dockerfile --build-arg VERSION=2.6.0 \ -> -t ghcr.io/mixeme/selfpost:2.6.0 . +> docker build -f build/Dockerfile --build-arg VERSION=2.6.1 \ +> -t ghcr.io/mixeme/selfpost:2.6.1 . > ``` ```sh @@ -122,7 +122,7 @@ docker run --rm -d --name selfpost-try \ -e SELFPOST_HOSTNAME=mail.local.test \ -e PANEL_COOKIE_SECURE=false \ -v selfpost-try-data:/data \ - ghcr.io/mixeme/selfpost:2.6.0 + ghcr.io/mixeme/selfpost:2.6.1 ``` **Get the setup URL** (pick one): diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 919108b..99f3bde 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -23,7 +23,7 @@ services: selfpost: - image: ghcr.io/mixeme/selfpost:2.6.0 + image: ghcr.io/mixeme/selfpost:2.6.1 restart: unless-stopped environment: SELFPOST_HOSTNAME: "${SELFPOST_HOSTNAME:?set the mail/panel hostname, e.g. mail.example.com}" diff --git a/docs/development.md b/docs/development.md index 8096537..c423af4 100644 --- a/docs/development.md +++ b/docs/development.md @@ -107,7 +107,7 @@ than the default «meaningful step» rule in [§ Commits and release build](#com 2. Git tag `vX.Y.Z` and publish the GitHub Release only on explicit request (see [§ Release image](#release-image)). -**Planned version cuts** (from pin `2.6.0`; adjust if semver changes mid-track): +**Planned version cuts** (from pin `2.6.1`; adjust if semver changes mid-track): | Stage | ID | Cut | |---|---|---| @@ -137,6 +137,7 @@ than the default «meaningful step» rule in [§ Commits and release build](#com | 24 | audit-2026-10-12 stage 3: persistence and restore | `2.5.3` | | 25 | audit-2026-10-12 stage 4: panel behaviour | `2.5.4` | | 26 | audit-2026-10-12 stage 5: image and Postfix hardening | `2.6.0` | +| 27 | port25-bare-newline | `2.6.1` (PATCH) | Docs-only prep (checklists in plans, no product code) uses the same per-step commit rule but **no** version cut until the next product stage ships. diff --git a/docs/guide.md b/docs/guide.md index 787b2ae..4ac83e5 100644 --- a/docs/guide.md +++ b/docs/guide.md @@ -190,14 +190,14 @@ cat ./data/setup-token #### 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 `2.6.0`. **No 2.x image is +deliberately never `:latest`. The current pin is `2.6.1`. **No 2.x image is published on ghcr.io yet** (the newest there is `1.3.0`); until one is, build it from the checkout under the pinned name, and Compose uses the local image instead of pulling: ```sh -docker build -f build/Dockerfile --build-arg VERSION=2.6.0 \ - -t ghcr.io/mixeme/selfpost:2.6.0 . +docker build -f build/Dockerfile --build-arg VERSION=2.6.1 \ + -t ghcr.io/mixeme/selfpost:2.6.1 . ``` `VERSION` must equal the tag: it is the version the backup check compares @@ -860,7 +860,7 @@ 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 2.5.4 but this image is 2.6.0 — restore into the matching image (selfpost:2.5.4) +backup: this backup was created by SelfPost 2.6.0 but this image is 2.6.1 — restore into the matching image (selfpost:2.6.0) ``` Fix the tag in `docker-compose.yml` (build that tag as under [Fixed image diff --git a/docs/roadmap.md b/docs/roadmap.md index f9accfb..8b7200b 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -42,7 +42,7 @@ in `git log` and [CHANGELOG.md](../CHANGELOG.md). | settings-save-row | Server › Settings: the Save button no longer stands alone under a long right column | agreed (2026-10-15) | — | — | | dns-record-collapse | A DNS record that is right is shown folded: its name and its tag, the values on request | agreed (2026-10-15) | — | — | | own-mta-builds | Analysis: build Postfix and OpenDKIM ourselves, patched, instead of Debian's packages | analysed 2026-10-15: no own builds; three rows proposed instead | — | [own-mta-builds-2026-10-15.md](own-mta-builds-2026-10-15.md) | -| port25-bare-newline | The inbound relay's port 25 refuses bare newlines in DATA (`smtpd_forbid_bare_newline=normalize`) | agreed (2026-10-15; first of the three, PATCH) | — | — | +| port25-bare-newline | The inbound relay's port 25 refuses bare newlines in DATA (`smtpd_forbid_bare_newline=normalize`) | shipped `2.6.1` | — | — | | base-trixie | The image's base from Debian bookworm (LTS since 2026-07-12) to trixie: Postfix 3.10 with the 2026 security batches | agreed (2026-10-15; after port25-bare-newline, MINOR) | — | — | | panel-dkim-signing | DKIM signing in the panel's own milter; OpenDKIM, the syslog relay and the parser port removed | agreed (2026-10-15; after base-trixie, MINOR) | — | — | | phone-desktop-mode | A phone browser in "desktop site" mode gets the phone navigation | agreed (2026-10-13: after stages 1 and 2 of audit-2026-10-12) | — | — | @@ -61,7 +61,9 @@ shipped as `2.2.0` the same day, **panel-notifications** as `2.3.0` and stages 1 and 2 as `2.5.0` the same day, stage 2b as `2.5.1`, stage 2c as `2.5.2` (2026-10-15), and stages 3, 4 and 5 as `2.5.3`, `2.5.4` and `2.6.0` the same day; stage 6 (documents and tests, no cut) closed the -audit. What is agreed after it is marked so in the index; every other +audit. Of the three rows from [own-mta-builds](#own-mta-builds), +**port25-bare-newline** shipped as `2.6.1` the same day; base-trixie and +panel-dkim-signing follow in that order. What is agreed after it is marked so in the index; every other remaining item is a candidate. panel-docs shipped in [CHANGELOG.md](../CHANGELOG.md) `[1.8.0]`; dmarc-reports in `[1.7.0]` (its ingest path first ran in `2.0.0` and was reviewed on 2026-10-11, see