lingble/Mailu
1
0
Fork 0
mirror of https://github.com/lingble/Mailu.git synced 2026-03-19 19:50:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

split localpart into user and tag

Browse Source 
(cherry picked from commit 1d571dedfc)

# Conflicts:
#	core/admin/mailu/internal/views/postfix.py
This commit is contained in:
Alexander Graf
2021-10-09 17:11:12 +02:00
committed by Mergify
parent a28aa0d1a0
commit 59134d8125
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -144,6 +144,7 @@ def postfix_sender_login(sender):
localpart, domain_name = models.Email.resolve_domain(sender)
if localpart is None:
return flask.jsonify(",".join(wildcard_senders)) if wildcard_senders else flask.abort(404)
<<<<<<< HEAD
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.update(wildcard_senders)
@@ -151,6 +152,12 @@ def postfix_sender_login(sender):
if destinations:
return flask.jsonify(",".join(idna_encode(destinations)))
return flask.abort(404)
=======
user, plus = localpart.split("+", 1)
destination = models.Email.resolve_destination(user, domain_name, True)
destination = [*destination, *wildcard_senders] if destination else [*wildcard_senders]
return flask.jsonify(",".join(destination)) if destination else flask.abort(404)
>>>>>>> 1d571ded (split localpart into user and tag)
@internal.route("/postfix/sender/rate/<path:sender>")
def postfix_sender_rate(sender):