Changeset 580

Timestamp:

12/06/11 16:40:53 (12 years ago)

Author:

bas

Message:

added Astarp firewall support:

X-Spam-Flag: YES
X-Spam-Result: Spam

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• email2trac.py.in (modified) (2 diffs)

trunk/ChangeLog

@@ -3 +3 @@
     -n/--dry-run flag, closes #235 
     Author: Thomas Moschny
+    Applied by: Bas van der Vlies
+  
+  * Added Astaro firewall spam handling. Check X-Spam-Flag and X-Spam-Result
+    message header flags. see:
+     * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644916
+    Author: W. Martin Borgert" <debacle at debian dot org>
     Applied by: Bas van der Vlies
 

trunk/debian/changelog

@@ +1 @@
+email2trac (2.4.6-1) stable; urgency=low
+
+  *  See Changelog
+
+ -- Bas van der Vlies <basv@sara.nl>  Tue, 06 Dec 2011 16:38:49 +0100
+
 email2trac (2.4.5-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -226 +226 @@
         # Note if Spam_level then '*' are included
         """
+        self.logger.debug('function spam')
+
         spam = False
         if message.has_key(self.parameters.spam_header):
@@ -239 +241 @@
                 spam = True
                 
-        # treat virus mails as spam
+        ## treat virus mails as spam
         #
         elif message.has_key('X-Virus-found'):          
             spam = True
 
-        # How to handle SPAM messages
+        ## Astaro firewall spam handling
+        #
+        elif message.get('X-Spam-Flag') == "YES" and message.get('X-Spam-Result') == "Spam":
+            spam = True
+
+        ## How to handle SPAM messages
         #
         if self.parameters.drop_spam and spam: