diff --git a/config/nftables/APKBUILD b/config/nftables/APKBUILD index 038d66f..5cf8e10 100644 --- a/config/nftables/APKBUILD +++ b/config/nftables/APKBUILD @@ -3,9 +3,9 @@ . ../APKBUILD-config.template -pkgver=2021.06.19.04 +pkgver=2021.06.20.04 pkgrel=0 -options="!check" # check requires root??????? +options="!check" # check requires root? subpackages=" $pkgname-base diff --git a/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/base b/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/base index 9683056..565f456 100644 --- a/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/base +++ b/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/base @@ -1,2 +1,2 @@ -ct state new iifname "eth0" limit rate over 1/second burst 50 packets add @blackhole4 { ip saddr } counter; -ct state new iifname "eth0" limit rate over 1/second burst 50 packets add @blackhole6 { ip6 saddr } counter; +ct state new iifname "eth0" meter global4 { ip saddr timeout 1m limit rate over 1/second burst 50 packets } add @blackhole4 { ip saddr } counter; +ct state new iifname "eth0" meter global6 { ip6 saddr timeout 1m limit rate over 1/second burst 50 packets } add @blackhole6 { ip6 saddr } counter; diff --git a/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/dovecot b/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/dovecot index 8ec686f..7ffd846 100644 --- a/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/dovecot +++ b/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/dovecot @@ -1,4 +1,2 @@ -tcp dport 143 ct state new limit rate over 4/minute burst 10 packets add @blackhole4 { ip saddr } counter; -tcp dport 143 ct state new limit rate over 4/minute burst 10 packets add @blackhole6 { ip6 saddr } counter; -tcp dport 993 ct state new limit rate over 4/minute burst 10 packets add @blackhole4 { ip saddr } counter; -tcp dport 993 ct state new limit rate over 4/minute burst 10 packets add @blackhole6 { ip6 saddr } counter; +tcp dport { 143, 993 } ct state new meter dovecot4 { ip saddr timeout 1m limit rate over 4/minute burst 10 packets } add @blackhole4 { ip saddr } counter; +tcp dport { 143, 993 } ct state new meter dovecot6 { ip6 saddr timeout 1m limit rate over 4/minute burst 10 packets } add @blackhole6 { ip6 saddr } counter; diff --git a/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/postfix b/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/postfix index d260c96..8ce46f2 100644 --- a/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/postfix +++ b/config/nftables/nft/inet/redxenfirewall/filter/input/stateful/postfix @@ -1,6 +1,2 @@ -tcp dport 25 ct state new limit rate over 4/minute burst 20 packets add @blackhole4 { ip saddr } counter; -tcp dport 25 ct state new limit rate over 4/minute burst 20 packets add @blackhole6 { ip6 saddr } counter; -tcp dport 465 ct state new limit rate over 4/minute burst 20 packets add @blackhole4 { ip saddr } counter; -tcp dport 465 ct state new limit rate over 4/minute burst 20 packets add @blackhole6 { ip6 saddr } counter; -tcp dport 587 ct state new limit rate over 4/minute burst 20 packets add @blackhole4 { ip saddr } counter; -tcp dport 587 ct state new limit rate over 4/minute burst 20 packets add @blackhole6 { ip6 saddr } counter; +tcp dport { 25, 465, 587 } ct state new meter postfix4 { ip saddr timeout 1m limit rate over 4/minute burst 20 packets } add @blackhole4 { ip saddr } counter; +tcp dport { 25, 465, 587 } ct state new meter postfix6 { ip6 saddr timeout 1m limit rate over 4/minute burst 20 packets } add @blackhole6 { ip6 saddr } counter;