From: Dominik Csapak <d.csapak@proxmox.com>
To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com
Subject: Re: [pmg-devel] [PATCH pmg-api 3/7] smtp-engine: use admin-mail-from as from header for bounces
Date: Tue, 25 Feb 2025 11:29:47 +0100 [thread overview]
Message-ID: <8bc13052-130e-4101-bcf4-778b348cdfe1@proxmox.com> (raw)
In-Reply-To: <20250224232451.399803-4-s.ivanov@proxmox.com>
On 2/25/25 00:24, Stoiko Ivanov wrote:
> generate_ndr is currently only used to generate a bounce-mail if the
> following occur:
> * email is blocked only for part of the receivers
> * before-queue-filtering is active - in the after-queue case postfix
> generates the bounces for us.
>
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> src/PMG/SMTP.pm | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/PMG/SMTP.pm b/src/PMG/SMTP.pm
> index b7bc5d3..f387fcb 100644
> --- a/src/PMG/SMTP.pm
> +++ b/src/PMG/SMTP.pm
> @@ -185,7 +185,8 @@ sub loop {
> $self->reply ("250 2.5.0 OK ($queueid)");
> if ($cfg->get('mail', 'ndr_on_block')) {
> my $dnsinfo = $cfg->get_host_dns_info();
> - generate_ndr($self->{from}, [ @reject_rec ], $dnsinfo->{fqdn}, $queueid) if scalar(@reject_rec);
> + my $from_header = $cfg->get('admin', 'admin-mail-from', 1) // '<postmaster>';
doesn't this now generate a different default? '<postmaster>' vs 'postmaster' ?
also wouldn't it be better to generate the default below where we actually use it instead of here?
then Maximilianos undef check concerns would be gone too.
> + generate_ndr($self->{from}, [ @reject_rec ], $dnsinfo->{fqdn}, $queueid, $from_header) if scalar(@reject_rec);
> }
> } else {
> $self->reply ("451 4.4.0 detected undelivered mail ($queueid)");
> @@ -265,7 +266,7 @@ sub save_data {
> }
>
> sub generate_ndr {
> - my ($sender, $receivers, $hostname, $queueid) = @_;
> + my ($sender, $receivers, $hostname, $queueid, $from_header) = @_;
>
> my $ndr_text = <<EOF
> This is the mail system at host $hostname.
> @@ -284,7 +285,7 @@ EOF
> my $ndr = MIME::Entity->build(
> Type => 'multipart/report; report-type=delivery-status;',
> To => $sender,
> - From => 'postmaster',
> + From => $from_header,
> Subject => 'Undelivered Mail');
>
> $ndr->attach(
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
next prev parent reply other threads:[~2025-02-25 10:29 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-24 23:24 [pmg-devel] [PATCH pmg-api 0/6] DKIM sign mails generated by PMG itself Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 1/7] config: add admin-mail-from key Stoiko Ivanov
2025-02-25 10:29 ` Dominik Csapak
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 2/7] reports: use admin-mail-from as from header Stoiko Ivanov
2025-02-25 10:32 ` Dominik Csapak
2025-02-25 12:55 ` Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 3/7] smtp-engine: use admin-mail-from as from header for bounces Stoiko Ivanov
2025-02-25 9:53 ` Maximiliano Sandoval
2025-02-25 10:29 ` Stoiko Ivanov
2025-02-25 10:29 ` Dominik Csapak [this message]
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 4/7] ruledb: use admin-mail-from where sensible Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 5/7] dkim: signer: degrade missing domain in from header to info Stoiko Ivanov
2025-02-24 23:24 ` [pmg-devel] [PATCH pmg-api 6/7] reinject_local_mail: sign mails with DKIM based on header Stoiko Ivanov
2025-02-25 10:32 ` Maximiliano Sandoval
2025-02-25 10:47 ` Dominik Csapak
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=8bc13052-130e-4101-bcf4-778b348cdfe1@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
--cc=s.ivanov@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal