admit_domains value not effect to mail notification.

[masato-ka]

We found a bug on admit_domains options. Intrinsically, admit_domains can do designation email address using domain. because, Trac admin screen describe to admit_domains below to "Comma-separated list of domains that should be considered as valid for email addresses (such as localdomain)." But, not behave it.

I read souce code "trac/notification.py". and I fixed this bug.

trac/trac/notification.py

@@ -267 +267 @@
         admit_domains = self.env.config.get('notification', 'admit_domains')
         if admit_domains:
             pos = addrfmt.find('@')
+            row_domains = [x.strip() for x in admit_domains.split(',')]
+            admit_re = re.compile(r'[\w\d_\.\-\*]+')
+            for row_domain in row_domains:
+                if not admit_re.match(row_domain):
+                    raise TracError("Invalid format admit_domains. %s" % admit_domains)
             domains = '|'.join([x.strip() for x in \
-                                admit_domains.replace('.','\.').split(',')])
-            addrfmt = r'%s@(?:(?:%s)|%s)' % (addrfmt[:pos], addrfmt[pos+1:], 
-                                              domains)
+                                    admit_domains.replace('.','\.').split(',')])
+            if domains:
+                addrfmt = r'%s@(?:%s)' %(addrfmt[:pos],domains)
+            else:
+                addrfmt = r'%s@(?:(?:%s)|%s)' % (addrfmt[:pos], addrfmt[pos+1:], 
+                                                  domains)
         self.shortaddr_re = re.compile(r'\s*(%s)\s*$' % addrfmt)
         self.longaddr_re = re.compile(r'^\s*(.*)\s+<\s*(%s)\s*>\s*$' % addrfmt)
         self._init_pref_encoding()

Perhaps, Other version trac(1.0) have same bug.

Please fixed to your trunk.

Regards masato-ka.

[Jun Omae]

This is not a bug.

admit_domains option provides a way to add valid domains for users if the domain is a local domain name (e.g. root@localhost, root@localdomain, etc…). The option doesn't provide a way to restrict the email domains.

[Christian Boos]

All the tickets for {20} from last year have probably been seen multiple times by now, yet are still to be triaged…