public inbox for pmg-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api v2 5/6] dkim: signer: log info instead of die'ing when missing domain
Date: Tue, 25 Feb 2025 16:02:01 +0100	[thread overview]
Message-ID: <20250225150203.455669-6-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20250225150203.455669-1-s.ivanov@proxmox.com>

for mail locally generated by PMG the signing sources
(envelope-sender, From header) can contain only a local-part
(postmaster) or even be empty (envelope-sender).

While such mail cannot be sensibly signed, it should be treated as if
the domain is not listed in DKIM-domains - by an log message on 'info'
level instead of a `die`.
the sub with the changed behavior is only used in this module, and
sign_entity as external entry-point is only called in eval context,
resulting in a log message on level 'warn'.

so effectively this change should only reduce log-levels for DKIM
failures in these cases from 'warning' to 'info'

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 src/PMG/DKIMSign.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/PMG/DKIMSign.pm b/src/PMG/DKIMSign.pm
index 6f309c8..72f4809 100644
--- a/src/PMG/DKIMSign.pm
+++ b/src/PMG/DKIMSign.pm
@@ -59,9 +59,16 @@ sub signing_domain {
     my $input_domain;
     if ($use_domain eq 'header') {
 	$input_domain = parse_headers_for_signing($entity);
+	if (!defined($input_domain)) {
+	    syslog('info', "DKIM signing: no domain found in the headers from '$sender_email'");
+	    return 0;
+	}
     } else {
 	my @parts = split('@', $sender_email);
-	die "no domain in sender e-mail\n" if scalar(@parts) < 2;
+	if (scalar(@parts) < 2) {
+	    syslog('info', "DKIM signing: no domain found in '$sender_email'");
+	    return 0;
+	}
 	$input_domain = $parts[-1];
     }
 
@@ -107,7 +114,6 @@ sub parse_headers_for_signing {
 	$domain = $addresses[0]->host();
     }
 
-    die "there is no sender in the header\n" if !defined($domain);
     return $domain;
 }
 
-- 
2.39.5



_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel


  parent reply	other threads:[~2025-02-25 15:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-25 15:01 [pmg-devel] [PATCH pmg-api/pmg-gui v2 0/6] DKIM sign mails generated by PMG itself Stoiko Ivanov
2025-02-25 15:01 ` [pmg-devel] [PATCH pmg-api v2 1/6] config: add admin-mail-from key Stoiko Ivanov
2025-02-25 15:01 ` [pmg-devel] [PATCH pmg-api v2 2/6] reports: use admin-mail-from as from header Stoiko Ivanov
2025-02-25 15:01 ` [pmg-devel] [PATCH pmg-api v2 3/6] smtp-engine: use admin-mail-from as from header for bounces Stoiko Ivanov
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-api v2 4/6] ruledb: use admin-mail-from where sensible Stoiko Ivanov
2025-02-25 15:02 ` Stoiko Ivanov [this message]
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-api v2 6/6] reinject_local_mail: sign mails with DKIM based on header Stoiko Ivanov
2025-02-25 15:02 ` [pmg-devel] [PATCH pmg-gui v2 1/1] configuration: options: add admin-mail-from row Stoiko Ivanov
2025-02-25 20:36 ` [pmg-devel] applied-series: [PATCH pmg-api/pmg-gui v2 0/6] DKIM sign mails generated by PMG itself Thomas Lamprecht

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=20250225150203.455669-6-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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal