From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 41F7E63FA4 for ; Thu, 29 Oct 2020 11:06:18 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 334C027466 for ; Thu, 29 Oct 2020 11:05:48 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BB87327458 for ; Thu, 29 Oct 2020 11:05:47 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7AB5745F89; Thu, 29 Oct 2020 11:05:47 +0100 (CET) Date: Thu, 29 Oct 2020 11:05:46 +0100 From: Stoiko Ivanov To: Daniel Berteaud Cc: pmg-devel@lists.proxmox.com Message-ID: <20201029110546.54b268a6@rosa.proxmox.com> In-Reply-To: <20201028102015.628005-2-daniel@firewall-services.com> References: <20201028102015.628005-1-daniel@firewall-services.com> <20201028102015.628005-2-daniel@firewall-services.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.099 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [dkimsign.pm] Subject: Re: [pmg-devel] [PATCH v2 pmg-api 1/1] [pmg-api] fix #3098 sort domains by length first X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Oct 2020 10:06:18 -0000 Thanks for adapting your patch and trying it out! LGTM - I quickly tested it on my test-system with some syntetic test-domains - it works as I'd expect it to: Reviewed-By: Stoiko Ivanov Tested-By: Stoiko Ivanov On Wed, 28 Oct 2020 11:20:15 +0100 Daniel Berteaud wrote: > So if we have a sub domain and its parent in the list, the correct one will be returned > > Signed-off-by: Daniel Berteaud > --- > src/PMG/DKIMSign.pm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/PMG/DKIMSign.pm b/src/PMG/DKIMSign.pm > index 7cb06a6..08197f8 100644 > --- a/src/PMG/DKIMSign.pm > +++ b/src/PMG/DKIMSign.pm > @@ -69,7 +69,9 @@ sub signing_domain { > my $dkimdomains = PVE::INotify::read_file('dkimdomains'); > $dkimdomains = PVE::INotify::read_file('domains') if !scalar(%$dkimdomains); > > - foreach my $domain (sort keys %$dkimdomains) { > + # Sort domains by length first, so if we have both a sub domain and its parent > + # the correct one will be returned > + foreach my $domain (sort { length($b) <=> length($a) || $a cmp $b} keys %$dkimdomains) { > if ( $input_domain =~ /\Q$domain\E$/i ) { > $self->domain($domain); > return 1;