diff --git a/forwarded.py b/forwarded.py index 151be00..0ef7be1 100644 --- a/forwarded.py +++ b/forwarded.py @@ -25,4 +25,4 @@ def original_recipient(text: str, forwarder: str, allowed_domains) -> str: if _allowed(address.lower(), allowed_domains): return address.lower() sender = parseaddr(forwarder or "")[1].lower() - return sender if sender and _allowed(sender, allowed_domains) else "" + return sender if _ADDRESS.fullmatch(sender) and _allowed(sender, allowed_domains) else "" diff --git a/tests/test_forwarded.py b/tests/test_forwarded.py index f9ea57c..2b35bd8 100644 --- a/tests/test_forwarded.py +++ b/tests/test_forwarded.py @@ -38,3 +38,8 @@ def test_domain_must_match_exactly(domain): def test_subdomain_is_not_allowed_implicitly(): assert original_recipient("To: x@mail.wagnersnetz.de\n", "", ALLOWED) == "" + + +def test_malformed_forwarder_is_not_used(): + assert original_recipient("no header", "a@b@wagnersnetz.de", ALLOWED) == "" + assert original_recipient("no header", "", ALLOWED) == ""