mirrors/maddy
1
0
Fork 0
mirror of https://github.com/foxcpp/maddy.git synced 2025-04-04 05:37:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

Implement check module for easier integration with rspamd

Browse source 
This replaces old rspamc-based integration script that is inefficient
and had many disadvantages.
This commit is contained in:
fox.cpp 2020-06-24 22:53:03 +03:00
parent 5c74299dc6
commit cd928e9efb
No known key found for this signature in database
GPG key ID: 5B991F6215D2FCC0
9 changed files with 421 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dist/apparmor/dev.foxcpp.maddy.rspamd-hook vendored
View file

@ -1,32 +0,0 @@
# AppArmor profile for maddy's rspamd-hook script.
# vim:syntax=apparmor:ts=2:sw=2:et
#include <tunables/global>
profile dev.foxcpp.maddy.rspamd-hook /usr{/local,}/lib/maddy/rspamd-hook {
#include <abstractions/base>
/usr/bin/rspamc-* Cx -> rspamc,
/usr/bin/cut rmix,
/usr/bin/grep rmix,
/usr{/local,}/lib/maddy/rspamd-hook r,
owner /dev/pts/* rw,
/dev/tty rw,
/bin/sh rmix,
profile rspamc {
#include <abstractions/base>
#include <abstractions/nameservice>
#include <abstractions/openssl>
/sys/kernel/mm/transparent_hugepage/enabled r,
/usr/bin/rspamc-* rmix,
#include if exists <local/dev.foxcpp.maddy.rspamd-hook.rspamc>
}
#include if exists <local/dev.foxcpp.maddy.rspamd-hook>
}

3
dist/install.sh vendored
View file

@ -22,6 +22,3 @@ install -Dm 0644 -t "$DESTDIR/$FAIL2BANDIR/jail.d/" fail2ban/jail.d/*
install -Dm 0644 -t "$DESTDIR/$FAIL2BANDIR/filter.d/" fail2ban/filter.d/*
install -Dm 0644 -t "$DESTDIR/$PREFIX/lib/systemd/system/" systemd/maddy.service systemd/maddy@.service
install -Dm 0644 -t "$DESTDIR/$CONFDIR/integration/" integration/rspamd.conf
install -Dm 0755 -t "$DESTDIR/$PREFIX/lib/maddy/" scripts/rspamd-hook

16
dist/integration/rspamd.conf vendored
View file

@ -1,16 +0,0 @@
# vim: ft=maddy-conf
#
# This configuration snippet provides integration with message rspamd filtering
# engine via the console utility called rspamc.
#
# To use it, put the following directive in the smtp endpoint configuration block:
# import integration/rspamd
#
check {
command rspamd-hook {source_ip} {source_host} {sender} {auth_user} {
code 1 reject
code 2 quarantine
code 3 reject 450 4.7.0 "Message rejected due to a local policy"
}
}

51
dist/scripts/rspamd-hook vendored
View file

@ -1,51 +0,0 @@
#!/bin/sh
if [ "$4" != "" ]; then
out=$(rspamc -i "$1" --helo "$2" -F "$3" -u "$4")
else
out=$(rspamc -i "$1" --helo "$2" -F "$3")
fi
action=$(echo "$out" | grep '^Action:' | cut -d " " -f 2-)
score=$(echo "$out" | grep '^Score:' | cut -d " " -f 2)
spam=$(echo "$out" | grep '^Spam:' | cut -d " " -f 2)
echo 'X-Spam-Score:' "$score"
case "$spam" in
"false")
echo 'X-Spam-Flag: NO'
;;
"true")
echo 'X-Spam-Flag: YES'
;;
esac
case "$action" in
"reject")
exit 1
;;
"rewrite subject")
exit 2
;;
"add header")
exit 2
;;
"quarantine")
exit 2
;;
"soft reject")
exit 3
;;
"no action")
exit 0
;;
"greylist")
# Default rspamd configuration uses 'greylist' action a lot, we ignore
# it explicitly since we have no support for greylisting (yet).
exit 0
;;
*)
exit 128
;;
esac