From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <s.ivanov@proxmox.com> 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 39A68B554 for <pmg-devel@lists.proxmox.com>; Mon, 11 Sep 2023 16:23:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 21F019CF9 for <pmg-devel@lists.proxmox.com>; Mon, 11 Sep 2023 16:23:44 +0200 (CEST) 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 <pmg-devel@lists.proxmox.com>; Mon, 11 Sep 2023 16:23:41 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9C8A4447EC for <pmg-devel@lists.proxmox.com>; Mon, 11 Sep 2023 16:23:41 +0200 (CEST) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Mon, 11 Sep 2023 16:23:13 +0200 Message-Id: <20230911142317.19746-2-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230911142317.19746-1-s.ivanov@proxmox.com> References: <20230911142317.19746-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.089 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 Subject: [pmg-devel] [PATCH pmg-api 1/4] templates: postfix: set same timeouts for before and after-queue X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Mon, 11 Sep 2023 14:23:44 -0000 When a mail takes longer to get processed (observed with some scanned pages as pdf - where clamav+avast took 2.2 minutes for scanning) the behavior of the filtering is different between before-queue and after-queue filtering: In the before-queue case the timeout is `$smtpd_proxy_timout` (120s) [0], so the mail does not get processed in time and the listening smtpd responds with `451 4.3.0 Error: queue file write error`. However pmg-smtp-filter sends the mail to the smtpd on 10025 once it's done. the original sender resends the mail due to the 451 error - which results in the mail getting delivered multiple times (until it gets removed from the queue on the original sender) In the after-queue case the timeout is `$lmtp_data_done_timeout` (pmg-smtp-filter acts as lmtp server) (600s) - so the mail gets send successfully only once. In case the processing time reaches 600s the behavior is equivalent - but for lmtp postfix logs: ``` ...timed out while sending end of data -- message may be sent more than once ``` The value needs to be set as literal - referring to the builtin default as `$lmtp_data_done_timeout` does not work. While the underlying issue of mails getting send multiple times in case the timeout is reached is not fixed by this - having the same timeout in both cases is a good idea and 600s increases the chances of clamav+avast+custom_check_script+spamassassin to get their job done. tested by adding a `sleep 200` in PMG::Utils::analyze_virus_clam. (before the eval block running with the 5 minute timeout) [0] https://www.postfix.org/SMTPD_PROXY_README.html#parameters Reported-by: Martin Maurer <martin@proxmox.com> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- src/templates/main.cf.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/templates/main.cf.in b/src/templates/main.cf.in index bce0353..516bc2f 100644 --- a/src/templates/main.cf.in +++ b/src/templates/main.cf.in @@ -49,7 +49,9 @@ relay_transport = [% pmg.mail.relayprotocol %]:[% pmg.mail.relay %]:[% pmg.mail. default_transport = smtp:[% pmg.mail.smarthost %]:[% pmg.mail.smarthostport %] [% END %] -[% IF ! pmg.mail.before_queue_filtering -%] +[% IF pmg.mail.before_queue_filtering -%] +smtpd_proxy_timeout = 600s +[% ELSE %] content_filter=scan:127.0.0.1:10024 [%- END %] -- 2.39.2