Enhance Exchange bounce detector to better handle Office 365 format

Author: jaredmauch

Mailman/Bouncers/Exchange.py

@@ -26,10 +26,13 @@
 from Mailman.Logging.Syslog import syslog
 from Mailman.Handlers.CookHeaders import change_header
 
-scre = re.compile('did not reach the following recipient')
-ecre = re.compile('MSEXCH:')
+# Patterns for different Exchange/Office 365 bounce formats
+scre = re.compile('did not reach the following recipient|Your message to .* couldn\'t be delivered')
+ecre = re.compile('MSEXCH:|Action Required')
 a1cre = re.compile('SMTP=(?P<addr>[^;]+); on ')
 a2cre = re.compile('(?P<addr>[^ ]+) on ')
+a3cre = re.compile('Your message to (?P<addr>[^ ]+) couldn\'t be delivered')
+a4cre = re.compile('(?P<addr>[^ ]+) wasn\'t found at ')
 
 
 def process(msg):
@@ -45,9 +48,18 @@ def process(msg):
     for line in it:
         if ecre.search(line):
             break
-        mo = a1cre.search(line)
-        if not mo:
-            mo = a2cre.search(line)
-        if mo:
-            addrs[mo.group('addr')] = 1
+        # Try all patterns
+        for pattern in [a1cre, a2cre, a3cre, a4cre]:
+            mo = pattern.search(line)
+            if mo:
+                addr = mo.group('addr')
+                # Clean up the address if needed
+                if '@' not in addr and 'at' in line:
+                    # Handle cases where domain is on next line
+                    next_line = next(it, '')
+                    if 'at' in next_line:
+                        domain = next_line.split('at')[-1].strip()
+                        addr = f"{addr}@{domain}"
+                addrs[addr] = 1
+                break
     return list(addrs.keys())