self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-05-19 22:23:16 +02:00
Code Issues Releases Activity

Encode domain part of email addresses before returning.

Browse Source
This commit is contained in:
Alexander Graf 2022-07-28 16:21:34 +02:00
parent 5179cf0618
commit c478e26d68
No known key found for this signature in database
GPG Key ID: B8A9DC143E075629
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,8 +33,9 @@ def postfix_alias_map(alias):
localpart, domain_name = models.Email.resolve_domain(alias) localpart, domain_name = models.Email.resolve_domain(alias)
if localpart is None: if localpart is None:
return flask.jsonify(domain_name) return flask.jsonify(domain_name)
destination = models.Email.resolve_destination(localpart, domain_name) if destinations := models.Email.resolve_destination(localpart, domain_name):
return flask.jsonify(",".join(destination)) if destination else flask.abort(404) return flask.jsonify(",".join(idna_encode(destinations)))
return flask.abort(404)
@internal.route("/postfix/transport/<path:email>") @internal.route("/postfix/transport/<path:email>")
def postfix_transport(email): def postfix_transport(email):
@ -142,9 +143,11 @@ 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)
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)]
destination = models.Email.resolve_destination(localpart, domain_name, True) destinations = models.Email.resolve_destination(localpart, domain_name, True) or []
destination = [*destination, *wildcard_senders] if destination else [*wildcard_senders] destinations.extend(wildcard_senders)
return flask.jsonify(",".join(destination)) if destination else flask.abort(404) if destinations:
return flask.jsonify(",".join(idna_encode(destinations)))
return flask.abort(404)
@internal.route("/postfix/sender/rate/<path:sender>") @internal.route("/postfix/sender/rate/<path:sender>")
def postfix_sender_rate(sender): def postfix_sender_rate(sender):
@ -169,3 +172,11 @@ def postfix_sender_access(sender):
except sqlalchemy.exc.StatementError: except sqlalchemy.exc.StatementError:
pass pass
return flask.abort(404) return flask.abort(404)
# idna encode domain part of each address in list of addresses
def idna_encode(addresses):
return [
f"{localpart}@{idna.encode(domain).decode('ascii')}"
for (localpart, domain) in
(address.rsplit("@", 1) for address in addresses)
]