From 84f7b60bc5944c91eb1b6da04109729c2d0e240f Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 14 Feb 2022 11:45:10 -0800 Subject: [PATCH] email: Drop special handling for reserved TLDs There is no special reason to handle them separately instead of letting DNS resolution to them fail. No documentation on what caret addresses are or what .fm.localhost TLD is. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/email/audit/spam.py | 45 +++++++++---------- .../etc/postfix/freedombox-transport-from | 12 ----- .../data/etc/postfix/freedombox-transport-to | 9 ---- 3 files changed, 22 insertions(+), 44 deletions(-) delete mode 100644 plinth/modules/email/data/etc/postfix/freedombox-transport-from delete mode 100644 plinth/modules/email/data/etc/postfix/freedombox-transport-to diff --git a/plinth/modules/email/audit/spam.py b/plinth/modules/email/audit/spam.py index 35c9b05e0..6ddbf922b 100644 --- a/plinth/modules/email/audit/spam.py +++ b/plinth/modules/email/audit/spam.py @@ -7,33 +7,31 @@ from plinth import actions from plinth.modules.email import postconf milter_config = { - 'milter_mail_macros': 'i ' + ' '.join([ - '{auth_type}', '{auth_authen}', '{auth_author}', - '{client_addr}', '{client_name}', - '{mail_addr}', '{mail_host}', '{mail_mailer}' - ]), + 'milter_mail_macros': + 'i ' + ' '.join([ + '{auth_type}', '{auth_authen}', '{auth_author}', '{client_addr}', + '{client_name}', '{mail_addr}', '{mail_host}', '{mail_mailer}' + ]), # XXX In postconf this field is a list - 'smtpd_milters': 'inet:127.0.0.1:11332', + 'smtpd_milters': + 'inet:127.0.0.1:11332', # XXX In postconf this field is a list - 'non_smtpd_milters': 'inet:127.0.0.1:11332', - 'milter_header_checks': 'regexp:fbx-managed/pre-queue-milter-headers', + 'non_smtpd_milters': + 'inet:127.0.0.1:11332', + 'milter_header_checks': + 'regexp:fbx-managed/pre-queue-milter-headers', # Last-resort internal header cleanup at smtp client - 'smtp_header_checks': 'regexp:/etc/postfix/freedombox-internal-cleanup', - # Reserved mail transports - # XXX This field is a list - 'transport_maps': 'regexp:/etc/postfix/freedombox-transport-to', - # XXX This field is a list - 'sender_dependent_default_transport_maps': \ - 'regexp:/etc/postfix/freedombox-transport-from', + 'smtp_header_checks': + 'regexp:/etc/postfix/freedombox-internal-cleanup', } # FreedomBox egress filtering -egress_filter = postconf.ServiceFlags( - service='127.0.0.1:10025', type='inet', private='n', unpriv='-', - chroot='y', wakeup='-', maxproc='-', command_args='smtpd' -) +egress_filter = postconf.ServiceFlags(service='127.0.0.1:10025', type='inet', + private='n', unpriv='-', chroot='y', + wakeup='-', maxproc='-', + command_args='smtpd') egress_filter_options = { 'syslog_name': 'postfix/fbxout', @@ -47,10 +45,11 @@ egress_filter_options = { 'mynetworks': '127.0.0.0/8,[::1]/128' } -egress_filter_cleanup = postconf.ServiceFlags( - service='fbxcleanup', type='unix', private='n', unpriv='-', - chroot='y', wakeup='-', maxproc='0', command_args='cleanup' -) +egress_filter_cleanup = postconf.ServiceFlags(service='fbxcleanup', + type='unix', private='n', + unpriv='-', chroot='y', + wakeup='-', maxproc='0', + command_args='cleanup') egress_filter_cleanup_options = { 'syslog_name': 'postfix/fbxout', diff --git a/plinth/modules/email/data/etc/postfix/freedombox-transport-from b/plinth/modules/email/data/etc/postfix/freedombox-transport-from deleted file mode 100644 index 41ce10bed..000000000 --- a/plinth/modules/email/data/etc/postfix/freedombox-transport-from +++ /dev/null @@ -1,12 +0,0 @@ -# -*- mode: conf-space -*- -# This file is managed by FreedomBox. Direct edits will be lost! - -# Sender dependent transport map format -# Overrides default_transport - -# Reserved domain names -/\.onion$/i error: not implemented: mail delivery from .onion -/\.i2p$/i error: not implemented: mail delivery from .i2p -/\.fm\.localhost$/i error: not implemented: mail delivery from .fm.localhost -# Caret addresses -/^[a-z0-9\-\.]+\^/i error: not implemented: caret addresses diff --git a/plinth/modules/email/data/etc/postfix/freedombox-transport-to b/plinth/modules/email/data/etc/postfix/freedombox-transport-to deleted file mode 100644 index 75f26474b..000000000 --- a/plinth/modules/email/data/etc/postfix/freedombox-transport-to +++ /dev/null @@ -1,9 +0,0 @@ -# -*- mode: conf-space -*- -# This file is managed by FreedomBox. Direct edits will be lost! - -# Transport map format - -# Reserved domain names -/\.onion$/i error: not implemented: mail delivery to .onion -/\.i2p$/i error: not implemented: mail delivery to .i2p -/\.fm\.localhost$/i error: not implemented: mail delivery to .fm.localhost