From: Tom Hughes <tom@compton.nu>
Date: Wed, 8 Mar 2023 08:59:26 +0000 (+0000)
Subject: Don't filter outgoing multicast packets
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/7c110b4ca4633db65e1ed117ce20fc150ea68b0e?hp=ebf6894fad08763e1dd79383934422ea919beb69

Don't filter outgoing multicast packets
---

diff --git a/cookbooks/networking/templates/default/nftables.conf.erb b/cookbooks/networking/templates/default/nftables.conf.erb
index f1773f384..05984ac3e 100644
--- a/cookbooks/networking/templates/default/nftables.conf.erb
+++ b/cookbooks/networking/templates/default/nftables.conf.erb
@@ -4,8 +4,10 @@
 define external-interfaces = { <%= @interfaces.sort.uniq.join(", ") %> }
 <%- end %>
 
-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 }
+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 }
+define ip-multicast-addresses = { 224.0.0.0/4 }
+define ip6-private-addresses = { 2001:db8::/32, fc00::/7 }
+define ip6-multicast-addresses = { ff00::/8 }
 
 table inet chef-filter {
   set ip-osm-addresses {
@@ -77,11 +79,11 @@ table inet chef-filter {
 
   chain incoming {
 <%- if node[:networking][:firewall][:allowlist].empty? %>
-    ip saddr { $ip-private-addresses } jump log-and-drop
+    ip saddr { $ip-private-addresses, $ip-multicast-addresses } jump log-and-drop
 <%- else %>
-    ip saddr { $ip-private-addresses } ip saddr != { <%= node[:networking][:firewall][:allowlist].sort.join(", ") %> } jump log-and-drop
+    ip saddr { $ip-private-addresses, $ip-multicast-addresses } ip saddr != { <%= node[:networking][:firewall][:allowlist].sort.join(", ") %> } jump log-and-drop
 <%- end %>
-    ip6 saddr { $ip6-private-addresses } jump log-and-drop
+    ip6 saddr { $ip6-private-addresses, $ip6-multicast-addresses } jump log-and-drop
 
     ip saddr @ip-blocklist jump log-and-drop
     ip6 saddr @ip6-blocklist jump log-and-drop