Changeset 572 for trunk/email2trac.py.in

Timestamp:

09/20/11 13:22:17 (12 years ago)

Author:

bas

Message:

adjusted email_header_acl we now loop over all to address to allow regexs like (*.sara.nl or ^{basv@…), see #272}

File:

• trunk/email2trac.py.in (modified) (2 diffs)

trunk/email2trac.py.in

@@ -257 +257 @@
             return False
 
-    def email_header_acl(self, keyword, header_field, default):
+    def email_header_acl(self, keyword, message_field, default):
         """
         This function wil check if the email address is allowed or denied
@@ -273 +273 @@
 
         except KeyError, detail:
-            self.logger.debug('%s not defined, all messages are allowed.' %(keyword))
+            self.logger.debug('\t %s not defined, all messages are allowed.' %(keyword))
 
             return default 
 
         mail_addresses = string.split(mail_addresses, ',')
+        message_addresses = string.split(message_field, ',')
 
         for entry in mail_addresses:
             entry = entry.strip()
             TO_RE = re.compile(entry, re.VERBOSE|re.IGNORECASE)
-            result =  TO_RE.search(header_field)
-            if result:
-                return True
+
+            for addr in message_addresses:
+                addr = addr.strip()
+
+                if self.parameters.compare_function_list in [ 'matches', 'match']:
+                    s = '\t%s matches %s' %(addr, entry)
+                    result =  TO_RE.match(addr) 
+                else: 
+                    s = '\t%s contains %s' %(addr, entry)
+                    result =  TO_RE.search(addr) 
+
+                if result:
+                    self.logger.debug(s)
+                    return True
 
         return False