From 8cd9d8750bddd9c234262cad932e83ff6d1938b5 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 13 Feb 2019 17:54:08 +0000 Subject: [PATCH] base/postfix: convert sender map to a regex so we can reject emails with two @'s in From. Signed-off-by: Kevin Fenzi --- roles/base/files/postfix/main.cf/main.cf.mailman | 2 +- roles/base/files/postfix/main.cf/main.cf.smtp-mm | 2 +- roles/base/tasks/postfix.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/base/files/postfix/main.cf/main.cf.mailman b/roles/base/files/postfix/main.cf/main.cf.mailman index c8f70d9f9a..2b718157d0 100644 --- a/roles/base/files/postfix/main.cf/main.cf.mailman +++ b/roles/base/files/postfix/main.cf/main.cf.mailman @@ -696,5 +696,5 @@ local_recipient_maps = hash:/var/lib/mailman3/data/postfix_lmtp relay_domains = hash:/var/lib/mailman3/data/postfix_domains smtpd_sender_restrictions = - check_sender_access hash:/etc/postfix/sender_access + check_sender_access regex:/etc/postfix/sender_access permit diff --git a/roles/base/files/postfix/main.cf/main.cf.smtp-mm b/roles/base/files/postfix/main.cf/main.cf.smtp-mm index 3130cd0799..a1c0655bae 100644 --- a/roles/base/files/postfix/main.cf/main.cf.smtp-mm +++ b/roles/base/files/postfix/main.cf/main.cf.smtp-mm @@ -739,4 +739,4 @@ smtp_tls_key_file = /etc/pki/tls/private/gateway.key smtp_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt # Deny email from some domains -smtpd_sender_restrictions = hash:/etc/postfix/sender_access +smtpd_sender_restrictions = regex:/etc/postfix/sender_access diff --git a/roles/base/tasks/postfix.yml b/roles/base/tasks/postfix.yml index 822842c4a7..5b4e522dd4 100644 --- a/roles/base/tasks/postfix.yml +++ b/roles/base/tasks/postfix.yml @@ -39,7 +39,7 @@ - base - name: Create sender_access hash - command: postmap hash:/etc/postfix/sender_access + command: postmap regexp:/etc/postfix/sender_access changed_when: false when: postfix_group == "smtp-mm" or postfix_group == "mailman" tags: