Changeset 221 for trunk/email2trac.py.in

Timestamp:

10/10/08 14:35:48 (14 years ago)

Author:

bas

Message:

email2trac.py.in:

• closes ticket #87, #74
• added a more general function email_header_acl()
  • so we can enable black/white lists on every email header field
• Added white_list option
• removed MAILER-DAEMON@ from black_list. No defaults anymore
• add patches from hju at jochenkuhl dot de to enable alternate template config for trac 0.11

File:

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

trunk/email2trac.py.in

@@ -282 +282 @@
                         return False
 
-
-        def blacklisted_from(self):
-                """
-                This function wil check if the email address is in the black list
-                """
+        def email_header_acl(self, keyword, header_field, default):
+                """
+                This function wil check if the email address is allowed or denied
+                to send mail to the ticket list
+            """ 
                 try:
-                        black_list = self.parameters['black_list']
+                        mail_addresses = self.parameters[keyword]
+
+                        # Check if we have an empty string
+                        #
+                        if not mail_addresses:
+                                return default 
+
                 except KeyError, detail:
-                        black_list = 'MAILER-DAEMON@'
-
-                black_list = string.split(black_list, ',')      
-                if not black_list.count('MAILER-DAEMON@'):
-                        black_list.append('MAILER-DAEMON@')
-
-                for entry in black_list:        
+                        if self.DEBUG > 2 :
+                                print '%s not defined, all messages are allowed.' %(keyword)
+
+                        return default 
+
+                mail_addresses = string.split(mail_addresses, ',')
+
+                for entry in mail_addresses:
                         entry = entry.strip()
-                        FROM_RE = re.compile(entry, re.VERBOSE|re.IGNORECASE)
-                        result =  FROM_RE.search(self.email_addr)
+                        TO_RE = re.compile(entry, re.VERBOSE|re.IGNORECASE)
+                        result =  TO_RE.search(header_field)
                         if result:
                                 return True
@@ -404 +411 @@
 
                 self.email_from = self.email_to_unicode(message['from'])
-                self.author, self.email_addr  = email.Utils.parseaddr(self.email_from)
+                self.author, self.mail_addr  = email.Utils.parseaddr(self.email_from)
 
                 # Maybe for later user
@@ -783 +790 @@
                 m = email.message_from_file(fp)
                 if not m:
+                        if self.DEBUG:
+                                print "This is not a valid email message format"
                         return
 
@@ -792 +801 @@
                 self.get_sender_info(m)
 
-                if self.blacklisted_from():
-                        if self.DEBUG > 1 :
-                                print 'Message rejected : From: in blacklist'
-                        return False
+        
+                if not self.email_header_acl('white_list', self.email_addr, True):
+                        if self.DEBUG > 1 :
+                                print 'Message rejected : %s not in white list' %(self.email_addr)
+                        return False
+
+                if self.email_header_acl('black_list', self.email_addr, False):
+                        if self.DEBUG > 1 :
+                                print 'Message rejected : %s in black list' %(self.email_addr)
+                        return False
 
                 # If drop the message
@@ -960 +975 @@
 
                         if self.notify_template:
-                                tn.template_name = self.notify_template;
+                                if self.VERSION == 0.11:
+                                        from trac.web.chrome import Chrome
+                                        #if not new:
+                                        #       tn.template_name += ".update" 
+                                        tn.template = Chrome(tn.env).load_template(tn.template_name, method='text')
+                                                
+                                else:
+                                        tn.template_name = self.notify_template;
 
                         tn.notify(tkt, new, modtime)