[pve-devel] [PATCH storage] fix #5008: prevent adding pbs storage with invalid namespace

[Philipp Hufnagl]

Currently, when adding a PBS storage with a namespace that does not
exist, the storage gets added normally, but browsing/using it only
returns a cryptic error message.

This change checks if the namespace entered when adding is valid and
prompts an error if it is not. If no namespace is provided, the storage
will be added without error.

Signed-off-by: Philipp Hufnagl <p.hufn...@proxmox.com>
---
 src/PVE/Storage/PBSPlugin.pm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/PVE/Storage/PBSPlugin.pm b/src/PVE/Storage/PBSPlugin.pm
index 4320974..aceb2c4 100644
--- a/src/PVE/Storage/PBSPlugin.pm
+++ b/src/PVE/Storage/PBSPlugin.pm
@@ -817,6 +817,17 @@ sub scan_datastores {
     return $response;
 }
 
+sub scan_namespaces {
+    my ($scfg, $datastore, $password) = @_;
+
+    my $conn = pbs_api_connect($scfg, $password);
+
+    my $namespaces = eval { 
$conn->get("/api2/json/admin/datastore/$datastore/namespace", {}); };
+    die "error fetching namespaces - $@" if $@;
+
+    return $namespaces;
+}
+
 sub activate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
@@ -826,10 +837,18 @@ sub activate_storage {
     die "$storeid: $@" if $@;
 
     my $datastore = $scfg->{datastore};
+    my $namespace = $scfg->{namespace};
 
     for my $ds (@$datastores) {
        if ($ds->{store} eq $datastore) {
-           return 1;
+           return 1 if !defined($namespace);
+           my $namespaces = eval { scan_namespaces($scfg, $datastore, 
$password) };
+           for my $ns (@$namespaces) {
+               if ($ns->{ns} eq $namespace) {
+                   return 1;
+               }
+           }
+           die "$storeid: Cannot find namespace '$namespace', check 
permissions and existence!\n";
        }
     }
 
-- 
2.39.2



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel