scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-03 19:47:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

RECIPIENT_DELIMITER can have several characters

Browse Source 
(cherry picked from commit 14360f8926)

# Conflicts:
#	core/admin/mailu/configuration.py
#	core/admin/mailu/internal/views/postfix.py
This commit is contained in:
Florent Daigniere
2021-10-09 18:28:50 +02:00
committed by Mergify
parent 1592f348b2
commit e6a1eb828f
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/admin/mailu/configuration.py
View File

@@ -58,12 +58,16 @@ DEFAULT_CONFIG = {
'DKIM_PATH': '/dkim/{domain}.{selector}.key', 'DKIM_PATH': '/dkim/{domain}.{selector}.key',
'DEFAULT_QUOTA': 1000000000, 'DEFAULT_QUOTA': 1000000000,
'MESSAGE_RATELIMIT': '200/day', 'MESSAGE_RATELIMIT': '200/day',
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
'MESSAGE_RATELIMIT_EXEMPTION': '', 'MESSAGE_RATELIMIT_EXEMPTION': '',
'RECIPIENT_DELIMITER': '', 'RECIPIENT_DELIMITER': '',
======= =======
'RECIPIENT_DELIMITER': None, 'RECIPIENT_DELIMITER': None,
>>>>>>> 8c59f356 (use RECIPIENT_DELIMITER for splitting) >>>>>>> 8c59f356 (use RECIPIENT_DELIMITER for splitting)
=======
'RECIPIENT_DELIMITER': '',
>>>>>>> 14360f89 (RECIPIENT_DELIMITER can have several characters)
# Web settings # Web settings
'SITENAME': 'Mailu', 'SITENAME': 'Mailu',
'WEBSITE': 'https://mailu.io', 'WEBSITE': 'https://mailu.io',

4
core/admin/mailu/internal/views/postfix.py
View File

@@ -145,6 +145,7 @@ def postfix_sender_login(sender):
if localpart is None: if localpart is None:
return flask.jsonify(",".join(wildcard_senders)) if wildcard_senders else flask.abort(404) return flask.jsonify(",".join(wildcard_senders)) if wildcard_senders else flask.abort(404)
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
localpart = localpart[:next((i for i, ch in enumerate(localpart) if ch in flask.current_app.config.get('RECIPIENT_DELIMITER')), None)] localpart = localpart[:next((i for i, ch in enumerate(localpart) if ch in flask.current_app.config.get('RECIPIENT_DELIMITER')), None)]
destinations = set(models.Email.resolve_destination(localpart, domain_name, True) or []) destinations = set(models.Email.resolve_destination(localpart, domain_name, True) or [])
@@ -159,6 +160,9 @@ def postfix_sender_login(sender):
======= =======
if delim := flask.current_app.config.get('RECIPIENT_DELIMITER'): if delim := flask.current_app.config.get('RECIPIENT_DELIMITER'):
localpart = localpart.split(delim, 1)[0] localpart = localpart.split(delim, 1)[0]
=======
localpart = localpart[:next((i for i, ch in enumerate(localpart) if ch in flask.current_app.config.get('RECIPIENT_DELIMITER')), None)]
>>>>>>> 14360f89 (RECIPIENT_DELIMITER can have several characters)
destination = models.Email.resolve_destination(localpart, domain_name, True) destination = models.Email.resolve_destination(localpart, domain_name, True)
>>>>>>> 8c59f356 (use RECIPIENT_DELIMITER for splitting) >>>>>>> 8c59f356 (use RECIPIENT_DELIMITER for splitting)
destination = [*destination, *wildcard_senders] if destination else [*wildcard_senders] destination = [*destination, *wildcard_senders] if destination else [*wildcard_senders]