nntp: use substr to check for trailing CRLF

[public-inbox.git] / scripts / dc-dlvr

diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index 96009662be123cab42701d5025b424d244991831..935a8312d8527970c2bb435fc7b5c6bda15bb46f 100755 (executable)
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -1,17 +1,13 @@
 #!/bin/sh
-# Copyright (C) 2008-2013, Eric Wong <e@80x24.org>
-# License: GPLv3 or later
+# Copyright (C) 2008-2021 all contributors <meta@public-inbox.org>
+# License: GPL-3.0+ <http://www.gnu.org/licenses/gpl-3.0.txt>
+# 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
-
-# my personal preference is to use a catchall account to avoid generating
-# backscatter, as invalid emails are usually spam
-case $USER in
-catchall) exec $DELIVER ;;
-esac
+CLAMDSCAN=clamdscan
 
 # change if your spamc/spamd listens elsewhere
-spamc='spamc -U /run/spamd.sock'
+spamc='spamc'
 
 # allow plus addressing to train spam filters, $1 is the $EXTENSION
 # which may be "trainspam" or "trainham".  Only allow spam training
@@ -22,26 +18,38 @@ 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
+       $DELIVER -m INBOX.spam <$CDMSG
+       exec rm -f $rm_list
+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)
-       if test xINBOX != x"$DEFAULT_INBOX"
-       then
-               $DELIVER -m $DEFAULT_INBOX < $TMPMSG
+       case $DEFAULT_INBOX in
+       '') exec rm -f $rm_list ;;
+       INBOX) ;; # do nothing
+       *)
+               $DELIVER -m $DEFAULT_INBOX <$TMPMSG
                exec rm -f $rm_list
-       fi
+               ;;
+       esac
        PREMSG=$(mktemp -t dc-dlvr.orig.$USER.XXXXXX || exit 1)
        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=$?
 
@@ -49,14 +57,14 @@ err=$?
 set -e
 
 case $err in
-1) $DELIVER -m INBOX.spam < $TMPMSG ;;
+1) $DELIVER -m INBOX.spam <$TMPMSG ;;
 *)
        # users may override normal delivery and have it go elsewhere
        if test -r ~/.dc-dlvr.rc
        then
                . ~/.dc-dlvr.rc
        else
-               $DELIVER -m INBOX < $TMPMSG
+               $DELIVER -m INBOX <$TMPMSG
        fi
        ;;
 esac