From db74adc313ccbb4d116da7b8de7850a21f613dd9 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 1 Aug 2021 08:18:36 -0400 Subject: [PATCH] Support respectful logging. In postfix-3.6, setting respectful_logging=yes changes "whitelist" and "blacklist" to "allowlist" and "denylist". We add support for the new log entries that can be generated as a result. --- postfix-logwatch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/postfix-logwatch b/postfix-logwatch index 1b89ad6..be28795 100644 --- a/postfix-logwatch +++ b/postfix-logwatch @@ -1278,8 +1278,8 @@ sub print_unmatched_report() { 1978 SpamAssassin bypassed 18 Released from quarantine - 1982 Whitelisted - 3 Blacklisted + 1982 Allowlisted + 3 Denylisted 12 MIME error 51 Bad header (debug supplemental) 28 Extra code modules loaded at runtime @@ -4370,7 +4370,12 @@ sub postfix_postscreen { ($line =~ /^(HANGUP) (?:after \S+)? from \[([^]]+)\](?::\d+)?/)) { $Counts{'postscreen'}{lc $1}{$2}{$END_KEY}++ if $Collecting{'postscreen'}; } - elsif ($line =~ /^(WHITELISTED|BLACKLISTED|PASS \S+) \[([^]]+)\](?::\d+)?$/) { + elsif ($line =~ /^((ALLOW|WHITE|BLACK|DENY)LISTED|PASS \S+) \[([^]]+)\](?::\d+)?$/) { + # This will display two separate counts for e.g. "allowlisted" + # and "whitelisted" if you change your configuration in the + # middle of the day, but I don't see that as a huge problem. + # + # ALLOWLISTED [40.92.75.48]:17085 # PASS NEW [192.168.0.2]:12345 # PASS OLD [192.168.0.3]:12345 $Counts{'postscreen'}{lc $1}{$2}{$END_KEY}++ if $Collecting{'postscreen'}; @@ -4407,9 +4412,9 @@ sub postfix_postscreen { $Counts{'postscreen'}{'reject'}{"\u$4"}{$3}{$END_KEY}++ if $Collecting{'postscreen'}; } - elsif ($line =~ /^(?:WHITELIST VETO) \[([^]]+)\](?::\d+)?$/) { + elsif ($line =~ /^(?:(WHITE|ALLOW)LIST VETO) \[([^]]+)\](?::\d+)?$/) { # WHITELIST VETO [192.168.0.8]:43579 - $Counts{'postscreen'}{'whitelist veto'}{$1}{$END_KEY}++ if $Collecting{'postscreen'}; + $Counts{'postscreen'}{'allowlist veto'}{$1}{$END_KEY}++ if $Collecting{'postscreen'}; } elsif ($line =~ /^(entering|leaving) STRESS mode with (\d+) connections$/) { -- 2.43.2