Browse Source

remove some headers from archived mail and ensure no attempt to forward mail to a mailbot reply (empty FROM)

Pi 1 year ago
parent
commit
db5d4378a9
2 changed files with 15 additions and 1 deletions
  1. 9 1
      cropswap-sendmail.sh
  2. 6 0
      maildroprc

+ 9 - 1
cropswap-sendmail.sh

@@ -79,9 +79,17 @@ for email in "${!SUBSCRIBED[@]}"; do
 done
 if [ "${MAILGROUP}" == "cropswap-members@shandan.one" ]
 then
-	"$SENDMAIL" -F "${FROM}" -f "${MAILGROUP}" "${CROPSWAPARCHIVE}" < mail
+	reformail \
+		-I "List-Id:" \
+		-I "List-Unsubscribe:" \
+		-I "List-Subscribe:" \
+		-I "List-Post:" \
+		-I "List-Unsubscribe-Post:" \
+	< mail | "$SENDMAIL" -F "${FROM}" -f "${MAILGROUP}" "${CROPSWAPARCHIVE}"
 fi
 if ! $DELIVERED; then
 	"$DEBUGMAIL" undelivered
 	exit "$UNHANDLED"
+else
+	exit 0
 fi

+ 6 - 0
maildroprc

@@ -36,6 +36,12 @@ ORGANIZERGROUP="cropswap@shandan.one"
 # From subscribed member -> other subscribed members
 MEMBERGROUP="cropswap-members@shandan.one"
 
+if ($FROM eq "")
+{
+   EXITCODE=$UNHANDLED
+   exit
+}
+
 foreach /^(To|Cc):.*/
 {
    ADDR=getaddr($MATCH)