Fixed 'dnsbl_whitelist'

[PerlMail.git] / My-Audit.pm

diff --git a/My-Audit.pm b/My-Audit.pm
index 81af794..fbcb4d9 100644 (file)
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -24,6 +24,11 @@ sub audit_init
                        "atrey.karlin.mff.cuni.cz",     # short@atrey.karlin.mff.cuni.cz
                        "k332.feld.cvut.cz",    # short@k332.feld.cvut.cz
                        );
+       @dnsbl_whitelist=(
+                       "195.250.128.83",       # smtp3.vol.cz; vol.cz.multistage.blackholes.five-ten-sg.com.
+                       "64.49.222.22",         # mail.pm.org: rackspace.com.spam-support.blackholes.five-ten-sg.com.
+                       "208.147.243.5",        # gambit.liquidcomm.net: cw.net.spam-support.blackholes.five-ten-sg.com.
+                       );
 }
 
 sub audit
@@ -49,6 +54,9 @@ sub audit
                store "=spamo"        if headeris "From",'<newsletter@levnapc.cz>';
                store "=spamo"        if headeris "From",'<Tomas@dtpstudio.cz>';
                store "=spamo"        if headeris "From",'<BNcom@email.bn.com>';
+               store "=spamo"        if headeris "From",'<e4luck@lists.opt4email.com>';
+               store "=spamo"        if headeris "From",'<mailcontests@lists.servitall.com>';
+               store "=spamo"        if headeris "From",'<canda@lica.cz>';
                {
                        # weak detection: files with text/html w/o text/plain are usually a spam
                        my @types_linear=map({ mime_type($_); } parts_linear());
@@ -61,11 +69,15 @@ sub audit
        return if did sub {
                local $store_profile="silent";
                local $_;
+               store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
+               };
+       return if did sub {
+               local $store_profile="silent";
+               local $_;
                store "=spam-orbs"                 .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1;     # all hosts
                store "=spam-abuse"                .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;   # all hosts
                # we don't check all hosts as they can be "dialup" category, FIXME: check for it
                store "=spam-five"                 .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
-               store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
                # I don't send viruses but viruses propagate mails of mine
                store "=spam-av"                                if headeris "X-Mailer",'ravmd/8.3.2';
                };
@@ -74,14 +86,16 @@ sub audit
        store "=err","bell" and return if headerhas \&Received_for,'<short+err@>';
 
        # ppl-wished foreign remapping, Reply-To is left untouched!
+       # FIXME: modifications are now being dropped by &write_message!
        header_remap("From",{
-                       'kerere@post.cz'            =>'kamzik@k332.feld.cvut.cz',
-                       'profes@mbox.vol.cz'        =>'kratochvilova@egp.cz',
-                       'jkrouzek@mbox.vol.cz'      =>'krouzek@mbox.fsv.cuni.cz',
-                       'jakub.gorner@lidovky.cz'   =>'tonda@disnet.cz',
-                       'jan.kolar@videoprogress.cz'=>'jenda.kolar@volny.cz',
-                       'daniel.rulicek@cponline.cz'=>'daniel.rulicek@cpress.cz',
-                       'pavel@suse.cz'             =>'pavel@ucw.cz',
+                       'kerere@post.cz'               =>'kamzik@k332.feld.cvut.cz',
+                       'profes@mbox.vol.cz'           =>'kratochvilova@egp.cz',
+                       'jkrouzek@mbox.vol.cz'         =>'krouzek@mbox.fsv.cuni.cz',
+                       'jakub.gorner@lidovky.cz'      =>'tonda@disnet.cz',
+                       'jan.kolar@videoprogress.cz'   =>'jenda.kolar@volny.cz',
+                       'daniel.rulicek@cponline.cz'   =>'daniel.rulicek@cpress.cz',
+                       'pavel@suse.cz'                =>'pavel@ucw.cz',
+
                        });
 
        # My obsolete e-mail addresses
@@ -111,12 +125,13 @@ sub audit
 
        # lists
        store "=mozillabug","log"    if headeris "From"     ,'<bugzilla-daemon@mozilla.org>';
-       store "=9kc","bell"          if headeris "List-Post",'<n9k@pandora.cz>';
-       store "=9kcd","bell"         if headeris "List-Post",'<dev9k@pandora.cz>';
+       store "=9kc","log"           if headeris "List-Post",'<n9k@pandora.cz>';
+       store "=9kcd","log"          if headeris "List-Post",'<dev9k@pandora.cz>';
        store "=9ku","log"           if headeris "List-Id"  ,'<9000.listman.net>';
        store "=9kd","log"           if headeris "Sender"   ,'<owner-9000-developers@geekstuff.co.uk>';
        store "=spong","log"         if headeris "List-Id"  ,'<spong-users.lists.sourceforge.net>';
-       store "=gtkd","log"          if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
+       store "=gtkd","silent"       if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
+       store "=gnomevfs","log"      if headeris "List-Id"  ,'<gnome-vfs-list.gnome.org>';
        store "=mffstatnice","bell"  if headeris "List-Post",'<statnice@atrey.karlin.mff.cuni.cz>';
        store "=hw","log"            if headeris "List-Post",'<hw-news@list.gin.cz>';
        store "=gnokii","log"        if headeris "List-Id"  ,'<gnokii-users.mail.freesoftware.fsf.org>';
@@ -153,6 +168,9 @@ sub audit
        store "=libtoolpat","log"    if headeris "List-Id"  ,'<libtool-patches.gnu.org>';
        # own webs
        store "=energie","bell"      if headeris "From"     ,qr/^EnergieWeb/;
+       store "=ats","log"           if headeris("From"     ,'<root@ms.atspraha.cz>')
+                                       || (headeris("From",'<online@ringier.cz>') && headerhas("To",'<blesk@atspraha.cz>'));
+       store "=atscasablanca","log" if headeris "From"     ,'<casablanca@ms.atspraha.cz>';
 
        # Petr Koutecky does not mark his Stuff
        store "=koutecky","log"      if headeris "From"     ,'<velkyhroch@seznam.cz>';