yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CIFSPlugin.pm: fix crediential handling using new on_update_hook

Browse Source
This commit is contained in:
Dietmar Maurer
2020-02-20 12:33:59 +01:00
committed by Thomas Lamprecht
parent 0ff4cfead1
commit e2fc55b413
1 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
PVE/Storage/CIFSPlugin.pm
View File

@ -34,6 +34,15 @@ sub cifs_cred_file_name {
return "/etc/pve/priv/${storeid}.cred"; return "/etc/pve/priv/${storeid}.cred";
} }
sub cifs_delete_credentials {
my ($storeid) = @_;
my $cred_file = cifs_cred_file_name($storeid);
if (-f $cred_file) {
unlink($cred_file) or warn "removing cifs credientials '$cred_file' failed: $!\n";
}
}
sub cifs_set_credentials { sub cifs_set_credentials {
my ($password, $storeid) = @_; my ($password, $storeid) = @_;
@ -145,18 +154,29 @@ sub check_config {
sub on_add_hook { sub on_add_hook {
my ($class, $storeid, $scfg, %param) = @_; my ($class, $storeid, $scfg, %param) = @_;
if (my $password = $param{password}) { if (defined($param{password})) {
cifs_set_credentials($password, $storeid); cifs_set_credentials($param{password}, $storeid);
} else {
cifs_delete_credentials($storeid);
}
}
sub on_update_hook {
my ($class, $storeid, $scfg, %param) = @_;
return if !exists($param{password});
if (defined($param{password})) {
cifs_set_credentials($param{password}, $storeid);
} else {
cifs_delete_credentials($storeid);
} }
} }
sub on_delete_hook { sub on_delete_hook {
my ($class, $storeid, $scfg) = @_; my ($class, $storeid, $scfg) = @_;
my $cred_file = cifs_cred_file_name($storeid); cifs_delete_credentials($storeid);
if (-f $cred_file) {
unlink($cred_file) or warn "removing cifs credientials '$cred_file' failed: $!\n";
}
} }
sub status { sub status {