cifs plugin cleanups

[pve-storage.git] / PVE / API2 / Storage / Config.pm

diff --git a/PVE/API2/Storage/Config.pm b/PVE/API2/Storage/Config.pm
index 6c9b3b141727f0bfc7b27f2bef8c64422ad1eacc..7856f45bd3886223998ae54d0f9a14b1547a56a4 100755 (executable)
--- a/PVE/API2/Storage/Config.pm
+++ b/PVE/API2/Storage/Config.pm
@@ -36,6 +36,22 @@ my $api_storage_config = sub {
     return $scfg;
 };
 
+my $cifs_cred_file_name = sub {
+    my ($storeid) = @_;
+
+    return "/etc/pve/priv/${storeid}.cred";
+};
+
+my $set_cifs_credentials = sub {
+    my ($password, $storeid) = @_;
+
+    my $cred_file = $cifs_cred_file_name->($storeid);
+
+    PVE::Tools::file_set_contents($cred_file, "password=$password\n");
+
+    return $cred_file;
+};
+
 __PACKAGE__->register_method ({
     name => 'index', 
     path => '',
@@ -127,6 +143,13 @@ __PACKAGE__->register_method ({
        my $type = extract_param($param, 'type');
        my $storeid = extract_param($param, 'storage');
 
+       # revent an empty nodelist.
+       # fix me in section config create never need an empty entity.
+       delete $param->{nodes} if !$param->{nodes};
+
+       my $password = extract_param($param, 'password')
+           if $type eq 'cifs' && $param->{username};
+
        if ($param->{portal}) {
            $param->{portal} = PVE::Storage::resolv_portal($param->{portal});
        }
@@ -170,6 +193,7 @@ __PACKAGE__->register_method ({
                        if -e $ceph_storage_keyring;
 
                    eval {
+                       mkdir '/etc/pve/priv/ceph';
                        PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
                    };
                    if (my $err = $@) {
@@ -177,11 +201,21 @@ __PACKAGE__->register_method ({
                        die "failed to copy ceph authx keyring for storage '$storeid': $err\n";
                    }
                }
-
-               # try to activate if enabled on local node,
-               # we only do this to detect errors/problems sooner
-               if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) {
-                   PVE::Storage::activate_storage($cfg, $storeid);
+               # create a password file in /etc/pve/priv,
+               # this file is used as a cert_file at mount time.
+               my $cred_file = &$set_cifs_credentials($password, $storeid)
+                   if defined($password);
+
+               eval {
+                   # try to activate if enabled on local node,
+                   # we only do this to detect errors/problems sooner
+                   if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) {
+                       PVE::Storage::activate_storage($cfg, $storeid);
+                   }
+               };
+               if(my $err = $@) {
+                   unlink $cred_file if defined($cred_file);
+                   die $err;
                }
 
                PVE::Storage::write_config($cfg);
@@ -264,7 +298,12 @@ __PACKAGE__->register_method ({
                die "can't remove storage - storage is used as base of another storage\n"
                    if PVE::Storage::storage_is_used($cfg, $storeid);
 
-               if ($scfg->{type} eq 'rbd' && !defined($scfg->{monhost})) {
+               if ($scfg->{type} eq 'cifs')  {
+                   my $cred_file = $cifs_cred_file_name->($storeid);
+                   if (-f $cred_file) {
+                       unlink($cred_file) or warn "removing cifs credientials '$cred_file' failed: $!\n";
+                   }
+               } elsif ($scfg->{type} eq 'rbd' && !defined($scfg->{monhost})) {
                    my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
                    if (-f $ceph_storage_keyring) {
                        unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";