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 4E6481FF15E for <inbox@lore.proxmox.com>; Tue, 25 Feb 2025 11:47:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E3581A801; Tue, 25 Feb 2025 11:47:46 +0100 (CET) Message-ID: <3a3f677b-6008-41ca-b123-91af8b4eb537@proxmox.com> Date: Tue, 25 Feb 2025 11:47:42 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Stoiko Ivanov <s.ivanov@proxmox.com>, pmg-devel@lists.proxmox.com References: <20250224232451.399803-1-s.ivanov@proxmox.com> <20250224232451.399803-7-s.ivanov@proxmox.com> Content-Language: en-US From: Dominik Csapak <d.csapak@proxmox.com> In-Reply-To: <20250224232451.399803-7-s.ivanov@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [postfix.org, utils.pm] Subject: Re: [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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" <pmg-devel-bounces@lists.proxmox.com> shouldn't this patch check if '$sender' is empty or 'postmaster'/'<postmaster>' before trying to sign? otherwise we now will always run into an error if 'dkim-use-domain' isn't set? (since we'll split on @ on the sender and die for e.g. 'postmaster') or am I missing something here? On 2/25/25 00:24, Stoiko Ivanov wrote: > 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); > } > _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel