Merge pull request #5777 from freedomofpress/postfix_fix_for_focal

Postfix fix for focal
freedomofpress · Feb 10, 2021 · 9a0a31f · 9a0a31f
2 parents 5cd42af + a578e55
commit 9a0a31f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/install_files/ansible-base/roles/postfix/templates/main.cf b/install_files/ansible-base/roles/postfix/templates/main.cf
@@ -62,3 +62,7 @@ maximal_queue_lifetime = 14d
 # Used to remap outbound from address in emails
 smtp_generic_maps = hash:/etc/postfix/generic
 {% endif %}
+{% if ansible_distribution_release == 'focal' %}
+# Restriction for client RCPT TO command, details at http://www.postfix.org/postconf.5.html#smtpd_recipient_restrictions
+smtpd_recipient_restrictions = reject_unauth_destination
+{% endif %}
diff --git a/molecule/testinfra/mon/test_postfix.py b/molecule/testinfra/mon/test_postfix.py
@@ -37,6 +37,12 @@ def test_postfix_generic_maps(host):
     """
     assert not host.file("/etc/postfix/generic").exists
     assert not host.file("/etc/postfix/main.cf").contains("^smtp_generic_maps")
+    if host.system_info.codename == "focal":
+        assert host.file("/etc/postfix/main.cf").contains(
+                         "^smtpd_recipient_restrictions = reject_unauth_destination")
+    if host.system_info.codename == "xenial":
+        assert not host.file("/etc/postfix/main.cf").contains(
+                             "^smtpd_recipient_restrictions = reject_unauth_destination")
 
 
 def test_postfix_service(host):