From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 76C9182F1D for ; Wed, 1 Dec 2021 16:49:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 714A2103BA for ; Wed, 1 Dec 2021 16:49:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id B5A7B103A8 for ; Wed, 1 Dec 2021 16:49:19 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9357445F33 for ; Wed, 1 Dec 2021 16:41:59 +0100 (CET) From: Mira Limbeck To: pmg-devel@lists.proxmox.com Date: Wed, 1 Dec 2021 16:41:58 +0100 Message-Id: <20211201154158.322637-2-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211201154158.322637-1-m.limbeck@proxmox.com> References: <20211201154158.322637-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.226 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mailtracker.pm] Subject: [pmg-devel] [PATCH api] fix #3758: allow empty `to` in noqueue case X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Dec 2021 15:49:20 -0000 Signed-off-by: Mira Limbeck --- src/PMG/API2/MailTracker.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PMG/API2/MailTracker.pm b/src/PMG/API2/MailTracker.pm index 187decf..b8b25ad 100644 --- a/src/PMG/API2/MailTracker.pm +++ b/src/PMG/API2/MailTracker.pm @@ -171,13 +171,14 @@ my $run_pmg_log_tracker = sub { $entry->{client} = $1; } elsif ($line =~ m/^CTIME:\s+([0-9A-F]+)$/) { # ignore ? - } elsif ($line =~ m/^TO:([0-9A-F]+):(T[0-9A-F]+L[0-9A-F]+):([0-9A-Z]):\s+from <([^>]*)>\s+to\s+<([^>]+)>$/) { + } elsif ($line =~ m/^TO:([0-9A-F]+):(T[0-9A-F]+L[0-9A-F]+):([0-9A-Z]):\s+from <([^>]*)>\s+to\s+<([^>]*)>$/) { my $e = {}; $e->{client} = $entry->{client} if defined($entry->{client}); $e->{time} = hex($1) - $timezone; $e->{id} = $2; $e->{dstatus} = $3; $e->{from} = $4; + die "empty to address only allowed in NOQUEUE case\n" if !$5 && $e->{dstatus} ne 'N'; $e->{to} = $5; push @$list, $e; } elsif ($line =~ m/^LOGS:$/) { -- 2.30.2