Changeset 580


Ignore:
Timestamp:
12/06/11 16:40:53 (11 years ago)
Author:
bas
Message:

added Astarp firewall support:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r579 r580  
    33    -n/--dry-run flag, closes #235
    44    Author: Thomas Moschny
     5    Applied by: Bas van der Vlies
     6 
     7  * Added Astaro firewall spam handling. Check X-Spam-Flag and X-Spam-Result
     8    message header flags. see:
     9     * http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=644916
     10    Author: W. Martin Borgert" <debacle at debian dot org>
    511    Applied by: Bas van der Vlies
    612
  • trunk/debian/changelog

    r576 r580  
     1email2trac (2.4.6-1) stable; urgency=low
     2
     3  *  See Changelog
     4
     5 -- Bas van der Vlies <basv@sara.nl>  Tue, 06 Dec 2011 16:38:49 +0100
     6
    17email2trac (2.4.5-1) stable; urgency=low
    28
  • trunk/email2trac.py.in

    r578 r580  
    226226        # Note if Spam_level then '*' are included
    227227        """
     228        self.logger.debug('function spam')
     229
    228230        spam = False
    229231        if message.has_key(self.parameters.spam_header):
     
    239241                spam = True
    240242               
    241         # treat virus mails as spam
     243        ## treat virus mails as spam
    242244        #
    243245        elif message.has_key('X-Virus-found'):         
    244246            spam = True
    245247
    246         # How to handle SPAM messages
     248        ## Astaro firewall spam handling
     249        #
     250        elif message.get('X-Spam-Flag') == "YES" and message.get('X-Spam-Result') == "Spam":
     251            spam = True
     252
     253        ## How to handle SPAM messages
    247254        #
    248255        if self.parameters.drop_spam and spam:
Note: See TracChangeset for help on using the changeset viewer.