From d5ed0c0368006729cb12577dc8d3adf0492b24ee Mon Sep 17 00:00:00 2001 From: Dmitriy Alekseev Date: Thu, 21 May 2020 21:04:03 +0300 Subject: [PATCH] Update anonymize_headers.pcre (#3563) Added anonymization for Sieve and changed regex for Rspamd to look same as new Sieve regex --- data/conf/postfix/anonymize_headers.pcre | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/data/conf/postfix/anonymize_headers.pcre b/data/conf/postfix/anonymize_headers.pcre index 2d1fe704..739237be 100644 --- a/data/conf/postfix/anonymize_headers.pcre +++ b/data/conf/postfix/anonymize_headers.pcre @@ -3,9 +3,13 @@ if /^\s*Received:.*Authenticated sender.*\(Postcow\)/ /^Received: from .*? \([\w-.]* \[.*?\]\)(.*|\n.*)\(Authenticated sender: (.+)\)\s+by.+\(Postcow\) with (.*)/ REPLACE Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with $3 endif -if /^\s*Received: from rspamd \(.*mailcow-network.*\).*\(Postcow\)/ -/^Received: from rspamd (.*|\n.*)\((.+) (.+)\)\s+by (.+\(Postcow\)) with (.*)/ - REPLACE Received: from rspamd (RSPAMD_HOST $3) by $4 with $5 +if /^\s*Received: from.* \(.*dovecot-mailcow.*mailcow-network.*\).*\(Postcow\)/ +/^Received: from.* (.*|\n.*)\((.+) (.+)\)\s+by (.+) \(Postcow\) with (.*)/ + REPLACE Received: from sieve (sieve $3) by $4 (Postcow) with $5 +endif +if /^\s*Received: from.* \(.*rspamd-mailcow.*mailcow-network.*\).*\(Postcow\)/ +/^Received: from.* (.*|\n.*)\((.+) (.+)\)\s+by (.+) \(Postcow\) with (.*)/ + REPLACE Received: from rspamd (rspamd $3) by $4 (Postcow) with $5 endif /^\s*X-Enigmail/ IGNORE /^\s*X-Mailer/ IGNORE