Spam filter update: "=spam".';german-news'

[PerlMail.git] / PerlMail / Config.pm

diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm
index 4179565..2c6c559 100644 (file)
--- a/PerlMail/Config.pm
+++ b/PerlMail/Config.pm
@@ -31,6 +31,7 @@ use vars qw(@ISA @EXPORT);
                $HOME
                $Mail @ValidUsers $IdleMax $MaxBodySMS @SMSwebRcpt $SMSwebRcpt_username
                $Lock_pathname $PeerAddr $Socket_timeout $DB_table $DBI_database $DBI_user $DBI_pwd
+               $clamscan_waitpid_timeout
                $sendmail_orig @addr_addon &FromAddress @h_rcpt @h_from
                %audit_profile @sms_squeezes @alternates_host @dnsbl_whitelist
 
@@ -43,7 +44,7 @@ require Mail::Alias;
 
 BEGIN {
        for (qw(headerhas store headeris did dnsbl store_muttrc_alternates Received_for parts_linear mime_type
-                       body_first mimehead spamassassin header_remap lmtp_deliver)) {
+                       body_first is_multipart mimehead mimebody spamassassin clamscan header_remap lmtp_deliver)) {
                eval 'sub '.$_.' { return ::'.$_.'(@_); }';
                }
        }
@@ -80,6 +81,7 @@ our $lmtp_pwd;
        }
 our $lmtp_user_from="lace";
 our $lmtp_user_to="lacemail";
+our $clamscan_waitpid_timeout=3;
 
 
 # perlmail-submit
@@ -300,22 +302,46 @@ sub audit
        # spam detection
        return if did sub {
                # Do not local $store_file as it is our-imported
-               $store_profile="silent";
-               local $_;
-               store "=spam".($_ eq 1 ? "" : ";$_")      if $_=spamassassin();
-               };
-       $store_profile=undef();
-       return if did sub {
-               # Do not local $store_file as it is our-imported
-               $store_profile="silent";
+               $store_profile="log";
                local $_;
-               store "=spam"                      .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1;     # all hosts
-               store "=spam"                      .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;   # all hosts
+               store "=spam".";virus=$_"            if $_=clamscan();
+               store "=spam".";spamassassin".($_ eq 1 ? "" : "=$_") if $_=spamassassin();
+               store "=spam".";$_"                  if $_=dnsbl '.relays.ordb.org.' ,1;        # all hosts
+               store "=spam".";$_"                  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"                      .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
+#              store "=spam".";$_"                  if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
                # I don't send viruses but viruses propagate mails of mine
-               store "=spam"                                   if headeris "X-Mailer",'ravmd/8.3.2';
-               store "=spam"                                   if $isFROM_MAILER && headeris("To",'<short@ucw.cz>');
+               store "=spam".";ravmd"               if headeris "X-Mailer",'ravmd/8.3.2';
+               store "=spam".';short@ucw.cz+MAILER' if $isFROM_MAILER && headeris("To",'<short@ucw.cz>');
+               if (!is_multipart()) {
+                       local $_=mimebody(body_first());
+                       my %sites=map(($_=>1),qw(
+                                       brandenburg.rz.fhtw-berlin.de
+                                       forum.gofeminin.de
+                                       service.spiegel.de
+                                       www.aufenthaltstitel.de
+                                       www.berlinonline.de
+                                       www.deutschlandchronik.de
+                                       www.heise.de
+                                       www.leverkusener-aufbruch.com
+                                       www.libasoli.de
+                                       www.mjoelnirsseite.de
+                                       www.npd-nrw.net
+                                       www.npd.de
+                                       www.rp-online.de
+                                       www.spiegel.de
+                                       www.taz.de
+                                       www.zdf.de
+                                       ));
+                       my $found;
+                       while (m{http://([^/]+)/}g) {
+                               do { $found=1; next; } if $sites{$1};
+                               $found=0;
+                               last;
+                               }
+                       $found=1 if /^\s*Lese selbst:\n/s;
+                       store "=spam".';german-news' if $found;
+                       }
                };
        $store_profile=undef();
 
@@ -399,7 +425,7 @@ sub audit
        store "=tacacs","silent"     if headeris "Sender"   ,'<tacplus-l@disaster.com>';
        store "=tacacs","silent"     if headeris "Sender"   ,'<owner-tacplus-l@disaster.com>';
        store "=tacacs","silent"     if headeris "List-Id"  ,'<devel.lists.tacplus.org>';
-       store "=pm","log"            if headeris "Sender"   ,'<owner-prague-pm@pm.org>';
+       store "=pm","log"            if headeris "List-Id"  ,'<prague-pm.pm.org>';
        store "=radary","log"        if headeris "Reply-To" ,'<pha@radary.cz>';
        store "=dnet","log"          if headeris "Sender"   ,'<@lists.distributed.net>';
        store "=linux-input","log"   if headeris "List-Post",'<linux-input@atrey.karlin.mff.cuni.cz>';
@@ -451,6 +477,11 @@ sub audit
        store "=fedann","bell"       if headeris "List-Id"  ,'<fedora-announce-list.redhat.com>';
        store "=fedtools","log"      if headeris "List-Id"  ,'<fedora-tools-list.redhat.com>';
        store "=bashbug","log"       if headeris "List-Id"  ,'<bug-bash.gnu.org>';
+       store "=zaurus","silent"     if headeris "List-Id"  ,'<openzaurus-users.lists.sourceforge.net>';
+       store "=zaurusann","log"     if headeris "List-Id"  ,'<openzaurus-announce.lists.sourceforge.net>';
+       store "=zaurusd","silent"    if headeris "List-Id"  ,'<openzaurus-devel.lists.sourceforge.net>';
+       store "=zaurussoft","silent" if headeris "List-Id"  ,'<openzaurus-software.lists.sourceforge.net>';
+       store "=iptperl","silent"    if headeris "List-Id"  ,'<iptperl-general.lists.sourceforge.net>';
        # own webs
        store "=energie","bell"      if headeris "From"     ,qr/^EnergieWeb/;
        store "=ats","log"           if headeris("From"     ,'<root@ms.atspraha.cz>')
@@ -460,6 +491,7 @@ sub audit
        store "=httpdd","log"        if headeris "list-post",'<dev@httpd.apache.org>';
        store "=mms2log","log"       if headeris "Return-Path",'<root@node0.mms2.org>';
        store "=hotelgatelog","log"  if headeris "Return-Path",'<root@hotelgate.hotelnet>';
+       store "=imja","log"          if headeris "List-Id"  ,'<im-ja-devel.lists.sourceforge.net>';
 
        # Petr Koutecky does not mark his Stuff
        store "=koutecky","log"      if headeris "Return-Path",'<velkyhroch@seznam.cz>';