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 2E60DC0E76 for ; Fri, 12 Jan 2024 20:22:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0FE0E36091 for ; Fri, 12 Jan 2024 20:22:22 +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:21 +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 A055849133 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:51 +0100 Message-Id: <20240112192151.40998-6-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 - Subject: [pmg-devel] [PATCH pmg-api v2 4/4] pmg-smtp-filter: die if processing took longer than the timeout 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:52 -0000 In case a mail took longer to get processed than the configured timeout - 1 second - `die` before running any action. The `die` results in a temporary failure to be reported to the sending server by PMG::SMTP.pm ("451 4.4.0 detected undelivered mail"). The reason for the 1s extra slack is to have some time to actually run the action - and also justified that in both cases (postfix detecting the timeout, and pmg-smtp-filter `die`ing the sender gets a temporary failure reported back). Tested with a small filter_timeout setting (30), and a larger sleep in added in analyze_virus. Signed-off-by: Stoiko Ivanov --- src/bin/pmg-smtp-filter | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter index ba4e58e..79d951c 100755 --- a/src/bin/pmg-smtp-filter +++ b/src/bin/pmg-smtp-filter @@ -316,6 +316,11 @@ sub apply_rules { my $mod_group = PMG::ModGroup->new($entity, $msginfo->{targets}); + my $processing_time = int(tv_interval($msginfo->{starttime})); + my $filter_timeout = $self->{pmg_cfg}->get('mail', 'filter-timeout'); + die "processing took ${processing_time}s, longer than the timeout (${filter_timeout}s)\n" + if $processing_time > $filter_timeout; + foreach my $rule (@$rules) { my $targets = $rule_targets{$rule->{id}}; next if !$targets; @@ -637,6 +642,7 @@ sub handle_smtp { $msginfo->{fqdn} = $msginfo->{hostname}; $msginfo->{fqdn} .= ".$msginfo->{domain}" if $msginfo->{domain}; $msginfo->{lcid} = $lcid; + $msginfo->{starttime} = $starttime; # $msginfo->{targets} is case sensitive, # but pmail is always lower case! -- 2.39.2