Ticket #7203: ign-dom-default-dom.diff

trac/notification.py

@@ -163 +163 @@
     from_email = 'trac+tickets@localhost'
     subject = ''
     template_name = None
-    nodomaddr_re = re.compile(r'[\w\d_\.\-]+')
+    nodomaddr_re = re.compile(r'[\w\d_\.\-]+$')
     addrsep_re = re.compile(r'[;\s,]+')
 
     def __init__(self, env):
@@ -286 +286 @@
                 else:
                     self.env.log.info("Email address w/o domain: %s" % address)
                     return None
+            else:
+                self.env.log.info("Ignored email address: %s" % address)
+                return None
 
         mo = self.shortaddr_re.search(address)
         if mo:

trac/ticket/tests/notification.py

@@ -268 +268 @@
             self.env.config.set('notification', 'always_notify_reporter',
                                 'false')
             self.env.config.set('notification', 'smtp_always_cc', '')
+            self.env.config.set('notification', 'ignore_domains',
+                                'ignored.example.com')
             ticket = Ticket(self.env)
-            ticket['cc'] = 'joenodom, joewithdom@example.com'
+            ticket['cc'] = 'joenodom, joewithdom@example.com, ' \
+                'otherjoe@ignored.example.com'
             ticket['summary'] = 'This is a summary'
             ticket.insert()
             # Be sure that at least one email address is valid, so that we 
@@ -288 +291 @@
             cclist = [addr.strip() for addr in headers['Cc'].split(',')]
             self.failIf('joewithdom@example.com' not in cclist)
             self.failIf('joe.bar@example.net' not in cclist)
+            self.failIf(headers['Cc'].find('ignored') >= 0)
             if not enabled:
                 self.failIf(len(cclist) != 2)
                 self.failIf('joenodom' in cclist)
@@ -347 +351 @@
         # 'To' list should have been resolved to the actual email address
         self.failIf('kerb@example.net' not in tolist)
         self.failIf(len(tolist) != 1)
-        
+
     def test_admit_domains(self):
         """SMTP domain inclusion"""
         self.env.config.set('notification', 'admit_domains',