all lists on 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 6/7] reinject_local_mail: sign mails with DKIM based on header
Date: Tue, 25 Feb 2025 00:24:51 +0100	[thread overview]
Message-ID: <20250224232451.399803-7-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20250224232451.399803-1-s.ivanov@proxmox.com>

as most mails PMG generates locally has an empty envelope-sender,
signing only makes sense when the from-header domain is used as
signing domain.

This fixes #3423, and partially addresses #2971 and #4658 (bounces
generated by postfix directly are not passed through our stack, and
should not be processed in general -  see
https://www.postfix.org/postconf.5.html#internal_mail_filter_classes).

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

diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index b2a75fb..3303bac 100644
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -247,6 +247,24 @@ sub reinject_local_mail {
 	$params->{mail}->{smtputf8} = $needs_smtputf8;
     }
 
+    my $dkim_sign = $cfg->get('admin', 'dkim_sign');
+    if ($dkim_sign) {
+	my $dkim = {};
+	$dkim->{sign} = $dkim_sign;
+	$dkim->{use_domain} = $cfg->get('admin', 'dkim-use-domain');
+	$dkim->{sign_all} = $cfg->get('admin', 'dkim_sign_all_mail');
+	$dkim->{selector} = $cfg->get('admin', 'dkim_selector');
+	eval {
+	    $entity = PMG::DKIMSign::sign_entity($entity, $dkim, $sender);
+	};
+	if ($@) {
+	    syslog('warning',
+		"Could not DKIM-Sign local mail, set mail address with domain as "
+		    ."'admin-mail-from': $@",
+	    );
+	}
+    }
+
     return reinject_mail($entity, $sender, $targets, $xforward, $me, $params);
 }
 
-- 
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-24 23:25 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
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 ` Stoiko Ivanov [this message]
2025-02-25 10:32   ` [pmg-devel] [PATCH pmg-api 6/7] reinject_local_mail: sign mails with DKIM based on header 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=20250224232451.399803-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal