From eb4b9db0c723b4a04c8c0a8fdee18a4ec7577862 Mon Sep 17 00:00:00 2001 From: Bart Laarhoven <2362453+bartlaarhoven@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:25:38 +0200 Subject: [PATCH 1/3] postfix always_add_missing_headers --- .../mvc/app/controllers/OPNsense/Postfix/forms/general.xml | 5 +++++ .../src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml | 4 ++++ .../src/opnsense/service/templates/OPNsense/Postfix/main.cf | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml index 35982885f..c02f41b3d 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml @@ -247,6 +247,11 @@ checkbox Use Recipient Address Verification. Please keep in mind that this could put significant load onto the next server. + + general.always_add_missing_headers + + checkbox + general.delay_warning_time diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml index 5a7c0c41a..7cfad83f3 100644 --- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml +++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml @@ -186,6 +186,10 @@ 0 Y + + 0 + Y + 0 N diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf index 5ce384efa..d525ab9a3 100644 --- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf +++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf @@ -153,6 +153,10 @@ tls_preempt_cipherlist = no relayhost = {{ OPNsense.postfix.general.relayhost }} {% endif %} +{% if helpers.exists('OPNsense.postfix.general.always_add_missing_headers') and OPNsense.postfix.general.always_add_missing_headers == '1' %} +always_add_missing_headers = yes +{% endif %} + {% if helpers.exists('OPNsense.postfix.general.smtpauth_enabled') and OPNsense.postfix.general.smtpauth_enabled != '' %} smtp_sasl_auth_enable = yes smtp_sasl_password_maps = hash:/usr/local/etc/postfix/smtp_auth From 15616721a2bd8c32c69ed3ddda33b40e55d3505c Mon Sep 17 00:00:00 2001 From: Bart Laarhoven <2362453+bartlaarhoven@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:43:35 +0200 Subject: [PATCH 2/3] we should also add the local_header_rewrite_clients option --- .../controllers/OPNsense/Postfix/forms/general.xml | 8 ++++++++ .../mvc/app/models/OPNsense/Postfix/General.xml | 13 +++++++++++++ .../service/templates/OPNsense/Postfix/main.cf | 3 +++ 3 files changed, 24 insertions(+) diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml index c02f41b3d..215ea93d6 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml @@ -252,6 +252,14 @@ checkbox + + general.local_header_rewrite_clients + + + select_multiple + false + Rewrite or add message headers in mail from these clients, updating incomplete addresses with the domain name in $myorigin or $mydomain, and adding missing headers. + general.delay_warning_time diff --git a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml index 7cfad83f3..5b8492814 100644 --- a/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml +++ b/mail/postfix/src/opnsense/mvc/app/models/OPNsense/Postfix/General.xml @@ -190,6 +190,19 @@ 0 Y + + N + permit_inet_interfaces + Y + Y + + permit_inet_interfaces + permit_mynetworks + permit_sasl_authenticated + permit_tls_clientcerts + permit_tls_all_clientcerts + + 0 N diff --git a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf index d525ab9a3..5bb1022f0 100644 --- a/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf +++ b/mail/postfix/src/opnsense/service/templates/OPNsense/Postfix/main.cf @@ -156,6 +156,9 @@ relayhost = {{ OPNsense.postfix.general.relayhost }} {% if helpers.exists('OPNsense.postfix.general.always_add_missing_headers') and OPNsense.postfix.general.always_add_missing_headers == '1' %} always_add_missing_headers = yes {% endif %} +{% if helpers.exists('OPNsense.postfix.general.local_header_rewrite_clients') and OPNsense.postfix.general.local_header_rewrite_clients != '' %} +local_header_rewrite_clients = {{ OPNsense.postfix.general.local_header_rewrite_clients }} +{% endif %} {% if helpers.exists('OPNsense.postfix.general.smtpauth_enabled') and OPNsense.postfix.general.smtpauth_enabled != '' %} smtp_sasl_auth_enable = yes From 5acd180d6d4c852cfd0a3d0102e18980564fd587 Mon Sep 17 00:00:00 2001 From: Bart Laarhoven <2362453+bartlaarhoven@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:46:32 +0200 Subject: [PATCH 3/3] and add some help text --- .../mvc/app/controllers/OPNsense/Postfix/forms/general.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml index 215ea93d6..9c8b358fc 100644 --- a/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml +++ b/mail/postfix/src/opnsense/mvc/app/controllers/OPNsense/Postfix/forms/general.xml @@ -251,6 +251,7 @@ general.always_add_missing_headers checkbox + Always add (Resent-) From:, To:, Date: or Message-ID: headers when not present. general.local_header_rewrite_clients