pbs: allow setting up a master key

[pve-storage.git] / PVE / Storage / NFSPlugin.pm

diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm
index 554823be3ee63da5d2859d81bf0661bd0efc5230..39bf15a2b164ca7d284ab05ec7d8d5e5ea6b7c31 100644 (file)
--- a/PVE/Storage/NFSPlugin.pm
+++ b/PVE/Storage/NFSPlugin.pm
@@ -3,7 +3,12 @@ package PVE::Storage::NFSPlugin;
 use strict;
 use warnings;
 use IO::File;
+use Net::IP;
 use File::Path;
+
+use PVE::Network;
+use PVE::Tools qw(run_command);
+use PVE::ProcFSTools;
 use PVE::Storage::Plugin;
 use PVE::JSONSchema qw(get_standard_option);
 
@@ -11,36 +16,25 @@ use base qw(PVE::Storage::Plugin);
 
 # NFS helper functions
 
-sub read_proc_mounts {
-    
-    local $/; # enable slurp mode
-    
-    my $data = "";
-    if (my $fd = IO::File->new("/proc/mounts", "r")) {
-       $data = <$fd>;
-       close ($fd);
-    }
-
-    return $data;
-}
-
 sub nfs_is_mounted {
     my ($server, $export, $mountpoint, $mountdata) = @_;
 
+    $server = "[$server]" if Net::IP::ip_is_ipv6($server);
     my $source = "$server:$export";
 
-    $mountdata = read_proc_mounts() if !$mountdata;
-
-    if ($mountdata =~ m|^$source/?\s$mountpoint\snfs|m) {
-       return $mountpoint;
-    } 
-
+    $mountdata = PVE::ProcFSTools::parse_proc_mounts() if !$mountdata;
+    return $mountpoint if grep {
+       $_->[2] =~ /^nfs/ &&
+       $_->[0] =~ m|^\Q$source\E/?$| &&
+       $_->[1] eq $mountpoint
+    } @$mountdata;
     return undef;
 }
 
 sub nfs_mount {
     my ($server, $export, $mountpoint, $options) = @_;
 
+    $server = "[$server]" if Net::IP::ip_is_ipv6($server);
     my $source = "$server:$export";
 
     my $cmd = ['/bin/mount', '-t', 'nfs', $source, $mountpoint];
@@ -59,7 +53,7 @@ sub type {
 
 sub plugindata {
     return {
-       content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1},
+       content => [ { images => 1, rootdir => 1, vztmpl => 1, iso => 1, backup => 1, snippets => 1 },
                     { images => 1 }],
        format => [ { raw => 1, qcow2 => 1, vmdk => 1 } , 'raw' ],
     };
@@ -87,12 +81,15 @@ sub options {
        path => { fixed => 1 },
        server => { fixed => 1 },
        export => { fixed => 1 },
-        nodes => { optional => 1 },
+       nodes => { optional => 1 },
        disable => { optional => 1 },
-        maxfiles => { optional => 1 },
+       maxfiles => { optional => 1 },
+       'prune-backups' => { optional => 1 },
        options => { optional => 1 },
        content => { optional => 1 },
        format => { optional => 1 },
+       mkdir => { optional => 1 },
+       bwlimit => { optional => 1 },
     };
 }
 
@@ -110,7 +107,8 @@ sub check_config {
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+       if !$cache->{mountdata};
 
     my $path = $scfg->{path};
     my $server = $scfg->{server};
@@ -124,18 +122,16 @@ sub status {
 sub activate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+       if !$cache->{mountdata};
 
     my $path = $scfg->{path};
     my $server = $scfg->{server};
     my $export = $scfg->{export};
 
-    if (!nfs_is_mounted($server, $export, $path, $cache->{mountdata})) {    
-                   
-       # NOTE: only call mkpath when not mounted (avoid hang 
-       # when NFS server is offline 
-                   
-       mkpath $path;
+    if (!nfs_is_mounted($server, $export, $path, $cache->{mountdata})) {
+       # NOTE: only call mkpath when not mounted (avoid hang when NFS server is offline
+       mkpath $path if !(defined($scfg->{mkdir}) && !$scfg->{mkdir});
 
        die "unable to activate storage '$storeid' - " .
            "directory '$path' does not exist\n" if ! -d $path;
@@ -149,7 +145,8 @@ sub activate_storage {
 sub deactivate_storage {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    $cache->{mountdata} = read_proc_mounts() if !$cache->{mountdata};
+    $cache->{mountdata} = PVE::ProcFSTools::parse_proc_mounts()
+       if !$cache->{mountdata};
 
     my $path = $scfg->{path};
     my $server = $scfg->{server};
@@ -161,4 +158,43 @@ sub deactivate_storage {
     }
 }
 
+sub check_connection {
+    my ($class, $storeid, $scfg) = @_;
+
+    my $server = $scfg->{server};
+    my $opts = $scfg->{options};
+
+    my $cmd;
+    if (defined($opts) && $opts =~ /vers=4.*/) {
+       my $ip = PVE::JSONSchema::pve_verify_ip($server, 1);
+       if (!defined($ip)) {
+           $ip = PVE::Network::get_ip_from_hostname($server);
+       }
+
+       my $transport = PVE::JSONSchema::pve_verify_ipv4($ip, 1) ? 'tcp' : 'tcp6';
+
+       # nfsv4 uses a pseudo-filesystem always beginning with /
+       # no exports are listed
+       $cmd = ['/usr/sbin/rpcinfo', '-T', $transport, $ip, 'nfs', '4'];
+    } else {
+       $cmd = ['/sbin/showmount', '--no-headers', '--exports', $server];
+    }
+
+    eval { run_command($cmd, timeout => 10, outfunc => sub {}, errfunc => sub {}) };
+    if (my $err = $@) {
+       return 0;
+    }
+
+    return 1;
+}
+
+sub get_volume_notes {
+    my $class = shift;
+    PVE::Storage::DirPlugin::get_volume_notes($class, @_);
+}
+sub update_volume_notes {
+    my $class = shift;
+    PVE::Storage::DirPlugin::update_volume_notes($class, @_);
+}
+
 1;