From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pmg-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id EAA1C1FF15E for <inbox@lore.proxmox.com>; Tue, 25 Feb 2025 00:25:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E90CD11536; Tue, 25 Feb 2025 00:25:05 +0100 (CET) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pmg-devel@lists.proxmox.com Date: Tue, 25 Feb 2025 00:24:51 +0100 Message-Id: <20250224232451.399803-7-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224232451.399803-1-s.ivanov@proxmox.com> References: <20250224232451.399803-1-s.ivanov@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 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 Subject: [pmg-devel] [PATCH pmg-api 6/7] reinject_local_mail: sign mails with DKIM based on header X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion <pmg-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pmg-devel/> List-Post: <mailto:pmg-devel@lists.proxmox.com> List-Help: <mailto:pmg-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel>, <mailto:pmg-devel-request@lists.proxmox.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" <pmg-devel-bounces@lists.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