From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 4/4] pmg-smtp-filter: die if processing took longer than the timeout
Date: Mon, 11 Sep 2023 16:23:16 +0200 [thread overview]
Message-ID: <20230911142317.19746-5-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20230911142317.19746-1-s.ivanov@proxmox.com>
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
analyze_virus added in analyze virus.
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/bin/pmg-smtp-filter | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
index 011dd16..1c2c816 100755
--- a/src/bin/pmg-smtp-filter
+++ b/src/bin/pmg-smtp-filter
@@ -316,6 +316,12 @@ 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');
+ if ( ($processing_time - 1) >= $filter_timeout) {
+ die "processing took $processing_time s, longer than the timeout ($filter_timeout)\n";
+ }
+
foreach my $rule (@$rules) {
my $targets = $rule_targets{$rule->{id}};
next if !$targets;
@@ -637,6 +643,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
next prev parent reply other threads:[~2023-09-11 14:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-11 14:23 [pmg-devel] [PATCH pmg-api/docs] make filter timeout configurable Stoiko Ivanov
2023-09-11 14:23 ` [pmg-devel] [PATCH pmg-api 1/4] templates: postfix: set same timeouts for before and after-queue Stoiko Ivanov
2023-09-11 14:23 ` [pmg-devel] [PATCH pmg-api 2/4] pmg-smtp-filter: refactor use of gettimeofday Stoiko Ivanov
2023-09-11 14:23 ` [pmg-devel] [PATCH pmg-api 3/4] config: postfix: make smtp-filter-timeout configurable Stoiko Ivanov
2024-01-12 9:15 ` Thomas Lamprecht
2023-09-11 14:23 ` Stoiko Ivanov [this message]
2024-01-12 9:19 ` [pmg-devel] [PATCH pmg-api 4/4] pmg-smtp-filter: die if processing took longer than the timeout Thomas Lamprecht
2023-09-11 14:23 ` [pmg-devel] [PATCH pmg-docs 1/1] doc-generator: add new option filter_timeout Stoiko Ivanov
2024-01-12 8:35 ` [pmg-devel] [PATCH pmg-api/docs] make filter timeout configurable Dominik Csapak
2024-01-12 19:59 ` Stoiko Ivanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230911142317.19746-5-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox