From 191c930503c2631c591fd0dfe99012d4db371605 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sun, 1 Aug 2021 08:44:34 -0400 Subject: [PATCH] Whitespace/comment cleanup. --- postfix-logwatch | 103 +++++++++++++---------------------------------- 1 file changed, 28 insertions(+), 75 deletions(-) diff --git a/postfix-logwatch b/postfix-logwatch index be28795..90e7acf 100644 --- a/postfix-logwatch +++ b/postfix-logwatch @@ -2715,10 +2715,8 @@ LINE: while ( <> ) { our $service_name = $3; my ($mailhost,$server_name,$p1) = ($1,$2,$4); - #print "mailhost: $mailhost, servername: $server_name, servicename: $service_name, p1: $p1\n"; $service_name = $server_name unless $service_name; - #print "service_name: $service_name\n"; # ignored postfix services... next if $service_name eq 'postlog'; @@ -2798,7 +2796,6 @@ sys 0m3.005s # 5:25 foreach (@policy_services) { if ($service_name =~ $_->[0]) { - #print "Calling policy service helper: $service_name:('$p1')\n"; &{$_->[1]}($p1); next LINE; } @@ -2870,7 +2867,6 @@ sys 0m3.005s # this test must preceed access checks below #TDsQ replace: header From: "Postmaster" : From: "Postmaster" if ($service_name eq 'smtp' and header_body_checks($p1)) { - #print "main: header_body_checks\n"; next; } @@ -2908,14 +2904,12 @@ sys 0m3.005s my $action = $1; $p1 = substr($p1, length($action) + 2); - #print "action: \"$action\", p1: \"$p1\"\n"; if ($p1 !~ /^(RCPT|MAIL|CONNECT|HELO|EHLO|DATA|VRFY|ETRN|END-OF-MESSAGE) from ([^[]+)\[([^]]+)\](?::\d+)?: (.*)$/) { inc_unmatched('unexpected access'); next; } - my ($stage,$host,$hostip,$p1) = ($1,$2,$3,$4); #print "stage: \"$stage\", host: \"$host\", hostip: \"$hostip\", p1: \"$p1\"\n"; - my ($efrom,$eto,$proto,$helo) = strip_ftph($p1); #print "efrom: \"$efrom\", eto: \"$eto\", proto: \"$proto\", helo: \"$helo\"\n"; - #print "p1 now: \"$p1\"\n"; + my ($stage,$host,$hostip,$p1) = ($1,$2,$3,$4); + my ($efrom,$eto,$proto,$helo) = strip_ftph($p1); # QID: ACTION STAGE from host[hostip]: DSN trigger: explanation; ftph #TDsdN reject_warning: VRFY from host[10.0.0.1]: 450 4.1.2 <<1F4@bs>>: Recipient address rejected: Domain not found; to=<<1F4@bs>> proto=SMTP helo= @@ -2973,12 +2967,11 @@ sys 0m3.005s inc_unmatched('reject1'); next; } - ($dsn,$p1) = ($1,$2); #print "dsn: $dsn, p1: \"$p1\"\n"; + ($dsn,$p1) = ($1,$2); $fmthost = formathost($hostip,$host); # reject_warning override temp or perm reject types $rej_type = ($action eq 'reject_warning' ? 'warn' : get_reject_key($dsn)); - #print "REJECT stage: '$rej_type'\n"; if ($Collecting{'byiprejects'} and substr($rej_type,0,1) eq '5') { $Counts{'byiprejects'}{$fmthost}++; @@ -3155,7 +3148,6 @@ sys 0m3.005s else { $trigger =~ s/^<(.+)>$/$1/; } $reason = '*unavailable' if ($reason eq ''); $fmthost = formathost ($hostip,$host); - #print "trigger: \"$trigger\", reason: \"$reason\"\n"; # reason -> subject text # subject -> "Helo command" : smtpd_helo_restrictions @@ -3173,7 +3165,6 @@ sys 0m3.005s my ($subject, $text) = ($reason =~ /^((?:Recipient|Sender) address|(?:Unverified )?Client host|Client certificate|(?:Helo|Etrn|Data) command|End-of-data) (.+)$/o); - #printf "ACTION: '$action', SUBJECT: %-30s TEXT: \"$text\"\n", '"' . $subject . '"'; if ($action eq 'filter') { $Totals{'filtered'}++; next unless ($Collecting{'filtered'}); @@ -3380,7 +3371,6 @@ sys 0m3.005s #TD 47B7B074: to=, relay=example.com[10.0.0.1]:25, delay=6.6, delays=6.5/0/0/0.11, dsn=5.1.1, status=bounced (host example.com[10.0.0.1] said: 550 5.1.1 User unknown; rejecting (in reply to RCPT TO command)) #TDppQ to=, relay=dbmail-pipe, delay=0.15, delays=0.09/0.01/0/0.06, dsn=5.3.0, status=bounced (Command died with signal 11: "/usr/sbin/dbmail-smtp") - # print "bounce message from " . $to . " msg : " . $relay . "\n"; # See same code elsewhere "Note: Bounce" ### local bounce @@ -3536,7 +3526,6 @@ sys 0m3.005s ($site,$reason) = ($5 =~ /^(.+?)(?:$|(?:[.,] )(.*))/); $reason =~ s/^reason: // if ($reason); $rej_type = ($rej_type =~ /_warning/ ? 'warn' : get_reject_key($dsn)); - #print "REJECT RBL NOQ: '$rej_type'\n"; # Note: similar code above: search RejectRBL # This section required: postfix didn't always log QID (eg. postfix 1.1) @@ -3559,7 +3548,7 @@ sys 0m3.005s # proxy-reject, proxy-accept elsif ($p1 =~ s/^proxy-(reject|accept): ([^:]+): //) { # 2.7 - #TDsdN proxy-accept: END-OF-MESSAGE: 250 2.0.0 Ok: queued as 9BE3547AFE; from= to= proto=ESMTP helo= + #TDsdN proxy-accept: END-OF-MESSAGE: 250 2.0.0 Ok: queued as 9BE3547AFE; from= to= proto=ESMTP helo= #TDsdN proxy-reject: END-OF-MESSAGE: 554 5.7.0 Reject, id=11912-03 - INFECTED: Eicar-Test-Signature; from= to= proto=ESMTP helo= #TDsdN proxy-reject: END-OF-MESSAGE: ; from= to= proto=SMTP helo= @@ -3567,15 +3556,14 @@ sys 0m3.005s my ($stage) = ($2); my ($efrom,$eto,$proto,$helo) = strip_ftph($p1); - #print "efrom: '$efrom', eto: '$eto', proto: '$proto', helo: '$helo'\n"; - #print "stage: '$stage', reply: '$p1'\n"; my ($dsn,$reject_name); ($dsn,$reply) = ($1,$2) if $p1 =~ /^($re_DSN) (.*)$/o; - #print " dsn: '$dsn', reply: '$reply', key: ", get_reject_key($dsn), "\n"; - # DSN may not be present. Can occur, for example, when queue file size limit is reached, - # which is logged as a Warning. Ignore these, since they can't be add to any - # reject section (no SMTP reply code). + + # DSN may not be present. Can occur, for example, when queue + # file size limit is reached, which is logged as a Warning. + # Ignore these, since they can't be add to any reject section + # (no SMTP reply code). if (! defined $dsn) { next; } @@ -3713,8 +3701,6 @@ if ($Opts{'summary'}) { # Print the Detail report, if detail is sufficiently high # if ($Opts{'detail'} >= 5) { - #print STDERR "Counts memory usage: ", commify(Devel::Size::total_size(\%Counts)), "\n"; - #print STDERR "Delays memory usage: ", commify(Devel::Size::total_size(\%Delays)), "\n"; print_detail_report(@Sections); if ($Opts{'delays'}) { @@ -3732,12 +3718,6 @@ if ($Opts{'detail'} >= 5) { } -# debug: show which ignore_list items are hit most -#my %IGNORED; -#for (sort { $IGNORED{$b} <=> $IGNORED{$a} } keys %IGNORED) { -# printf "%10d: KEY: %s\n", $IGNORED{$_}, $_; -#} - # Finally, print any unmatched lines # print_unmatched_report(); @@ -3962,9 +3942,7 @@ sub in_ignore_list($) { my $line = shift; foreach (@ignore_list) { - #return 1 if $line =~ /$_/; if ($line =~ /$_/) { - #$IGNORED{$_}++; return 1; } } @@ -4025,7 +4003,7 @@ sub process_delivery_attempt ($ $ $ $) { } # Processes postfix/bounce messages -# +# sub postfix_bounce($) { my $line = shift; my $type; @@ -4055,7 +4033,7 @@ sub postfix_bounce($) { # Processes postfix/cleanup messages # cleanup always has a QID -# +# sub postfix_cleanup($) { my $line = shift; my ($qid,$reply,$fmthost,$reject_name); @@ -4073,7 +4051,7 @@ sub postfix_cleanup($) { ### cleanup bounced messages (always_bcc, recipient_bcc_maps, sender_bcc_maps) # Note: Bounce - # See same code elsewhere "Note: Bounce" + # See same code elsewhere "Note: Bounce" #TDcQ to=, relay=none, delay=0.11, delays=0.11/0/0/0, dsn=5.7.1, status=bounced optional text... #TDcQ to=, orig_to=, relay=none, delay=0.13, delays=0.13/0/0/0, dsn=5.7.1, status=bounced optional text... if ($line =~ /^to=<(.*?)>,(?: orig_to=<(.*?)>,)? relay=([^,]*).*, ($re_DDD), status=([^ ]+) (.*)$/o) { @@ -4103,7 +4081,6 @@ sub postfix_cleanup($) { # *header_checks and body_checks elsif (header_body_checks($line)) { - #print "cleanup: header_body_checks\n"; return; } @@ -4159,8 +4136,6 @@ sub header_body_checks($) my ($action,$part,$p3) = ($1,$2,$3); - #print "header_body_checks: action: \"$action\", part: \"$part\", p3: \"$p3\"\n"; - my ($trigger,$host,$eto,$p4,$fmthost,$reject_name); # $re_QID: reject: body ... # $re_QID: reject: header ... @@ -4175,7 +4150,7 @@ sub header_body_checks($) #TDcQ reject: body Quality replica watches!!! from hb.example.com[10.0.0.1]; from= to= proto=SMTP helo=: optional text... #TDcQ reject: header To: from hb.example.com[10.0.0.1]; from= to= proto=ESMTP helo=: optional text... # message_reject_characters (postfix >= 2.3) - #TDcQ reject: content Received: by example.com Postfix from example.com[10.0.0.1]; from= to= proto=ESMTP helo=.example.com>: 5.7.1 disallowed character + #TDcQ reject: content Received: by example.com Postfix from example.com[10.0.0.1]; from= to= proto=ESMTP helo=.example.com>: 5.7.1 disallowed character #TDcQ filter: header To: to@example.com from hb.example.com[10.0.0.1]; from= to= proto=ESMTP helo=: transport:destination #TDcQ hold: header Message-ID: from localhost[127.0.0.1]; from= to= proto=ESMTP helo=: optional text... @@ -4198,7 +4173,7 @@ sub header_body_checks($) else { # smtp_body_checks, smtp_header_checks, smtp_mime_header_checks, smtp_nested_header_checks (postfix >= 2.5) - #TDsQ replace: header Sender: : Sender: + #TDsQ replace: header Sender: : Sender: $trigger = $p3; $host = ''; $eto = ''; $p4 = $part eq 'body' ? 'smtp_body_checks' : 'smtp_*header_checks'; @@ -4206,7 +4181,6 @@ sub header_body_checks($) #return 1; } - #print " trigger: \"$trigger\", host: \"$host\", eto: \"$eto\", p4: \"$p4\"\n"; $trigger =~ s/\s+/ /g; $trigger = '*unknown reason' if ($trigger eq ''); $eto = '*unknown' if ($eto eq ''); @@ -4298,18 +4272,15 @@ sub milter_common($) { # 84B82AC8B3: milter-reject: END-OF-MESSAGE from localhost[127.0.0.1]: 5.7.1 Blocked my ($efrom,$eto,$proto,$helo) = strip_ftph($line); - #print "efrom: '$efrom', eto: '$eto', proto: '$proto', helo: '$helo'\n"; $line =~ s/;$//; if ($line =~ /^(reject|hold|discard): (\S+) from ([^[]+)\[([^]]+)\](?::\d+)?: (.*)$/) { my ($action,$stage,$host,$hostip,$reply) = ($1,$2,$3,$4,$5); - #print "action: '$action', stage: '$stage', host: '$host', hostip: '$hostip', reply: '$reply'\n"; if ($action eq 'reject') { my ($dsn,$fmthost,$reject_name); ($dsn,$reply) = ($1,$2) if $reply =~ /^($re_DSN) (.*)$/o; - #print " dsn: '$dsn', reply: '$reply'\n"; if ($Collecting{'byiprejects'} and substr($dsn,0,1) eq '5') { $fmthost = formathost($hostip,$host); @@ -4496,7 +4467,8 @@ sub postfix_fatal($) { $Totals{'fatalfiletoobig'}++; - # XXX its not clear this is at all useful - consider falling through to last case + # XXX its not clear this is at all useful - consider falling + # through to last case } elsif ( $reason =~ /^config variable (\S*): (.*)$/o ) { #TD fatal: config variable inet_interfaces: host not found: 10.0.0.1:2525 #TD fatal: config variable inet_interfaces: host not found: all:2525 @@ -4751,8 +4723,8 @@ sub postfix_warning($) { #TDsd warning: 009314BD9E: read timeout on cleanup socket $warning =~ s/^$re_QID: (read timeout on \S+ socket)/$1/; - #TDsd warning: Read failed in network_biopair_interop with errno=0: num_read=0, want_read=11 - #TDs warning: Read failed in network_biopair_interop with errno=0: num_read=0, want_read=11 + #TDsd warning: Read failed in network_biopair_interop with errno=0: num_read=0, want_read=11 + #TDs warning: Read failed in network_biopair_interop with errno=0: num_read=0, want_read=11 $warning =~ s/^(Read failed in network_biopair_interop) with .*$/$1/; =cut @@ -4803,8 +4775,6 @@ sub cleanhostreply($ $ $ $) { my $fmtdhost = ''; my ($r1, $r2, $dsn, $msg, $host, $event); - #print "RELAY: $relay, RECIP: $recip, DOMAIN: $domain\n"; - #print "HOSTREPLY: \"$hostreply\"\n"; return ('Accepted', '*unknown') if $hostreply =~ /^25\d/o; # Host or domain name not found. Name service error for name=example.com type=MX: Host not found... @@ -4837,11 +4807,9 @@ sub cleanhostreply($ $ $ $) { or $r1 =~ /(?:no such user|user unknown)/i ) { - #print "UNKNOWN RECIP: $r1\n"; $r1 = 'Unknown recipient'; } elsif ($r1 =~ /greylisted/oi) { - #print "GREYLISTED RECIP: $r1\n"; $r1 = 'Recipient greylisted'; } elsif ($r1 =~ /^Message temporarily deferred - (\d\.\d+\.\d+)\. Please refer to (.+)$/o) { @@ -4849,65 +4817,54 @@ sub cleanhostreply($ $ $ $) { $dsn = "$dsn $1"; $r1 = "see $2"; } elsif ($r1 =~ /^Resources temporarily not available - Please try again later \[#(\d\.\d+\.\d+)\]\.$/o) { - #Yahoo 451 Resources temporarily not available - Please try again later [#4.16.5]. + #Yahoo 451 Resources temporarily not available - Please try again later [#4.16.5]. $dsn = "$dsn $1"; $r1 = "resources not available"; } elsif ($r1 =~ /^Message temporarily deferred - (\[\d+\])/o) { - # Yahoo: 451 Message temporarily deferred - [160] + # Yahoo: 451 Message temporarily deferred - [160] $dsn = "$dsn $1"; $r1 = ''; } } elsif ($hostreply =~ /^connect to (\S+): (.*)$/o) { - #print "CONNECT: $hostreply\n"; $host = $1; $r1 = $2; $r1 =~ s/server refused to talk to me/refused/; } elsif ($hostreply =~ /^host (\S+) refused to talk to me: (.*)$/o) { $host = $1; $msg = $2; - #print "HOSTREFUSED: $hostreply\n"; #Yahoo: '421 Message from (10.0.0.1) temporarily deferred - 4.16.50. Please refer to http://... if ($msg =~ /^(\d+) Message from \([^)]+\) temporarily deferred - (\d\.\d+\.\d+)\. Please refer to (.+)$/) { $dsn = "$1 $2"; $msg = "see $3"; } - #$r1 = join(': ', 'refused', $msg); + $r1 = $msg; } elsif ($hostreply =~ /^(delivery temporarily suspended): connect to (\S+): (.*)$/o) { - #print "DELIVERY SUSP: $hostreply\n"; $host = $2; $r1 = join(': ', $1, $3); } elsif ($hostreply =~ /^(delivery temporarily suspended: conversation) with (\S+) (.*)$/o) { # delivery temporarily suspended: conversation with example.com[10.0.0.1] timed out while receiving the initial server greeting) - #print "DELIVERY SUSP2: $hostreply\n"; $host = $2; $r1 = join(' ', $1, $3); } elsif (($event,$host,$r1) = ($hostreply =~ /^(lost connection|conversation) with (\S+) (.*)$/o)) { - #print "LOST conv/conn: $hostreply\n"; $r1 = join(' ',$event,$r1); } elsif ($hostreply =~ /^(.*: \S+maildrop: Unable to create a dot-lock) at .*$/o) { - #print "MAILDROP: $hostreply\n"; $r1 = $1; } elsif ($hostreply =~ /^mail for (\S+) loops back to myself/o) { - #print "LOOP: $hostreply\n"; $host = $1; $r1 = 'mailer loop'; } elsif ($hostreply =~ /^unable to find primary relay for (\S+)$/o) { - #print "NORELAY: $hostreply\n"; $host = $1; $r1 = 'no relay found'; } elsif ($hostreply =~ /^message size \d+ exceeds size limit \d+ of server (\S+)\s*$/o) { - #print "TOOBIG: $hostreply\n"; $host = $1; $r1 = 'message too big'; } else { - #print "UNMATCH: $hostreply\n"; $r1 = $hostreply; } - #print "R1: $r1, R2: $r2\n"; $r1 =~ s/for name=\Q$domain\E //ig; if ($host eq '') { @@ -4936,14 +4893,11 @@ sub cleanhostreply($ $ $ $) { # sub strip_ftph($) { my ($helo, $proto, $to, $from); - #print "strip_ftph: '$_[0]\n"; $helo = ($_[0] =~ s/\s+helo=<(.*?)>\s*$//) == 1 ? $1 : '*unavailable'; $proto = ($_[0] =~ s/\s+proto=(\S+)\s*$//) == 1 ? $1 : '*unavailable'; $to = ($_[0] =~ s/\s+to=<(.*?)>\s*$//) == 1 ? (lc($1) || '<>') : '*unavailable'; $from = ($_[0] =~ s/\s+from=<(.*?)>\s*$//) == 1 ? ( $1 || '<>') : '*unavailable'; - #print "helo: $helo, proto: $proto, to: $to, from: $from\n"; - #print "strip_ftph: final: '$_[0]'\n"; return ($from,$to,$proto,$helo); } @@ -4994,7 +4948,7 @@ sub init_getopts_table() { # 6. A hash to a divisor used to calculate the percentage of a total for that key # # Use begin_section_group/end_section_group to create groupings around sections. -# +# # Sections can be freely reordered if desired, but maintain proper group nesting. # # @@ -5007,7 +4961,7 @@ sub init_getopts_table() { # require special-case processing to distinguish 4xx temporary rejects from 5xx # permanent rejects in various Totals{'totalrejects*'} counts, and in the # Totals{'totalrejects'} tally. -# +# # Sections can be freely reordered if desired. sub build_sect_table() { if ($Opts{'debug'} & Logreporters::D_SECT) { @@ -5067,8 +5021,9 @@ sub build_sect_table() { add_section ($S, 'totalacceptplusreject', 0, 'd', 'Total', \$Totals{'totalacceptplusreject'}); end_section_group ($S, 'acceptreject', $sep1); - # The various Reject sections are built dynamically based upon a list of reject reply keys, - # which are user-configured via $Opts{'reject_reply_patterns'} + # The various Reject sections are built dynamically based upon a + # list of reject reply keys, which are user-configured via + # $Opts{'reject_reply_patterns'} @RejectPats = (); foreach my $rejpat (split /[ ,]/, $Opts{'reject_reply_patterns'}) { if ($rejpat !~ /^(warn|[45][\d.]{2})$/io) { @@ -5234,18 +5189,16 @@ sub get_reject_key($) { my $replyorig = $reply; ($reply) = split / /, $reply; for (my $i = 0; $i <= $#RejectPats; $i++) { - #print "TRYING: $RejectPats[$i]\n"; # we'll allow extended DSNs to match (eg. 5.7.1 will match 5..) if ($reply =~ /^$RejectPats[$i]/) { # no /o here, pattern varies - #print "MATCHED: orig: $replyorig, reply $reply matched pattern $RejectPats[$i], returning $RejectKeys[$i]\n"; return $RejectKeys[$i]; } } - #print "NOT MATCHED: REPLY CODE: '$replyorig', '$reply'\n"; + return; } -# Replace bare reject limiters with specific reject limiters +# Replace bare reject limiters with specific reject limiters # based on reject_reply_patterns # sub expand_bare_reject_limiters() -- 2.43.2