From 4e4055b9569c1de9f8359ce4583f5adde1b1a2f7 Mon Sep 17 00:00:00 2001 From: KiekerJan Date: Fri, 10 Mar 2023 21:30:20 +0100 Subject: [PATCH] improve handling of unconfigured ipv6 --- conf/fail2ban/jails.conf | 2 +- setup/system.sh | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/conf/fail2ban/jails.conf b/conf/fail2ban/jails.conf index 80b79f57..006ebf1b 100644 --- a/conf/fail2ban/jails.conf +++ b/conf/fail2ban/jails.conf @@ -5,7 +5,7 @@ # Whitelist our own IP addresses. 127.0.0.1/8 is the default. But our status checks # ping services over the public interface so we should whitelist that address of # ours too. The string is substituted during installation. -ignoreip = 127.0.0.1/8 ::1/128 PUBLIC_IP PUBLIC_IPV6/64 ADMIN_HOME_IP ADMIN_HOME_IPV6 +ignoreip = 127.0.0.1/8 ::1/128 PUBLIC_IP PUBLIC_IPV6 ADMIN_HOME_IP ADMIN_HOME_IPV6 bantime = 15m findtime = 120m maxretry = 4 diff --git a/setup/system.sh b/setup/system.sh index acdd60da..d70a18c9 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -374,14 +374,21 @@ systemctl restart systemd-resolved rm -f /etc/fail2ban/jail.local # we used to use this file but don't anymore rm -f /etc/fail2ban/jail.d/defaults-debian.conf # removes default config so we can manage all of fail2ban rules in one config +# Take into account ipv6 might not be used +if [ ! -z "$PUBLIC_IPV6" ]; then + PUBLIC_IPV6_FB="${PUBLIC_IPV6}/64" +else + PUBLIC_IPV6_FB="" +fi + if [ ! -z "$ADMIN_HOME_IPV6" ]; then ADMIN_HOME_IPV6_FB="${ADMIN_HOME_IPV6}/64" else - ADMIN_HOME_IPV6_FB="" + ADMIN_HOME_IPV6_FB="" fi cat conf/fail2ban/jails.conf \ - | sed "s/PUBLIC_IPV6/$PUBLIC_IPV6/g" \ + | sed "s/PUBLIC_IPV6/$PUBLIC_IPV6_FB/g" \ | sed "s/PUBLIC_IP/$PUBLIC_IP/g" \ | sed "s/ADMIN_HOME_IPV6/$ADMIN_HOME_IPV6_FB/g" \ | sed "s/ADMIN_HOME_IP/$ADMIN_HOME_IP/g" \