[PATCH storage 0/2] fix #6050: normalize paths in mount status checks

[PATCH storage 0/2] fix #6050: normalize paths in mount status checks

[David Riley]

Manual edits in the `storage.cfg` can introduce trailing or extra
slashes into storage paths. While these storages mount and function
properly, the kernel normalizes entries in `/proc/mounts` by omitting
trailing slashes. 

As a result, status verification checks in the NFS and CIFS/SMB
Storage Plugin fail due to string mismatches, causing working storages
to continuously report as 'inactive' in both the web UI and via
`pvesm status`.

This series sanitizes the export, share, and subdirectory paths prior
to checking `/proc/mounts`, ensuring active mounts are correctly
recognized.


pve-storage:

David Riley (2):
  fix #6050: nfs: strip trailing slashes from mount status check
  fix #6050: cifs: normalize share and subdir paths for mount and status

 src/PVE/Storage/CIFSPlugin.pm | 32 ++++++++++++++++++++++++++++----
 src/PVE/Storage/NFSPlugin.pm  |  6 +++++-
 2 files changed, 33 insertions(+), 5 deletions(-)


Summary over all repositories:
  2 files changed, 33 insertions(+), 5 deletions(-)

-- 
Generated by murpp 0.11.0

[PATCH pve-storage 1/2] fix #6050: nfs: strip trailing slashes from mount status check

[David Riley]

Manual edits to the storage configuration bypass strict API
validation. If an NFS export path includes a trailing slash, the share
mounts successfully but continuously reports as 'inactive' in both the
web UI and pvesm status.

This occurs because mount status verification compares the
configuration string against the entries in /proc/mounts.

Normalize the export path by stripping trailing slashes prior to
verifying the mount status.

Link: https://bugzilla.proxmox.com/show_bug.cgi?id=6050
Signed-off-by: David Riley <d.riley@proxmox.com>
---
 src/PVE/Storage/NFSPlugin.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/PVE/Storage/NFSPlugin.pm b/src/PVE/Storage/NFSPlugin.pm
index 4cc02c9..6c67848 100644
--- a/src/PVE/Storage/NFSPlugin.pm
+++ b/src/PVE/Storage/NFSPlugin.pm
@@ -2,9 +2,11 @@ package PVE::Storage::NFSPlugin;
 
 use strict;
 use warnings;
+
+use File::Path;
+use File::Spec;
 use IO::File;
 use Net::IP;
-use File::Path;
 
 use PVE::Network;
 use PVE::Tools qw(run_command);
@@ -19,6 +21,8 @@ use base qw(PVE::Storage::Plugin);
 sub nfs_is_mounted {
     my ($server, $export, $mountpoint, $mountdata) = @_;
 
+    $export = File::Spec->canonpath($export);
+
     $server = "[$server]" if Net::IP::ip_is_ipv6($server);
     my $source = "$server:$export";
 
-- 
2.47.3

[PATCH pve-storage 2/2] fix #6050: cifs: normalize share and subdir paths for mount and status

[David Riley]

Manual edits to the storage configuration bypass strict API
validation. If a user adds extra or trailing slashes to the share or
subdirectory paths, it causes two distinct issues for CIFS storages:

* The Linux VFS CIFS module expects strict UNC [0] formatting and
  will reject the mount attempt with a 'Malformed UNC in devname'
  error.
* The internal path used by the status daemon fails to match the
  normalized path reported in /proc/mounts, causing working storages
  to continuously report as 'inactive'.

Sanitize the share and subdirectory strings by stripping leading and
trailing slashes before executing mounts, verifying mount status, and
testing the SMB connection. This ensures working storages mount
successfully and are correctly recognized as active.

[0] https://docs.kernel.org/admin-guide/cifs/usage.html#cifs-vfs-mount-options

Link: https://bugzilla.proxmox.com/show_bug.cgi?id=6050
Signed-off-by: David Riley <d.riley@proxmox.com>
---
 src/PVE/Storage/CIFSPlugin.pm | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/PVE/Storage/CIFSPlugin.pm b/src/PVE/Storage/CIFSPlugin.pm
index 54f0f4e..78ed88c 100644
--- a/src/PVE/Storage/CIFSPlugin.pm
+++ b/src/PVE/Storage/CIFSPlugin.pm
@@ -2,15 +2,20 @@ package PVE::Storage::CIFSPlugin;
 
 use strict;
 use warnings;
+
+use File::Path;
 use Net::IP;
+
 use PVE::Tools qw(run_command);
 use PVE::ProcFSTools;
-use File::Path;
 use PVE::Storage::Plugin;
 use PVE::JSONSchema qw(get_standard_option);
 
 use base qw(PVE::Storage::Plugin);
 
+my $RM_LEADING_SLASHES = qr{^/+};
+my $RM_TRAILING_SLASHES = qr{/+$};
+
 # CIFS helper functions
 
 sub cifs_is_mounted : prototype($$) {
@@ -19,8 +24,16 @@ sub cifs_is_mounted : prototype($$) {
     my ($mountpoint, $server, $share) = $scfg->@{ 'path', 'server', 'share' };
     my $subdir = $scfg->{subdir} // '';
 
+    for my $path ($share, $subdir) {
+        $path =~ s/$RM_LEADING_SLASHES// if $path;
+        $path =~ s/$RM_TRAILING_SLASHES// if $path;
+    }
+
     $server = "[$server]" if Net::IP::ip_is_ipv6($server);
-    my $source = "//${server}/$share$subdir";
+    my $source = "//${server}";
+    $source .= "/$share";
+    $source .= "/$subdir" if $subdir;
+
     $mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
 
     return $mountpoint if grep {
@@ -83,8 +96,15 @@ sub cifs_mount : prototype($$$$$) {
     my ($mountpoint, $server, $share, $options) = $scfg->@{ 'path', 'server', 'share', 'options' };
     my $subdir = $scfg->{subdir} // '';
 
+    for my $path ($share, $subdir) {
+        $path =~ s/$RM_LEADING_SLASHES// if $path;
+        $path =~ s/$RM_TRAILING_SLASHES// if $path;
+    }
+
     $server = "[$server]" if Net::IP::ip_is_ipv6($server);
-    my $source = "//${server}/$share$subdir";
+    my $source = "//${server}";
+    $source .= "/$share";
+    $source .= "/$subdir" if $subdir;
 
     my $cmd = ['/bin/mount', '-t', 'cifs', $source, $mountpoint, '-o', 'soft'];
 
@@ -285,7 +305,11 @@ sub deactivate_storage {
 sub check_connection {
     my ($class, $storeid, $scfg) = @_;
 
-    my $servicename = '//' . $scfg->{server} . '/' . $scfg->{share};
+    my $share = $scfg->{share};
+    $share =~ s/$RM_LEADING_SLASHES// if $share;
+    $share =~ s/$RM_TRAILING_SLASHES// if $share;
+
+    my $servicename = '//' . $scfg->{server} . '/' . $share;
 
     my $cmd = ['/usr/bin/smbclient', $servicename, '-d', '0'];
 
-- 
2.47.3