Clamav filter needs to rewind body

[Nick Leverton]

The clamav filter needs to have a $transaction->body_resetpos call
before writing out its temporary file, in case it is not the first
plugin to read the message body.  I've attached a patch which does this
and which also reads the location of clamscan from the config file 
(e.g. clamav /usr/bin/clamscan).

Hope this helps someone :)

Nick


diff -urw --exclude=CVS qpsmtpd-0.26/plugins/clamav /var/qpsmtpd/plugins/clamav
--- qpsmtpd-0.26/plugins/clamav Wed Nov  6 10:54:41 2002
+++ /var/qpsmtpd/plugins/clamav Tue Oct  7 22:37:59 2003
@@ -4,8 +4,21 @@
 use File::Temp qw(tempfile);
  
 sub register {
-  my ($self, $qp) = @_;
+  my ($self, $qp, @args) = @_;
   $self->register_hook("data_post", "clam_scan");
+
+  if (@args > 0) {
+    # Untaint scanner location
+    if ($args[0] =~ /^(\/[\/\-\_\.a-z0-9A-Z]*)$/) {
+      $self->{_clamscan_loc} = $1;
+    } else {
+      $self->log(1, "FATAL ERROR: Unexpected characters in clamav argument 1");
+      exit 3;
+    }
+    $self->log(1, "WARNING: Ignoring additional arguments.") if (@args > 1);
+  } else {
+    $self->{_clamscan_loc} = "/usr/local/bin/clamscan";
+  }
 }
  
 sub clam_scan {
@@ -14,13 +27,14 @@
   my ($temp_fh, $filename) = tempfile();
   print $temp_fh $transaction->header->as_string;
   print $temp_fh "\n";
+  $transaction->body_resetpos;
   while (my $line = $transaction->body_getline) {
     print $temp_fh $line;
   }
   seek($temp_fh, 0, 0);
  
   # Now do the actual scanning!
-  my $cmd = "/usr/local/bin/clamscan --stdout -i --max-recursion=50 --disable-summary 
$filename 2>&1";
+  my $cmd = $self->{_clamscan_loc}." --stdout -i --max-recursion=50 --disable-summary 
$filename 2>&1";
   $self->log(1, "Running: $cmd");
   my $output = `$cmd`;
  

-- 
http://www.leverton.org/                      ... So express yourself ...