self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-01-14 02:34:22 +02:00
Code Issues Releases Activity

Simplify alias-wildcard detection to not consider actual % anymore

Browse Source
This commit is contained in:
Dario Ernst 2019-01-10 23:06:56 +01:00
parent 10d2601963
commit b8d1beed29
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,10 +267,9 @@ class Email(object):
localpart_stripped = localpart.rsplit(os.environ.get('RECIPIENT_DELIMITER'), 1)[0]
pure_alias = Alias.resolve(localpart, domain_name)
pure_alias_has_wildcard = pure_alias and '%' in pure_alias.email and pure_alias.wildcard
stripped_alias = Alias.resolve(localpart_stripped, domain_name)
if pure_alias and not pure_alias_has_wildcard:
if pure_alias and not pure_alias.wildcard:
return pure_alias.destination
elif stripped_alias:
return stripped_alias.destination