X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scripts%2Fspamscan.in;h=987778a568eb2d364608b7e57271cb981897e1fe;hb=0bc96e09c4cd2a2d401e0cd8d959f24b535f6f64;hp=15a4c64273d37c1fc1ef6485b9ad525c4e85c040;hpb=fcb36fc8b302988a4a58b9844b2198380f75f36e;p=debbugs.git

diff --git a/scripts/spamscan.in b/scripts/spamscan.in
index 15a4c64..987778a 100755
--- a/scripts/spamscan.in
+++ b/scripts/spamscan.in
@@ -1,5 +1,5 @@
 #! /usr/bin/perl -T
-# $Id: spamscan.in,v 1.2 2004/01/13 19:01:13 cjwatson Exp $
+# $Id: spamscan.in,v 1.10 2005/07/22 21:37:31 don Exp $
 #
 # Usage: spamscan
 #
@@ -18,14 +18,27 @@ require "$config_path/config";
 require "$lib_path/errorlib";
 $ENV{PATH} = $lib_path . ':' . $ENV{PATH};
 
+exit unless $gSpamScan;
+
 chdir $gSpoolDir or die "chdir spool: $!\n";
 push @INC, $lib_path;
 
 use Mail::SpamAssassin;
-use Mail::SpamAssassin::NoMailAudit;
+
+use lib '/usr/lib/debbugs';
+use Mail::CrossAssassin;
 
 umask 002;
 
+eval {
+    &filelock('incoming-spamscan');
+};
+exit if $@;
+
+ca_init('\b\d{3,8}(?:-(?:close|done|forwarded|maintonly|submitter|quiet))?\@bugs\.debian\.org', '/org/bugs.debian.org/CrossAssassinDb');
+
+my %spamseen = ();
+
 my $user_prefs = "$ENV{HOME}/.spamassassin/user_prefs";
 my $user_prefs_time;
 if (-e $user_prefs) {
@@ -37,7 +50,8 @@ my $spam = Mail::SpamAssassin->new({
     site_rules_filename => $gSpamRulesDir,
     userprefs_filename => $user_prefs,
     local_tests_only => ($gSpamLocalTestsOnly || 0),
-    debug => ($ENV{DEBBUGS_SPAM_DEBUG} || 0),
+#    debug => ($ENV{DEBBUGS_SPAM_DEBUG} || 0),
+#    check_mx_delay => 2, # bit of a hack until we have parallelization
 });
 $spam->compile_now(1); # use all user preferences
 
@@ -56,10 +70,9 @@ sub header_or_empty ($$) {
     return '';
 }
 
-&filelock('incoming-spamscan');
 for (;;) {
     if (-f 'spamscan-stop') {
-	print STDERR "spamscan-stop file created\n";
+	print "spamscan-stop file created\n";
 	last;
     }
     if (-e $user_prefs) {
@@ -107,32 +120,70 @@ for (;;) {
     }
     push @textarray, <MESSAGE>;
     close MESSAGE;
-    my $mail = Mail::SpamAssassin::NoMailAudit->new(data => \@textarray);
-    $mail->{noexit} = 1;
+    my $mail = $spam->parse(\@textarray);
 
+    my $messageid = header_or_empty($mail, 'Message-Id');
     print "  From: ", header_or_empty($mail, 'From'), "\n";
     print "  Subject: ", header_or_empty($mail, 'Subject'), "\n";
-    print "  Message-Id: ", header_or_empty($mail, 'Message-Id'), "\n";
-    my $status = $spam->check($mail);
-    $status->rewrite_mail();
-
-    if ($status->is_spam()) {
-	$mail->accept($gSpamMailbox);
+    print "  Date: ", header_or_empty($mail, 'Date'), "\n";
+    print "  Message-Id: $messageid\n";
+    my $ca_score = ca_set(ca_keys($mail->get_body));
+    if (exists $spamseen{$messageid}) {
+	# XXX THIS DOES NOT DO LOCKING
+	open  OUT, ">> $gSpamMailbox" or die "open $gSpamMailbox failed: $!";
+	print OUT $mail->get_pristine or die "print $gSpamMailbox failed: $!";
+	close OUT or die "close $gSpamMailbox failed: $!";
 	unlink "incoming/R$id" or warn "unlink incoming/R$id: $!";
-	printf "  spam %.1f/%.1f\n",
-	       $status->get_hits(), $status->get_required_hits()
+	print "  spam $spamseen{$messageid} duplicate\n"
 	    or die "printf log: $!";
     } else {
-	open OUT, "> incoming/I$id" or die "open incoming/I$id: $!";
-	print OUT $mail->as_string() or die "print incoming/I$id: $!";
-	close OUT or die "close incoming/I$id: $!";
-	unlink "incoming/R$id" or warn "unlink incoming/R$id: $!";
-	printf "  ok %.1f/%.1f\n",
-	       $status->get_hits(), $status->get_required_hits()
-	    or die "printf log: $!";
-    }
+	my $status = $spam->check($mail);
+	my $munged_mail = $status->rewrite_mail();
+
+	if ($status->is_spam()) {
+	    # XXX THIS DOES NOT DO LOCKING
+	    open OUT, ">> $gSpamMailbox" or die "open $gSpamMailbox failed: $!";
+	    print OUT $munged_mail or die "print $gSpamMailbox failed: $!";
+	    close OUT  or die "close $gSpamMailbox failed: $!";
+	    unlink "incoming/R$id" or warn "unlink incoming/R$id: $!";
+	    my $score = sprintf "%.1f/%.1f %d",
+	        $status->get_score(), $status->get_required_score(), $ca_score;
+	    print "  spam $score\n" or die "print log: $!";
+	    $spamseen{$messageid} = $score;
+	} elsif ($status->get_score() > 0 && $ca_score >= 4) {
+	    # XXX THIS DOES NOT DO LOCKING
+	    open OUT, ">> $gCrossMailbox" or die "open $gCrossMailbox failed: $!";
+	    print OUT $munged_mail or die "print $gCrossMailbox failed: $!";
+	    close OUT  or die "close $gCrossMailbox failed: $!";
+	    unlink "incoming/R$id" or warn "unlink incoming/R$id: $!";
+	    my $score = sprintf "%.1f/%.1f %d",
+	        $status->get_score(), $status->get_required_score(), $ca_score;
+	    printf "  spam $score\n" or die "printf log: $!";
+	    $spamseen{$messageid} = $score;
+	} else {
+	    open OUT, "> incoming/I$id" or die "open incoming/I$id: $!";
+	    my ($received,$from,$rest_of_message) = split /\n/, $munged_mail, 3;
+	    my ($headers,$body) = split /\n\n/, $rest_of_message, 2;
+	    if ($received =~ /^From /) {
+		($received,$from) = ($from,$received);
+	    }
+	    print OUT map { "$_\n"} ($received,$from,$headers) or die "print incoming/I$id: $!";
+	    if ($ca_score > 1) {
+		print OUT "X-CrossAssassin-Score: $ca_score\n"
+		    or die "print incoming/I$id: $!";
+	    }
+	    print OUT "\n" or die "print incoming/I$id: $!";
+	    print OUT $body or die "print incoming/I$id: $!";
+	    close OUT or die "close incoming/I$id: $!";
+	    unlink "incoming/R$id" or warn "unlink incoming/R$id: $!";
+	    printf "  ok %.1f/%.1f %d\n",
+	    	$status->get_score(), $status->get_required_score(), $ca_score
+	        or die "printf log: $!";
+	}
 
-    $status->finish();
+	$status->finish();
+    }
+    $mail->finish;
 }
 &unfilelock;