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 24F6A992B8 for ; Thu, 16 Nov 2023 10:46:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0062B10F70 for ; Thu, 16 Nov 2023 10:45:59 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Thu, 16 Nov 2023 10:45:59 +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 116CC436A2 for ; Thu, 16 Nov 2023 10:45:59 +0100 (CET) Date: Thu, 16 Nov 2023 10:45:58 +0100 (CET) From: Christian Ebner To: Proxmox VE development discussion , Philipp Hufnagl Message-ID: <362595018.3899.1700127958077@webmail.proxmox.com> In-Reply-To: <20231115160042.177037-5-p.hufnagl@proxmox.com> References: <20231115160042.177037-1-p.hufnagl@proxmox.com> <20231115160042.177037-5-p.hufnagl@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev54 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH storage v2 4/4] pbs: fix #5008: Check if datastore and namespace is valid on add- and update hooks X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Nov 2023 09:46:30 -0000 > On 15.11.2023 17:00 CET Philipp Hufnagl wrote: > > > This adds a check if the datastore and the namespace is valid when a > user attempts to add a new PBS datastore. > > Since the namespace only can be checked after the datastore is > validated, the datastore will be checked as well, regardless that it > will be done later in the superclass anyway. > > The functionallity to check namespaces is added with this commit. For > checking the datastore, existing code that has previously been > refactored will be reused > > Signed-off-by: Philipp Hufnagl > --- > src/PVE/Storage/PBSPlugin.pm | 43 +++++++++++++++++++++++++++++++++++- > 1 file changed, 42 insertions(+), 1 deletion(-) > > diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm > index 104fe15..fff8bb2 100644 > --- a/src/PVE/Storage/PBSPlugin.pm > +++ b/src/PVE/Storage/PBSPlugin.pm > @@ -566,6 +566,11 @@ sub on_add_hook { > pbs_delete_master_pubkey($scfg, $storeid); > } > > + my $password = pbs_get_password($scfg, $storeid); > + my $conn = pbs_api_connect($scfg, $password); > + check_datastore_exists($class, $storeid, $scfg, $password, $conn); > + check_namespace_exists($class, $storeid, $scfg, $password, $conn); > + > return $res; > } > > @@ -614,6 +619,11 @@ sub on_update_hook { > } > } > > + my $password = pbs_get_password($scfg, $storeid); > + my $conn = pbs_api_connect($scfg, $password); > + check_datastore_exists($class, $storeid, $scfg, $password, $conn); > + check_namespace_exists($class, $storeid, $scfg, $password, $conn); > + > return $res; > } > > @@ -819,6 +829,20 @@ sub scan_datastores { > > return $response; > } > + > +sub scan_namespaces { > + my ($scfg, $datastore, $password, $conn) = @_; > + > + if (!defined($conn)){ > + $conn = pbs_api_connect($scfg, $password); > + } This can be written more compactly as: $conn = pbs_api_connect($scfg, $password) if !defined($conn); > + > + my $namespaces = eval { $conn->get("/api2/json/admin/datastore/$datastore/namespace", {}); }; > + die "error fetching namespaces - $@" if $@; > + > + return $namespaces; > +} > + > sub check_datastore_exists { > my ($class, $storeid, $scfg, $password, $conn) = @_; > > @@ -831,10 +855,27 @@ sub check_datastore_exists { > return 1; > } > } > - > die "$storeid: Cannot find datastore '$datastore', check permissions and existence!\n"; > } > > +sub check_namespace_exists { > + my ($class, $storeid, $scfg, $password, $conn) = @_; > + > + my $datastore = $scfg->{datastore}; > + my $namespace = $scfg->{namespace}; > + > + my $namespaces = eval { scan_namespaces($scfg, $datastore, $password) }; > + die "$storeid: $@" if $@; > + return 1 if !defined($namespace); You can move this before the call to scan_namespaces, no need to fetch them if there is nothing to compare to to begin with. > + > + for my $ns (@$namespaces) { > + if ($ns->{ns} eq $namespace) { > + return 1; > + } > + } > + die "$storeid: Cannot find namespace '$namespace', check permissions and existence!\n"; > +} > + > sub activate_storage { > my ($class, $storeid, $scfg, $cache) = @_; > > -- > 2.39.2 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel