From b8d1beed299f881870f992eb13d8c68735c43e85 Mon Sep 17 00:00:00 2001 From: Dario Ernst Date: Thu, 10 Jan 2019 23:06:56 +0100 Subject: [PATCH] Simplify alias-wildcard detection to not consider actual % anymore --- core/admin/mailu/models.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py index 8b7b8d63..9130ae65 100644 --- a/core/admin/mailu/models.py +++ b/core/admin/mailu/models.py @@ -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