mirror of
https://github.com/opnsense/src.git
synced 2026-04-21 22:27:47 -04:00
30f7128157
The blacklistd daemon expects to see a message on stdout, instead of just relying on the exit value from any invoked programs. Change the pf filtering to create multiple filters, attached under a the "blacklist/*" anchor point. This prevents the filtering for each port's filtering rule from overwriting the previously installed filtering rule. Check for an existing filtering rule for each port, so the installation of a given filtering rule only happens once. Reinstalling the same rule resets the counters for the pf rule, and we don't want that. Reported by: David Horn (dhorn2000 at gmail.com) Reviewed by: emaste MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D8081
126 lines
2.4 KiB
Bash
126 lines
2.4 KiB
Bash
#!/bin/sh
|
|
#echo "run $@" 1>&2
|
|
#set -x
|
|
# $1 command
|
|
# $2 rulename
|
|
# $3 protocol
|
|
# $4 address
|
|
# $5 mask
|
|
# $6 port
|
|
# $7 id
|
|
|
|
pf=
|
|
if [ -f "/etc/ipfw-blacklist.rc" ]; then
|
|
pf="ipfw"
|
|
. /etc/ipfw-blacklist.rc
|
|
ipfw_offset=${ipfw_offset:-2000}
|
|
fi
|
|
|
|
if [ -z "$pf" ]; then
|
|
for f in npf pf ipf; do
|
|
if [ -f "/etc/$f.conf" ]; then
|
|
pf="$f"
|
|
break
|
|
fi
|
|
done
|
|
fi
|
|
|
|
if [ -z "$pf" ]; then
|
|
echo "$0: Unsupported packet filter" 1>&2
|
|
exit 1
|
|
fi
|
|
|
|
if [ -n "$3" ]; then
|
|
proto="proto $3"
|
|
fi
|
|
|
|
if [ -n "$6" ]; then
|
|
port="port $6"
|
|
fi
|
|
|
|
addr="$4"
|
|
mask="$5"
|
|
case "$4" in
|
|
::ffff:*.*.*.*)
|
|
if [ "$5" = 128 ]; then
|
|
mask=32
|
|
addr=${4#::ffff:}
|
|
fi;;
|
|
esac
|
|
|
|
case "$1" in
|
|
add)
|
|
case "$pf" in
|
|
ipf)
|
|
/sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1
|
|
echo block in quick $proto from $addr/$mask to \
|
|
any port=$6 head port$6 | \
|
|
/sbin/ipf -I -f - -s >/dev/null 2>&1 && echo OK
|
|
;;
|
|
ipfw)
|
|
# use $ipfw_offset+$port for rule number
|
|
rule=$(($ipfw_offset + $6))
|
|
tname="port$6"
|
|
/sbin/ipfw table $tname create type addr 2>/dev/null
|
|
/sbin/ipfw -q table $tname add "$addr/$mask"
|
|
/sbin/ipfw -q add $rule drop $3 from "table("$tname")" to \
|
|
any dst-port $6 && echo OK
|
|
;;
|
|
npf)
|
|
/sbin/npfctl rule "$2" add block in final $proto from \
|
|
"$addr/$mask" to any $port
|
|
;;
|
|
pf)
|
|
# if the filtering rule does not exist, create it
|
|
/sbin/pfctl -a "$2/$6" -sr 2>/dev/null | \
|
|
grep -q "<port$6>" || \
|
|
echo "block in quick $proto from <port$6> to any $port" | \
|
|
/sbin/pfctl -a "$2/$6" -f -
|
|
# insert $ip/$mask into per-protocol/port anchored table
|
|
/sbin/pfctl -a "$2/$6" -t "port$6" -T add "$addr/$mask" && \
|
|
echo OK
|
|
;;
|
|
esac
|
|
;;
|
|
rem)
|
|
case "$pf" in
|
|
ipf)
|
|
/sbin/ipfstat -io | /sbin/ipf -I -f - >/dev/null 2>&1
|
|
echo block in quick $proto from $addr/$mask to \
|
|
any port=$6 head port$6 | \
|
|
/sbin/ipf -I -r -f - -s >/dev/null 2>&1 && echo OK
|
|
;;
|
|
ipfw)
|
|
/sbin/ipfw table "port$6" delete "$addr/$mask" 2>/dev/null && \
|
|
echo OK
|
|
;;
|
|
npf)
|
|
/sbin/npfctl rule "$2" rem-id "$7"
|
|
;;
|
|
pf)
|
|
/sbin/pfctl -a "$2/$6" -t "port$6" -T delete "$addr/$mask" && \
|
|
echo OK
|
|
;;
|
|
esac
|
|
;;
|
|
flush)
|
|
case "$pf" in
|
|
ipf)
|
|
/sbin/ipf -Z -I -Fi -s > /dev/null && echo OK
|
|
;;
|
|
ipfw)
|
|
/sbin/ipfw table "port$6" flush 2>/dev/null && echo OK
|
|
;;
|
|
npf)
|
|
/sbin/npfctl rule "$2" flush
|
|
;;
|
|
pf)
|
|
/sbin/pfctl -a "$2/$6" -t "port$6" -T flush && echo OK
|
|
;;
|
|
esac
|
|
;;
|
|
*)
|
|
echo "$0: Unknown command '$1'" 1>&2
|
|
exit 1
|
|
;;
|
|
esac
|