nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-03-18 09:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

email: Drop special handling for reserved TLDs

Browse Source 
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 <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2022-02-14 11:45:10 -08:00 committed by James Valleroy
parent 4b741e9192
commit 84f7b60bc5
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
3 changed files with 22 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
plinth/modules/email/audit/spam.py
View File

@ -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',

12
plinth/modules/email/data/etc/postfix/freedombox-transport-from
View File

@ -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

9
plinth/modules/email/data/etc/postfix/freedombox-transport-to
View File

@ -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