From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 0685D73331
for <pve-devel@lists.proxmox.com>; Mon, 5 Jul 2021 20:52:34 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id DFFCD22575
for <pve-devel@lists.proxmox.com>; Mon, 5 Jul 2021 20:52:03 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id B87EF22569
for <pve-devel@lists.proxmox.com>; Mon, 5 Jul 2021 20:52:02 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8214340C50
for <pve-devel@lists.proxmox.com>; Mon, 5 Jul 2021 20:52:02 +0200 (CEST)
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 5 Jul 2021 20:51:50 +0200
Message-Id: <20210705185150.889830-1-s.ivanov@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.520 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH storage] cifs: fix adding storage without
username in the GUI
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 05 Jul 2021 18:52:34 -0000
Currently when trying to add a CIFS storage, without providing a
username and passwort it fails while trying to mount the share, due to
the provided 'username=' parameter (w/o actual username).
I think the issue was introduced in
72385de9e23df9f8e438d74ff783a8075f8d1560
with the extracting of sensitive parameters we (rightly) switched to a
definedness check instead of one for truthyness - but an empty
username/password is defined.
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
PVE/Storage/CIFSPlugin.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm
index 9d69b01..f8e173d 100644
--- a/PVE/Storage/CIFSPlugin.pm
+++ b/PVE/Storage/CIFSPlugin.pm
@@ -157,7 +157,7 @@ sub check_config {
sub on_add_hook {
my ($class, $storeid, $scfg, %param) = @_;
- if (defined($param{password})) {
+ if (defined($param{password}) && $param{password}) {
cifs_set_credentials($param{password}, $storeid);
if (!exists($scfg->{username})) {
warn "ignoring password parameter\n";
@@ -174,7 +174,7 @@ sub on_update_hook {
return if !exists($param{password});
- if (defined($param{password})) {
+ if (defined($param{password}) && $param{password}) {
cifs_set_credentials($param{password}, $storeid);
if (!exists($scfg->{username})) {
warn "ignoring password parameter\n";
--
2.30.2