X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=scripts%2Fdc-dlvr;h=90aab73b45c716eaaf1e15faa1eff5cb1af2a0f2;hb=29c5f2a6fc3b86306a5dbeadfae061d06f2bc6dd;hp=e0f3210808e14b7cc97887924149484be06b6559;hpb=1cbd948ee0f81b889ba1c38a254b49a9364d1904;p=public-inbox.git
diff --git a/scripts/dc-dlvr b/scripts/dc-dlvr
index e0f32108..90aab73b 100755
--- a/scripts/dc-dlvr
+++ b/scripts/dc-dlvr
@@ -1,15 +1,10 @@
#!/bin/sh
-# Copyright (C) 2008-2016 all contributors
+# Copyright (C) 2008-2020 all contributors
# License: GPL-3.0+
# 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