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 410A3C0E65 for ; Fri, 12 Jan 2024 20:22:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1F0C73608C for ; Fri, 12 Jan 2024 20:22:21 +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, 12 Jan 2024 20:22: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 8F72949131 for ; Fri, 12 Jan 2024 20:22:19 +0100 (CET) From: Stoiko Ivanov To: pmg-devel@lists.proxmox.com Date: Fri, 12 Jan 2024 20:21:50 +0100 Message-Id: <20240112192151.40998-5-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240112192151.40998-1-s.ivanov@proxmox.com> References: <20240112192151.40998-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.087 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cf.in, template-toolkit.org, config.pm] Subject: [pmg-devel] [PATCH pmg-api v2 3/4] config: postfix: make smtp-filter-timeout configurable 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, 12 Jan 2024 19:22:21 -0000 accessing the value in the config-template needs to use the item virtual method (`pmg.mail.item('filter-timeout')` instead of the . operator, due to using kebab-case for 'filter-timeout' see [0]. the minimal value is set to 2 as we add 1 second for the rules processing in the next patch, and postfix has 1 as minimum. [0] http://template-toolkit.org/docs/manual/VMethods.html#section_item Signed-off-by: Stoiko Ivanov --- src/PMG/Config.pm | 9 +++++++++ src/templates/main.cf.in | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm index 7339e0d..43baec5 100644 --- a/src/PMG/Config.pm +++ b/src/PMG/Config.pm @@ -699,6 +699,14 @@ sub properties { type => 'boolean', default => 1 }, + 'filter-timeout' => { + description => "Timeout for the processing of one mail (in seconds) (postfix option" + ." `smtpd_proxy_timeout` and `lmtp_data_done_timeout`)", + type => 'integer', + default => 600, + minimum => 2, + maximum => 86400 + }, }; } @@ -740,6 +748,7 @@ sub options { before_queue_filtering => { optional => 1 }, ndr_on_block => { optional => 1 }, smtputf8 => { optional => 1 }, + 'filter-timeout' => { optional => 1 }, }; } diff --git a/src/templates/main.cf.in b/src/templates/main.cf.in index 51cdd8b..434d5cd 100644 --- a/src/templates/main.cf.in +++ b/src/templates/main.cf.in @@ -50,9 +50,10 @@ default_transport = smtp:[% pmg.mail.smarthost %]:[% pmg.mail.smarthostport %] [% END %] [% IF pmg.mail.before_queue_filtering -%] -smtpd_proxy_timeout = 600s +smtpd_proxy_timeout = [% pmg.mail.item('filter-timeout') %]s [% ELSE %] content_filter=scan:127.0.0.1:10024 +lmtp_data_done_timeout = [% pmg.mail.item('filter-timeout') %]s [%- END %] mail_name = Proxmox -- 2.39.2