diff --git a/config/action.d/firewallcmd-ipset.conf b/config/action.d/firewallcmd-ipset.conf index 835df5a2..acb01466 100644 --- a/config/action.d/firewallcmd-ipset.conf +++ b/config/action.d/firewallcmd-ipset.conf @@ -21,8 +21,10 @@ before = firewallcmd-common.conf actionstart = ipset create hash:ip timeout firewall-cmd --direct --add-rule filter 0 -p -m multiport --dports -m set --match-set src -j +actionflush = ipset flush + actionstop = firewall-cmd --direct --remove-rule filter 0 -p -m multiport --dports -m set --match-set src -j - ipset flush + ipset destroy actionban = ipset add timeout -exist diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py index 65154f21..39601db9 100644 --- a/fail2ban/tests/servertestcase.py +++ b/fail2ban/tests/servertestcase.py @@ -1656,6 +1656,10 @@ class ServerConfigReaderTests(LogCaptureTestCase): "`ipset create f2b-j-w-fwcmd-ipset6 hash:ip timeout 600 family inet6`", "`firewall-cmd --direct --add-rule ipv6 filter INPUT_direct 0 -p tcp -m multiport --dports http -m set --match-set f2b-j-w-fwcmd-ipset6 src -j REJECT --reject-with icmp6-port-unreachable`", ), + 'flush': ( + "`ipset flush f2b-j-w-fwcmd-ipset`", + "`ipset flush f2b-j-w-fwcmd-ipset6`", + ), 'stop': ( "`firewall-cmd --direct --remove-rule ipv4 filter INPUT_direct 0 -p tcp -m multiport --dports http -m set --match-set f2b-j-w-fwcmd-ipset src -j REJECT --reject-with icmp-port-unreachable`", "`ipset flush f2b-j-w-fwcmd-ipset`",