summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorGab <24553253+gabrix73@users.noreply.github.com>2026-08-17 14:53:59 +0200
committerGab <24553253+gabrix73@users.noreply.github.com>2026-08-17 14:53:59 +0200
commite360f433436447a89d4873b1eb3fac18c84e915f (patch)
tree10520663f4b304fbeff371663e4799c580965d75 /deploy
parent9679f3f3a177215717a6734a0b91161e00814504 (diff)
downloadm2usenet-and-mail2news-main.tar.gz
m2usenet-and-mail2news-main.tar.xz
m2usenet-and-mail2news-main.zip
Accept dated Mail2News onion recipientsHEADmain
Diffstat (limited to 'deploy')
-rw-r--r--deploy/README.md21
-rw-r--r--deploy/postfix/qee-mail2news-access2
-rw-r--r--deploy/postfix/qee-mail2news-aliases2
3 files changed, 13 insertions, 12 deletions
diff --git a/deploy/README.md b/deploy/README.md
index 055de1e..3ee3a27 100644
--- a/deploy/README.md
+++ b/deploy/README.md
@@ -8,21 +8,22 @@ Apply the fragments from this directory through the normal configuration
management or deployment process. They are intentionally not complete server
configuration files.
-The legacy `qee4...onion` listener on Victor accepts one narrowly scoped
-email-client recipient form:
+The legacy `qee4...onion` listener on Victor accepts two narrowly scoped
+email-client recipient forms:
```text
mail2news-YYYYMMDD-group.one=group.two@mail2news.tcpreset.net
+mail2news-YYYYMMDD-group.one=group.two@xilb7y4kj6u6qfo45o3yk2kilfv54ffukzei3puonuqlncy7cn2afwyd.onion
```
-`qee-mail2news-access` permits only that dated syntax, with at most three
-validated-looking newsgroups. `qee-mail2news-aliases` rewrites only the SMTP
-envelope recipient to the exact private Mail2News onion address. The visible
-`To` header is preserved so Mail2News can perform authoritative date and
-newsgroup validation. Append the alias fragment to Victor's existing
-`virtual_alias_maps`; do not replace the other maps. This keeps the
-Victor-to-Diego leg on the client-authorized onion route and does not permit
-general SMTP relay.
+`qee-mail2news-access` permits only that dated syntax, with either exact domain
+and at most three validated-looking newsgroups. `qee-mail2news-aliases`
+rewrites only the SMTP envelope recipient to the exact private Mail2News onion
+address. The visible `To` header is preserved so Mail2News can perform
+authoritative date and newsgroup validation. Append the alias fragment to
+Victor's existing `virtual_alias_maps`; do not replace the other maps. This
+keeps the Victor-to-Diego leg on the client-authorized onion route and does not
+permit general SMTP relay.
Deployment order:
diff --git a/deploy/postfix/qee-mail2news-access b/deploy/postfix/qee-mail2news-access
index f8c23a7..8d84652 100644
--- a/deploy/postfix/qee-mail2news-access
+++ b/deploy/postfix/qee-mail2news-access
@@ -1,3 +1,3 @@
# Permit only the dated Mail2News recipient syntax used by ordinary email
# clients. Everything else is rejected by the dedicated qee onion listener.
-/^mail2news-[0-9]{8}-[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+(=[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+){0,2}@mail2news\.tcpreset\.net$/ OK
+/^mail2news-[0-9]{8}-[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+(=[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+){0,2}@(mail2news\.tcpreset\.net|xilb7y4kj6u6qfo45o3yk2kilfv54ffukzei3puonuqlncy7cn2afwyd\.onion)$/ OK
diff --git a/deploy/postfix/qee-mail2news-aliases b/deploy/postfix/qee-mail2news-aliases
index 3025ccf..cbc6cb1 100644
--- a/deploy/postfix/qee-mail2news-aliases
+++ b/deploy/postfix/qee-mail2news-aliases
@@ -1,4 +1,4 @@
# Preserve the user-facing To header, but rewrite the SMTP envelope to the
# exact client-authorized Mail2News onion ingress. Mail2News extracts and
# validates the date and newsgroups from the original To header.
-/^mail2news-[0-9]{8}-[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+(=[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+){0,2}@mail2news\.tcpreset\.net$/ mail2news@xilb7y4kj6u6qfo45o3yk2kilfv54ffukzei3puonuqlncy7cn2afwyd.onion
+/^mail2news-[0-9]{8}-[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+(=[a-z][a-z0-9]+(\.[0-9a-z+_-]+)+){0,2}@(mail2news\.tcpreset\.net|xilb7y4kj6u6qfo45o3yk2kilfv54ffukzei3puonuqlncy7cn2afwyd\.onion)$/ mail2news@xilb7y4kj6u6qfo45o3yk2kilfv54ffukzei3puonuqlncy7cn2afwyd.onion