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 621DB82F28 for ; Wed, 1 Dec 2021 16:49:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5E36E103B9 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 B470C103A7 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 BA75345FAA 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:57 +0100 Message-Id: <20211201154158.322637-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.242 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. [main.rs] Subject: [pmg-devel] [PATCH log-tracker] fix #3758: fix `to` filter with empty NoqueueEntry `to` field 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:50 -0000 We only compared the filter `to` with the Noqueue `to` when both were not empty, and in turn set the nq.dstatus to DStatus::Invalid when they didn't match. But in the case of an empty Noqueue `to`, we have to skip it as well if the filter `to` is not empty. Signed-off-by: Mira Limbeck --- contains 2 rustfmt changes that are unrelated to the issue src/main.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main.rs b/src/main.rs index b1d4f8c..62e5ea1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -762,7 +762,6 @@ fn handle_cleanup_message(msg: &[u8], parser: &mut Parser, complete_line: &[u8]) } qe.borrow_mut().cleanup = true; - // does not work correctly if there's a duplicate message id in the logfiles if let Some(q) = parser.msgid_lookup.remove(msgid) { let q_clone = Weak::clone(&q); @@ -776,8 +775,7 @@ fn handle_cleanup_message(msg: &[u8], parser: &mut Parser, complete_line: &[u8]) q.borrow_mut().aq_qentry = Some(Rc::downgrade(&qe)); } } - } - else { + } else { parser.msgid_lookup.insert(msgid.into(), Rc::downgrade(&qe)); } } @@ -908,8 +906,9 @@ impl SEntry { || (parser.options.exclude_greylist && nq.dstatus == DStatus::Greylist) || (parser.options.exclude_ndr && nq.from.is_empty()) || (!parser.options.to.is_empty() - && !nq.to.is_empty() - && find_lowercase(&nq.to, parser.options.to.as_bytes()).is_none()) + && ((!nq.to.is_empty() + && find_lowercase(&nq.to, parser.options.to.as_bytes()).is_none()) + || nq.to.is_empty())) { nq.dstatus = DStatus::Invalid; } -- 2.30.2