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 1ACC394297 for ; Fri, 9 Feb 2024 13:55:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D9C263967B for ; Fri, 9 Feb 2024 13:54:43 +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 for ; Fri, 9 Feb 2024 13:54:43 +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 2C8A44683C for ; Fri, 9 Feb 2024 13:54:43 +0100 (CET) From: Dominik Csapak To: pmg-devel@lists.proxmox.com Date: Fri, 9 Feb 2024 13:54:33 +0100 Message-Id: <20240209125440.2572239-10-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240209125440.2572239-1-d.csapak@proxmox.com> References: <20240209125440.2572239-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [PATCH pmg-api 09/12] MailQueue: return maximum AID 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: Fri, 09 Feb 2024 12:55:12 -0000 we'll need this in the what_matches to invert mark lists. Signed-off-by: Dominik Csapak --- src/PMG/MailQueue.pm | 4 ++-- src/PMG/Utils.pm | 2 ++ src/bin/pmg-smtp-filter | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/PMG/MailQueue.pm b/src/PMG/MailQueue.pm index 8355c30..4e37cb9 100644 --- a/src/PMG/MailQueue.pm +++ b/src/PMG/MailQueue.pm @@ -406,10 +406,10 @@ sub parse_mail { # we also remove all proxmox-marks from the mail and add an unique # id to each attachment. - PMG::Utils::remove_marks ($entity, 1); + my $max_aid = PMG::Utils::remove_marks ($entity, 1); PMG::Utils::add_ct_marks ($entity); - return $entity; + return ($entity, $max_aid); } sub decode_entities { diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index d9c9d2d..9f69e7f 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -186,6 +186,8 @@ sub remove_marks { $id++; }); + + return $id - 1; # return max AID } sub subst_values { diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter index 71043b0..86d633d 100755 --- a/src/bin/pmg-smtp-filter +++ b/src/bin/pmg-smtp-filter @@ -648,7 +648,8 @@ sub handle_smtp { my $maxfiles = $pmg_cfg->get('clamav', 'archivemaxfiles'); - my $entity = $queue->parse_mail($maxfiles); + my ($entity, $max_aid) = $queue->parse_mail($maxfiles); + $msginfo->{max_aid} = $max_aid; $self->log (3, "$queue->{logid}: new mail message-id=%s", $queue->{msgid}); -- 2.30.2