Ticket #77: email2trac.diff

email2trac.py

@@ -305 +305 @@
 
                 return False
 
+        def allowed_recipient(self):
+                """
+                This function wil check if the email address is configured to receive tickets.
+                """
+                try:
+                        toaddress_list = self.parameters['rcptaddress_list']
+                except KeyError, detail:
+                        if self.DEBUG > 2 :
+                                print 'rcptaddress_list not defined, all messages allowed.'
+                        return True
+
+                toaddress_list = string.split(toaddress_list)   
+                for entry in toaddress_list:    
+                        entry = entry.strip()
+                        TO_RE = re.compile(entry, re.VERBOSE|re.IGNORECASE)
+                        result =  TO_RE.search(self.to_email_addr)
+                        if result:
+                                return True
+
+                return False
+
         def email_to_unicode(self, message_str):
                 """
                 Email has 7 bit ASCII code, convert it to unicode with the charset
@@ -405 +426 @@
 
                 self.email_from = self.email_to_unicode(message['from'])
                 self.author, self.email_addr  = email.Utils.parseaddr(self.email_from)
+                """
+                Get the recipients name and email address
+                """
+                self.email_to = self.email_to_unicode(message['to'])
+                self.to_name, self.to_email_addr = email.Utils.parseaddr (self.email_to)
 
                 # Maybe for later user
                 #self.email_from =  self.email_to_unicode(self.email_addr)
@@ -794 +820 @@
                                 print 'Message rejected : From: in blacklist'
                         return False
 
+                if not self.allowed_recipient():
+                        if self.DEBUG > 1 :
+                                print 'Message rejected : To: not permitted'
+                        return False
+
                 # If drop the message
                 #
                 if self.spam(m) == 'drop':
@@ -1062 +1093 @@
 
                                 os.unlink(path)
                                 continue
+                        elif (filename == 'winmail.dat') or (filename == 'part0001.html'):
+                                #status = '%s\nFile %s not wanted.\n\n' \
+                                #       %(status, filename)
+
+                                os.unlink(path)
+                                continue
                         else:
                                 count = count + 1