Agent Zero AI framework
refactor: improve email whitelist matching with proper email extraction
frdel4b6cc7e2e09f
diff --git a/plugins/_email_integration/helpers/imap_client.py b/plugins/_email_integration/helpers/imap_client.pyindex 0091bb2f4..7d3db8cf1 100644--- a/plugins/_email_integration/helpers/imap_client.py+++ b/plugins/_email_integration/helpers/imap_client.py@@ -442,8 +442,38 @@ def _is_noreply(sender: str) -> bool:def _matches_whitelist(sender: str, whitelist: list[str]) -> bool:- sender_lower = sender.lower()+ sender_email = _extract_email_from_sender(sender.lower())for pattern in whitelist:- if fnmatch(sender_lower, pattern.lower()):+ if fnmatch(sender_email, pattern.lower()):return Truereturn False+++def _extract_email_from_sender(sender: str) -> str:+ """Extract email address from sender string.++ Handles formats like:+ - "[email protected]"+ - "Name <[email protected]>"+ - "\"Display Name\" <[email protected]>"++ Uses content inside angle brackets as authoritative to prevent spoofing+ by fake emails in the display name (e.g., "John [email protected] <[email protected]>").+ """+ import re+ # Look for email inside angle brackets - this is the authoritative source+ match = re.search(r"<([^>]+)>", sender)+ if match:+ email = match.group(1).strip()+ # Validate it looks like an email+ if re.match(r"^[^\s<>@]+@[^\s<>@]+\.[^\s<>@]+$", email):+ return email++ # No angle brackets - extract email from the whole string+ # This handles plain "[email protected]" or malformed input+ email_match = re.search(r"[^\s<>]+@[^\s<>]+\.[^\s<>]+", sender)+ if email_match:+ return email_match.group(0)++ # Fallback: return the whole string (will likely fail pattern match)+ return sender