From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <e@80x24.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net
X-Spam-Level: 
X-Spam-ASN:  
X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00
	shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0
Received: from localhost (dcvr.yhbt.net [127.0.0.1])
	by dcvr.yhbt.net (Postfix) with ESMTP id 1A7B12018B
	for <meta@public-inbox.org>; Fri, 17 Jun 2016 00:44:23 +0000 (UTC)
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] scripts/dc-dlvr: ClamAV support via clamdscan
Date: Fri, 17 Jun 2016 00:44:18 +0000
Message-Id: <20160617004418.2182-4-e@80x24.org>
In-Reply-To: <20160617004418.2182-1-e@80x24.org>
References: <20160617004418.2182-1-e@80x24.org>
List-Id: <meta@public-inbox.org>

SpamAssassin often misses messages which contain viruses,
so ClamAV should fill that gap nicely.
---
 scripts/dc-dlvr | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index 2f82ff2..5ebca3f 100755
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -4,6 +4,7 @@
 # This is installed as /etc/dc-dcvr on my system
 # to use with postfix main.cf: mailbox_command = /etc/dc-dlvr "$EXTENSION"
 DELIVER=/usr/lib/dovecot/deliver
+CLAMDSCAN=clamdscan
 
 # change if your spamc/spamd listens elsewhere
 spamc='spamc'
@@ -17,19 +18,27 @@ trainham,) exec $spamc -L ham > /dev/null 2>&1 ;;
 esac
 
 TMPMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1)
-rm_list=$TMPMSG
+CDMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1)
+rm_list="$TMPMSG $CDMSG"
+
+cat >$CDMSG
+$CLAMDSCAN --quiet - <$CDMSG
+if test $? -eq 1
+then
+	exec $DELIVER -m INBOX.spam <$CDMSG
+fi
 
 # pre-filter, for infrequently read lists which do their own spam filtering:
 if test -r ~/.dc-dlvr.pre
 then
 	set -e
-	cat > $TMPMSG
+	mv -f $CDMSG $TMPMSG
 	DEFAULT_INBOX=$(. ~/.dc-dlvr.pre)
 	case $DEFAULT_INBOX in
 	'') exec rm -f $rm_list ;;
 	INBOX) ;; # do nothing
 	*)
-		$DELIVER -m $DEFAULT_INBOX < $TMPMSG
+		$DELIVER -m $DEFAULT_INBOX <$TMPMSG
 		exec rm -f $rm_list
 		;;
 	esac
@@ -37,9 +46,9 @@ then
 	rm_list="$rm_list $PREMSG"
 	set +e
 	mv -f $TMPMSG $PREMSG
-	$spamc -E --headers < $PREMSG > $TMPMSG
+	$spamc -E --headers <$PREMSG >$TMPMSG
 else
-	$spamc -E --headers > $TMPMSG
+	$spamc -E --headers <$CDMSG >$TMPMSG
 fi
 err=$?