From 807c8efd15772e4efa6a71e861cf0312a697a34e Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Tue, 14 Mar 2023 12:30:26 +0000
Subject: [PATCH] Check only for current domain for now

---
 config/postfix/APKBUILD         | 8 ++++----
 config/postfix/main.cf          | 3 ++-
 config/postfix/pgsql-aliases.cf | 2 +-
 config/postfix/pgsql-users.cf   | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config/postfix/APKBUILD b/config/postfix/APKBUILD
index 275bb3f..5b455fb 100644
--- a/config/postfix/APKBUILD
+++ b/config/postfix/APKBUILD
@@ -3,7 +3,7 @@
 
 . ../APKBUILD-config.template
 
-pkgver=2023.03.14.01
+pkgver=2023.03.14.02
 pkgrel=0
 depends="postfix-pgsql redxen-secret-letsencrypt-chain redxen-secret-letsencrypt-private"
 
@@ -42,8 +42,8 @@ package() {
 
 sha512sums="
 1cb4072b03f3e9d79b15a082ccad99fc005129b56fc42c467713520f89feef298082637fbfaa01a04c2a1b6e69a254d9018adccaf9d98a4532f067214a4035f4  master.cf
-20ec9dd72998c809e2d262e8bb44ef82ddd352e45d045264e145ea58261cc511184912de5551de54bb63f897a6b8317a77d1e1a7eb0307edbbaf0499a259b3fb  main.cf
+88f8f81de1da32ab70890f3bc7e5c3970e0936d3bf2e4950bfe8253dc5fcdd3cbb39b1bfc76cd30cd74d67fc2d9430db4df9ae431b797db23e700e48199e5d1a  main.cf
 e2e2073b064a921a9eeed028e17617bcd2d1235517d908b4daadef45eb4cbb8686023c532d7938a779021cdd9548afe97f59d4c3232e7e01dca229e37e8c63ff  secret
-9c3ae0c3448710cb13e27cfd67864d27d364a3893ce70033df25ecd21cb0cc28a36f7d8aa9fe0cbdd0dc3516e78f34a5645a727387870d74ed8643078ec7e062  pgsql-aliases.cf
-939677c0733348509a26a9ee654bc57be6cf4ce760c40cac7d1cc802afc0f7ec4b53c3752f60e9482b78290f6e36c5c8eca98645b54b34ffbb51dfbf4080d916  pgsql-users.cf
+18acb13f62e12d76c5658fa4398d132f069bd533f52c8eaada35d0432c725c9d9f16628aad8f32b0c4796727d4d9540059018697efd516ddcf40826f347e3d77  pgsql-aliases.cf
+a49dcd665f2557521c472464694436ad87c84a2a0e144ae6da73d3cab5d447e2d1b202de8571f302933ee1fc950f1151709bc10cc9d2e36684d8b5c2c48698c6  pgsql-users.cf
 "
diff --git a/config/postfix/main.cf b/config/postfix/main.cf
index 80101b0..dfee130 100644
--- a/config/postfix/main.cf
+++ b/config/postfix/main.cf
@@ -43,7 +43,8 @@ smtpd_tls_security_level = may
 smtpd_tls_protocols = !SSLv2, !SSLv3
 
 # Restrictions
-smtpd_sender_restrictions    = permit_sasl_authenticated,
+smtpd_sender_restrictions    = reject_known_sender_login_mismatch,
+                               permit_sasl_authenticated,
                                check_sender_access inline:{{$myorigin=553 not logged in}},
                                reject_invalid_helo_hostname,
                                reject_unknown_sender_domain
diff --git a/config/postfix/pgsql-aliases.cf b/config/postfix/pgsql-aliases.cf
index ef97854..1b05a30 100644
--- a/config/postfix/pgsql-aliases.cf
+++ b/config/postfix/pgsql-aliases.cf
@@ -2,4 +2,4 @@ hosts = postgresql.routinginfo.internal:7550
 dbname = mail
 user = postfix
 password = POSTGRESQL_PASSWORD
-query = SELECT target FROM aliases WHERE alias = '%u' AND active = '1'
+query = SELECT target FROM aliases WHERE alias = '%u' AND '%d' = 'redxen.eu' AND active = '1'
diff --git a/config/postfix/pgsql-users.cf b/config/postfix/pgsql-users.cf
index 6ea8f79..640520b 100644
--- a/config/postfix/pgsql-users.cf
+++ b/config/postfix/pgsql-users.cf
@@ -2,4 +2,4 @@ hosts = postgresql.routinginfo.internal:7550
 dbname = mail
 user = postfix
 password = POSTGRESQL_PASSWORD
-query = SELECT userid FROM users WHERE userid = '%u' AND active = '1'
+query = SELECT userid FROM users WHERE userid = '%u' AND '%d' = 'redxen.eu' AND active = '1'