Skip to content

O
OpnSense
Commit 20873dac authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

firewall: rework for signed bogons sets

parent 2e923c61
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 117 deletions
src/etc/rc.update_bogons
View file @ 20873dac
#!/bin/sh #!/bin/sh
# Global variables CORE_ABI=$(cat /usr/local/opnsense/version/opnsense.abi 2> /dev/null)
proc_error="" SYS_ABI=$(opnsense-verify -a 2> /dev/null)
URL="https://pkg.opnsense.org"
# Download and extract if necessary if [ -n "${CORE_ABI}" -a -n "${SYS_ABI}" ]; then
process_url() { # expand url to new mirror layout per release
local file=$1 URL="${URL}/${SYS_ABI}/${CORE_ABI}"
local url=$2 fi
local filename=${url##*/}
local ext=${filename#*.}
/usr/bin/fetch -a -T 30 -q -o $file "${url}"
if [ ! -f $file ]; then
echo "Could not download ${url}" | logger
proc_error="true"
fi
case "$ext" in
tar)
mv $file $file.tmp
/usr/bin/tar -xf $file.tmp -O > $file 2> /dev/null
;;
tar.gz)
mv $file $file.tmp
/usr/bin/tar -xzf $file.tmp -O > $file 2> /dev/null
;;
tgz)
mv $file $file.tmp
/usr/bin/tar -xzf $file.tmp -O > $file 2> /dev/null
;;
tar.bz2)
mv $file $file.tmp
/usr/bin/tar -xjf $file.tmp -O > $file 2> /dev/null
;;
*)
;;
esac
if [ -f $file.tmp ]; then URL="${URL}/sets/bogons.txz"
rm $file.tmp
fi
if [ ! -f $file ]; then proc_error=
echo "Could not extract ${filename}" | logger
proc_error="true"
fi
}
echo "rc.update_bogons is starting up." | logger echo "rc.update_bogons is starting up." | logger
# Sleep for some time, unless an argument is specified. # Sleep for some time, unless an argument is specified.
if [ "$1" = "" ]; then if [ -z "$1" ]; then
# Grab a random value # Grab a random value
value=`od -A n -d -N2 /dev/random | awk '{ print $1 }'` value=`od -A n -d -N2 /dev/random | awk '{ print $1 }'`
echo "rc.update_bogons is sleeping for $value" | logger echo "rc.update_bogons is sleeping for $value" | logger
...@@ -60,83 +25,65 @@ fi ...@@ -60,83 +25,65 @@ fi
echo "rc.update_bogons is beginning the update cycle." | logger echo "rc.update_bogons is beginning the update cycle." | logger
# Set default values if not overriden rm -rf /tmp/bogons
v4url=${v4url:-"https://pkg.opnsense.org/bogons/fullbogons-ipv4.txt"} mkdir -p /tmp/bogons
v6url=${v6url:-"https://pkg.opnsense.org/bogons/fullbogons-ipv6.txt"}
v4urlcksum=${v4urlcksum:-"${v4url}.md5"} fetch -a -T 30 -q -o /tmp/bogons/bogons.txz.sig "${URL}.sig"
v6urlcksum=${v6urlcksum:-"${v6url}.md5"} fetch -a -T 30 -q -o /tmp/bogons/bogons.txz "${URL}"
process_url /tmp/bogons "${v4url}" if [ ! -f /tmp/bogons/bogons.txz ]; then
process_url /tmp/bogonsv6 "${v6url}" echo "Could not download ${URL}" | logger
proc_error="true"
if [ "$proc_error" != "" ]; then elif ! opnsense-verify -q /tmp/bogons/bogons.txz; then
# Relaunch and sleep echo "Could not verify ${URL}" | logger
sh /usr/local/etc/rc.update_bogons & proc_error="true"
exit elif ! tar -C /tmp/bogons -xJf /tmp/bogons/bogons.txz; then
echo "Could not extract ${URL}" | logger
proc_error="true"
fi fi
BOGON_V4_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v4urlcksum}" | awk '{ print $4 }'` if [ -n "${proc_error}" ]; then
ON_DISK_V4_CKSUM=`md5 /tmp/bogons | awk '{ print $4 }'` # Relaunch and sleep
BOGON_V6_CKSUM=`/usr/bin/fetch -T 30 -q -o - "${v6urlcksum}" | awk '{ print $4 }'` sh /usr/local/etc/rc.update_bogons &
ON_DISK_V6_CKSUM=`md5 /tmp/bogonsv6 | awk '{ print $4 }'` exit
fi
if [ "$BOGON_V4_CKSUM" = "$ON_DISK_V4_CKSUM" ] || [ "$BOGON_V6_CKSUM" = "$ON_DISK_V6_CKSUM" ]; then
ENTRIES_MAX=`pfctl -s memory | awk '/table-entries/ { print $4 }'`
if [ "$BOGON_V4_CKSUM" = "$ON_DISK_V4_CKSUM" ]; then
ENTRIES_TOT=`pfctl -vvsTables | awk '/Addresses/ {s+=$2}; END {print s}'`
ENTRIES_V4=`pfctl -vvsTables | awk '/-\tbogons$/ {getline; print $2}'`
LINES_V4=`wc -l /tmp/bogons | awk '{ print $1 }'`
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT-${ENTRIES_V4:-0}+LINES_V4)) ]; then
# These bogons are removed as they are private. I'm not going
# to question this now, adding a big WARNING instead. Here be
# dragons...
egrep -v "^100.64.0.0/10|^192.168.0.0/16|^172.16.0.0/12|^10.0.0.0/8" /tmp/bogons > /usr/local/etc/bogons
RESULT=`/sbin/pfctl -t bogons -T replace -f /usr/local/etc/bogons 2>&1`
echo "$RESULT" | awk '{ print "Bogons V4 file downloaded: " $0 }' | logger
else
echo "Not updating IPv4 bogons (increase table-entries limit)" | logger
fi
rm /tmp/bogons
else
echo "Could not download ${v4url} (checksum mismatch)" | logger
checksum_error="true"
fi
if [ "$BOGON_V6_CKSUM" = "$ON_DISK_V6_CKSUM" ]; then
BOGONS_V6_TABLE_COUNT=`pfctl -sTables | grep ^bogonsv6$ | wc -l | awk '{ print $1 }'`
ENTRIES_TOT=`pfctl -vvsTables | awk '/Addresses/ {s+=$2}; END {print s}'`
LINES_V6=`wc -l /tmp/bogonsv6 | awk '{ print $1 }'`
if [ $BOGONS_V6_TABLE_COUNT -gt 0 ]; then
ENTRIES_V6=`pfctl -vvsTables | awk '/-\tbogonsv6$/ {getline; print $2}'`
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT-${ENTRIES_V6:-0}+LINES_V6)) ]; then
egrep -iv "^fc00::/7" /tmp/bogonsv6 > /usr/local/etc/bogonsv6
RESULT=`/sbin/pfctl -t bogonsv6 -T replace -f /usr/local/etc/bogonsv6 2>&1`
echo "$RESULT" | awk '{ print "Bogons V6 file downloaded: " $0 }' | logger
else
echo "Not saving or updating IPv6 bogons (increase table-entries limit)" | logger
fi
else
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT+LINES_V6)) ]; then
egrep -iv "^fc00::/7" /tmp/bogonsv6 > /usr/local/etc/bogonsv6
echo "Bogons V6 file downloaded but not updating IPv6 bogons table because IPv6 Allow is off" | logger
else
echo "Not saving IPv6 bogons table (IPv6 Allow is off and table-entries limit is potentially too low)" | logger
fi
fi
rm /tmp/bogonsv6
else
echo "Could not download ${v6url} (checksum mismatch)" | logger
checksum_error="true"
fi
ENTRIES_MAX=`pfctl -s memory | awk '/table-entries/ { print $4 }'`
ENTRIES_TOT=`pfctl -vvsTables | awk '/Addresses/ {s+=$2}; END {print s}'`
ENTRIES_V4=`pfctl -vvsTables | awk '/-\tbogons$/ {getline; print $2}'`
LINES_V4=`wc -l /tmp/bogons/fullbogons-ipv4.txt | awk '{ print $1 }'`
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT-${ENTRIES_V4:-0}+LINES_V4)) ]; then
# These bogons are removed as they are private. I'm not going
# to question this now, adding a big WARNING instead. Here be
# dragons...
egrep -v "^100.64.0.0/10|^192.168.0.0/16|^172.16.0.0/12|^10.0.0.0/8" /tmp/bogons/fullbogons-ipv4.txt > /usr/local/etc/bogons
RESULT=`/sbin/pfctl -t bogons -T replace -f /usr/local/etc/bogons 2>&1`
echo "$RESULT" | awk '{ print "Bogons V4 file downloaded: " $0 }' | logger
else
echo "Not updating IPv4 bogons (increase table-entries limit)" | logger
fi fi
if [ "$checksum_error" != "" ]; then ENTRIES_MAX=`pfctl -s memory | awk '/table-entries/ { print $4 }'`
# Relaunch and sleep ENTRIES_TOT=`pfctl -vvsTables | awk '/Addresses/ {s+=$2}; END {print s}'`
sh /usr/local/etc/rc.update_bogons & BOGONS_V6_TABLE_COUNT=`pfctl -sTables | grep ^bogonsv6$ | wc -l | awk '{ print $1 }'`
exit ENTRIES_TOT=`pfctl -vvsTables | awk '/Addresses/ {s+=$2}; END {print s}'`
LINES_V6=`wc -l /tmp/bogons/fullbogons-ipv6.txt | awk '{ print $1 }'`
if [ $BOGONS_V6_TABLE_COUNT -gt 0 ]; then
ENTRIES_V6=`pfctl -vvsTables | awk '/-\tbogonsv6$/ {getline; print $2}'`
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT-${ENTRIES_V6:-0}+LINES_V6)) ]; then
egrep -iv "^fc00::/7" /tmp/bogons/fullbogons-ipv6.txt > /usr/local/etc/bogonsv6
RESULT=`/sbin/pfctl -t bogonsv6 -T replace -f /usr/local/etc/bogonsv6 2>&1`
echo "$RESULT" | awk '{ print "Bogons V6 file downloaded: " $0 }' | logger
else
echo "Not saving or updating IPv6 bogons (increase table-entries limit)" | logger
fi
else
if [ $ENTRIES_MAX -gt $((2*ENTRIES_TOT+LINES_V6)) ]; then
egrep -iv "^fc00::/7" /tmp/bogons/fullbogons-ipv6.txt > /usr/local/etc/bogonsv6
echo "Bogons V6 file downloaded but not updating IPv6 bogons table because IPv6 Allow is off" | logger
else
echo "Not saving IPv6 bogons table (IPv6 Allow is off and table-entries limit is potentially too low)" | logger
fi
fi fi
echo "rc.update_bogons is ending the update cycle." | logger echo "rc.update_bogons is ending the update cycle." | logger
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023