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 1CCF26B67E for ; Wed, 17 Mar 2021 11:02:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1AF612BD16 for ; Wed, 17 Mar 2021 11:02:21 +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 1DD6A2BCFA for ; Wed, 17 Mar 2021 11:02:20 +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 DD7EE42718 for ; Wed, 17 Mar 2021 11:02:19 +0100 (CET) From: Wolfgang Bumiller To: pmg-devel@lists.proxmox.com Date: Wed, 17 Mar 2021 11:02:15 +0100 Message-Id: <20210317100216.8008-4-w.bumiller@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210317100216.8008-1-w.bumiller@proxmox.com> References: <20210317100216.8008-1-w.bumiller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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. [nodeconfig.pm, certificates.pm] Subject: [pmg-devel] [PATCH api 3/4] add PMG::NodeConfig::filter_domains_by_type helper 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: Wed, 17 Mar 2021 10:02:21 -0000 for reuse The private $filter_domains is still there to do the in-place modification it did before. Signed-off-by: Wolfgang Bumiller --- src/PMG/API2/Certificates.pm | 12 ++++-------- src/PMG/NodeConfig.pm | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/src/PMG/API2/Certificates.pm b/src/PMG/API2/Certificates.pm index 775d575..b50addd 100644 --- a/src/PMG/API2/Certificates.pm +++ b/src/PMG/API2/Certificates.pm @@ -468,17 +468,13 @@ my $order_certificate = sub { my $filter_domains = sub { my ($acme_config, $type) = @_; - my $domains = $acme_config->{domains}; - foreach my $domain (sort keys %$domains) { - my $entry = $domains->{$domain}; - if (!(grep { $_ eq $type } PVE::Tools::split_list($entry->{usage}))) { - delete $domains->{$domain}; - } - } + my $domains = PMG::NodeConfig::filter_domains_by_type($acme_config->{domains}, $type); - if (!%$domains) { + if (!$domains) { raise("No domains configured for type '$type'\n", 400); } + + $acme_config->{domains} = $domains; }; __PACKAGE__->register_method ({ diff --git a/src/PMG/NodeConfig.pm b/src/PMG/NodeConfig.pm index 84c2141..19d23c3 100644 --- a/src/PMG/NodeConfig.pm +++ b/src/PMG/NodeConfig.pm @@ -222,4 +222,23 @@ sub get_acme_conf { return $res; } +# Helper to filter the domains hash. Returns `undef` if the list is empty. +sub filter_domains_by_type : prototype($$) { + my ($domains, $type) = @_; + + return undef if !$domains || !%$domains; + + my $out = {}; + + foreach my $domain (keys %$domains) { + my $entry = $domains->{$domain}; + if (grep { $_ eq $type } PVE::Tools::split_list($entry->{usage})) { + $out->{$domain} = $entry; + } + } + + return undef if !%$out; + return $out; +} + 1; -- 2.20.1