Page MenuHomeSoftware Heritage
Files F7123621

D7498.id27230.diff
No OneTemporary
Actions

D7498.id27230.diff
View Options

diff --git a/swh/web/inbound_email/utils.py b/swh/web/inbound_email/utils.py
--- a/swh/web/inbound_email/utils.py
+++ b/swh/web/inbound_email/utils.py
@@ -34,6 +34,31 @@
"""The parsed +-extension of the matched recipient address"""
+def single_recipient_matches(
+ recipient: Address, address: str
+) -> Optional[AddressMatch]:
+ """Check whether a single address matches the provided base address.
+
+ The match is case-insensitive, which is not really RFC-compliant but is consistent
+ with what most people would expect.
+
+ This function supports "+-addressing", where the local part of the email address is
+ appended with a `+`.
+
+ """
+ parsed_address = Address(addr_spec=address.lower())
+
+ if recipient.domain.lower() != parsed_address.domain:
+ return None
+
+ base_username, _, extension = recipient.username.partition("+")
+
+ if base_username.lower() != parsed_address.username:
+ return None
+
+ return AddressMatch(recipient=recipient, extension=extension or None)
+
+
def recipient_matches(message: EmailMessage, address: str) -> List[AddressMatch]:
"""Check whether any of the message recipients match the given address.
@@ -47,17 +72,9 @@
ret = []
- parsed_address = Address(addr_spec=address.lower())
-
for recipient in extract_recipients(message):
- if recipient.domain.lower() != parsed_address.domain:
- continue
-
- base_username, _, extension = recipient.username.partition("+")
-
- if base_username.lower() != parsed_address.username:
- continue
-
- ret.append(AddressMatch(recipient=recipient, extension=extension or None))
+ match = single_recipient_matches(recipient, address)
+ if match:
+ ret.append(match)
return ret
diff --git a/swh/web/tests/inbound_email/test_utils.py b/swh/web/tests/inbound_email/test_utils.py
--- a/swh/web/tests/inbound_email/test_utils.py
+++ b/swh/web/tests/inbound_email/test_utils.py
@@ -42,6 +42,25 @@
]
+def test_single_recipient_matches():
+ assert (
+ utils.single_recipient_matches(
+ Address(addr_spec="test@example.com"), "match@example.com"
+ )
+ is None
+ )
+ assert utils.single_recipient_matches(
+ Address(addr_spec="match@example.com"), "match@example.com"
+ ) == utils.AddressMatch(
+ recipient=Address(addr_spec="match@example.com"), extension=None
+ )
+ assert utils.single_recipient_matches(
+ Address(addr_spec="MaTch+12345AbC@exaMple.Com"), "match@example.com"
+ ) == utils.AddressMatch(
+ recipient=Address(addr_spec="MaTch+12345AbC@exaMple.Com"), extension="12345AbC"
+ )
+
+
def test_recipient_matches():
message = EmailMessage()
assert utils.recipient_matches(message, "match@example.com") == []

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 2:47 PM (18 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3224209

Event Timeline

About · Developer information · Legal