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

Simplify alias precedence handling; Remove bogus changelog

Browse Source
This commit is contained in:
Dario Ernst
2019-01-10 10:28:57 +01:00
parent 291f8a457b
commit ac64a75743
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/admin/mailu/models.py
View File

@@ -260,24 +260,14 @@ class Email(object):
@classmethod
def resolve_destination(cls, localpart, domain_name, ignore_forward_keep=False):
localpart_stripped = None
stripped_alias = None
localpart_maybe_split = localpart
if os.environ.get('RECIPIENT_DELIMITER') in localpart:
localpart_stripped = localpart.rsplit(os.environ.get('RECIPIENT_DELIMITER'), 1)[0]
localpart_maybe_split = localpart.rsplit(os.environ.get('RECIPIENT_DELIMITER'), 1)[0]
pure_alias = Alias.resolve(localpart, domain_name)
has_wildcard = pure_alias and '%' in pure_alias.email and pure_alias.wildcard
stripped_alias = Alias.resolve(localpart_stripped, domain_name)
alias = Alias.resolve(localpart_maybe_split, domain_name)
if pure_alias and not has_wildcard:
return pure_alias.destination
elif not pure_alias and stripped_alias:
return stripped_alias.destination
elif has_wildcard and localpart_stripped and stripped_alias:
return stripped_alias.destination
elif pure_alias:
return pure_alias.destination
if alias:
return alias.destination
user = User.query.get('{}@{}'.format(localpart, domain_name))
if not user and localpart_stripped: