]> git.openstreetmap.org Git - chef.git/commitdiff
Limit mail connections from smarthosts by address
authorTom Hughes <tom@compton.nu>
Sat, 4 Mar 2023 12:32:41 +0000 (12:32 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 4 Mar 2023 12:32:41 +0000 (12:32 +0000)
cookbooks/exim/recipes/default.rb

index 8c61b2da14393b005986008a169b72940e52de50..789c4e253a1802b82d68e5e504480a914472b91b 100644 (file)
@@ -240,10 +240,29 @@ if node[:exim][:smarthost_name]
     end
   end
 else
+  smarthosts_inet = []
+  smarthosts_inet6 = []
+
+  search(:node, "exim_smarthost_name:*?").each do |host|
+    smarthosts_inet |= host.ipaddresses(:role => :external, :family => :inet)
+    smarthosts_inet6 |= host.ipaddresses(:role => :external, :family => :inet6)
+  end
+
   node[:exim][:daemon_smtp_ports].each do |port|
     firewall_rule "accept-inbound-smtp-#{port}" do
       action :accept
-      source "bm:mail.openstreetmap.org"
+      family :inet
+      source "net:#{smarthosts_inet.sort.join(',')}"
+      dest "fw"
+      proto "tcp:syn"
+      dest_ports port
+      source_ports "1024:"
+    end
+
+    firewall_rule "accept-inbound-smtp-#{port}" do
+      action :accept
+      family :inet6
+      source "net:#{smarthosts_inet6.sort.join(',')}"
       dest "fw"
       proto "tcp:syn"
       dest_ports port