X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/400fc6d71c476dba84aa52c5bf694caa8c4346dd..5f3a5421476c68027c50b821916585ab01f0efa1:/cookbooks/networking/templates/default/nftables.conf.erb

diff --git a/cookbooks/networking/templates/default/nftables.conf.erb b/cookbooks/networking/templates/default/nftables.conf.erb
index 6a2d72b8e..7fc46cff2 100644
--- a/cookbooks/networking/templates/default/nftables.conf.erb
+++ b/cookbooks/networking/templates/default/nftables.conf.erb
@@ -1,21 +1,25 @@
 #!/usr/sbin/nft -f
 
+<%- unless @interfaces.empty? %>
 define external-interfaces = { <%= @interfaces.sort.uniq.join(", ") %> }
+<%- end %>
 
-define ip-private-addresses = { 10.0.0.0/8, 127.0.0.0/8, 169.254.0.0/16, 172.16.0.0/12, 192.0.2.0/24, 192.168.0.0/16 }
-define ip6-private-addresses = { 2001:db8::/32, fc00::/7 }
-
-flush table inet filter
+define ip-private-addresses = { 0.0.0.0, 10.0.0.0/8, 127.0.0.0/8, 169.254.0.0/16, 172.16.0.0/12, 192.0.2.0/24, 192.168.0.0/16, 224.0.0.0/4 }
+define ip6-private-addresses = { 2001:db8::/32, fc00::/7, ff00::/8 }
 
 table inet filter {
   set ip-osm-addresses {
     type ipv4_addr
+<%- unless Array(@hosts["inet"]).empty? %>
     elements = { <%= Array(@hosts["inet"]).sort.join(", ") %> }
+<%- end %>
   }
 
   set ip6-osm-addresses {
     type ipv6_addr
+<%- unless Array(@hosts["inet"]).empty? %>
     elements = { <%= Array(@hosts["inet6"]).sort.join(", ") %> }
+<%- end %>
   }
 
   set ip-blacklist {
@@ -28,6 +32,18 @@ table inet filter {
     flags dynamic
   }
 
+  set ratelimit-icmp-echo-ip {
+    type ipv4_addr
+    flags dynamic
+    timeout 120s
+  }
+
+  set ratelimit-icmp-echo-ip6 {
+    type ipv6_addr
+    flags dynamic
+    timeout 120s
+  }
+
 <%- node[:networking][:firewall][:sets].each do |set| %>
   set <%= set %> {
 <%- if set.end_with?("-ip") %>
@@ -36,6 +52,9 @@ table inet filter {
     type ipv6_addr
 <%- end %>
     flags dynamic
+<%- unless set.start_with?("connlimit-") %>
+    timeout 120s
+<%- end %>
   }
 
 <%- end %>
@@ -50,7 +69,11 @@ table inet filter {
   }
 
   chain incoming {
+<%- if node[:networking][:firewall][:whitelist].empty? %>
     ip saddr { $ip-private-addresses } jump log-and-drop
+<%- else %>
+    ip saddr { $ip-private-addresses } ip saddr != { <%= node[:networking][:firewall][:whitelist].sort.join(", ") %> } jump log-and-drop
+<%- end %>
     ip6 saddr { $ip6-private-addresses } jump log-and-drop
 
     ip saddr @ip-blacklist jump log-and-drop
@@ -59,13 +82,23 @@ table inet filter {
     ct state { established, related } accept
 
     icmp type { destination-unreachable } accept
-    icmpv6 type { nd-neighbor-solicit, nd-neighbor-advert, nd-router-solicit, nd-router-advert } accept
+    icmp type { echo-request } update @ratelimit-icmp-echo-ip { ip saddr limit rate 1/second } accept
+    icmp type { echo-request } drop
 
-    icmp type { echo-request } limit rate 1/second accept
-    icmpv6 type { echo-request } limit rate 1/second accept
+    icmpv6 type { nd-neighbor-solicit, nd-neighbor-advert, nd-router-solicit, nd-router-advert } accept
+    icmpv6 type { echo-request } update @ratelimit-icmp-echo-ip6 { ip6 saddr limit rate 1/second } accept
+    icmpv6 type { echo-request } drop
 
     meta l4proto { icmp, icmpv6 } jump log-and-drop
 
+    tcp flags & (fin|syn|rst|psh|ack|urg) == fin|psh|urg jump log-and-drop
+    tcp flags & (fin|syn|rst|psh|ack|urg) == 0x0 jump log-and-drop
+    tcp flags & (syn|rst) == syn|rst jump log-and-drop
+    tcp flags & (fin|rst) == fin|rst jump log-and-drop
+    tcp flags & (fin|syn) == fin|syn jump log-and-drop
+    tcp flags & (fin|psh|ack) == fin|psh jump log-and-drop
+    tcp sport 0 tcp flags & (fin|syn|rst|ack) == syn jump log-and-drop
+
 <%- node[:networking][:firewall][:incoming].uniq.each do |rule| %>
     <%= rule %>
 <%- end %>
@@ -74,7 +107,11 @@ table inet filter {
   }
 
   chain outgoing {
+<%- if node[:networking][:firewall][:whitelist].empty? %>
     ip daddr { $ip-private-addresses } jump log-and-drop
+<%- else %>
+    ip daddr { $ip-private-addresses } ip daddr != { <%= node[:networking][:firewall][:whitelist].sort.join(", ") %> } jump log-and-drop
+<%- end %>
     ip6 daddr { $ip6-private-addresses } jump log-and-drop
 
 <%- node[:networking][:firewall][:outgoing].each do |rule| %>
@@ -87,7 +124,9 @@ table inet filter {
   chain input {
     type filter hook input priority filter;
 
-    iif { $external-interfaces } jump incoming
+<%- unless @interfaces.empty? %>
+    iifname { $external-interfaces } jump incoming
+<%- end %>
 
     accept
   }
@@ -95,8 +134,10 @@ table inet filter {
   chain forward {
     type filter hook forward priority filter;
 
-    iif { $external-interfaces } jump incoming
-    oif { $external-interfaces } jump outgoing
+<%- unless @interfaces.empty? %>
+    iifname { $external-interfaces } jump incoming
+    oifname { $external-interfaces } jump outgoing
+<%- end %>
 
     accept
   }
@@ -104,7 +145,9 @@ table inet filter {
   chain output {
     type filter hook output priority filter;
 
-    oif { $external-interfaces } jump outgoing
+<%- unless @interfaces.empty? %>
+    oifname { $external-interfaces } jump outgoing
+<%- end %>
 
     accept
   }
@@ -115,9 +158,9 @@ table ip nat {
   chain postrouting {
     type nat hook postrouting priority srcnat;
 
-<%- node.interfaces(:role => :external).each do |external| %>
-<%- node.interfaces(:role => :internal).each do |internal| %>
-    oif { < %= external[:interface] %> } ip saddr { <%= internal[:network] %>/<%= internal[:prefix] %> } snat <%= external[:address] %>
+<%- node.interfaces(:role => :external, :family => :inet).each do |external| %>
+<%- node.interfaces(:role => :internal, :family => :inet).each do |internal| %>
+    oifname { <%= external[:interface] %> } ip saddr { <%= internal[:network] %>/<%= internal[:prefix] %> } snat <%= external[:address] %>
 <%- end %>
 <%- end %>
   }