diff options
Diffstat (limited to 'scripts/dc-dlvr')
| -rwxr-xr-x | scripts/dc-dlvr | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr index ca64505c..81193b23 100755 --- a/scripts/dc-dlvr +++ b/scripts/dc-dlvr @@ -1,15 +1,10 @@ #!/bin/sh -# Copyright (C) 2008-2013, Eric Wong <e@80x24.org> -# License: GPLv3 or later <http://www.gnu.org/licenses/gpl-3.0.txt> +# Copyright (C) 2008-2016 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' @@ -23,19 +18,28 @@ 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) 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 @@ -43,9 +47,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=$? @@ -53,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 |