external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-05 00:27:25 +00:00
Code Issues Releases Wiki Activity

Treat spamhous warning as a warning

Browse Source
This commit is contained in:
downtownallday 2020-07-05 18:41:47 -04:00
parent 3a80acceee
commit ebf9088c42
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/suites/_mail-functions.sh
View File

@ -99,9 +99,11 @@ detect_syslog_error() {
let count="$SYS_LOG_LINECOUNT + 1" let count="$SYS_LOG_LINECOUNT + 1"
tail --lines=+$count /var/log/syslog 2>>$TEST_OF | ( tail --lines=+$count /var/log/syslog 2>>$TEST_OF | (
let ec=0 # error count let ec=0 # error count
let wc=0 # warning count
while read line; do while read line; do
awk ' awk '
/status=(bounced|deferred|undeliverable)/ { exit 1 } /status=(bounced|deferred|undeliverable)/ { exit 1 }
/warning:/ && /spamhaus\.org: RBL lookup error:/ { exit 2 }
!/postfix\/qmgr/ && /warning:/ { exit 1 } !/postfix\/qmgr/ && /warning:/ { exit 1 }
/(fatal|reject|error):/ { exit 1 } /(fatal|reject|error):/ { exit 1 }
/Error in / { exit 1 } /Error in / { exit 1 }
@ -112,6 +114,9 @@ detect_syslog_error() {
if [ $? -eq 1 ]; then if [ $? -eq 1 ]; then
let ec+=1 let ec+=1
record "$F_DANGER[ERROR] $line$F_RESET" record "$F_DANGER[ERROR] $line$F_RESET"
elif [ $? -eq 2 ]; then
let wc+=1
record "$F_WARN[ WARN] $line$F_RESET"
else else
record "[ OK] $line" record "[ OK] $line"
fi fi