From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 0F1D26BF0B
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 13:00:29 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 05D1E2D279
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:59 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 99A8A2D207
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:56 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 547B746151
for <pbs-devel@lists.proxmox.com>; Thu, 28 Jan 2021 12:59:56 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 28 Jan 2021 12:59:44 +0100
Message-Id: <20210128115955.23136-5-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20210128115955.23136-1-d.csapak@proxmox.com>
References: <20210128115955.23136-1-d.csapak@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.248 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [drive.name, changer.rs, item.name, changer.name, drive.rs]
Subject: [pbs-devel] [PATCH proxmox-backup v2 04/15] api2/config/{drive,
changer}: prevent adding same device multiple times
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 28 Jan 2021 12:00:29 -0000
this check is not perfect since there are often multiple device
nodes per drive/changer, but from the scan api we should return always
the same, so for an api user this should be enough
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/config/changer.rs | 12 ++++++++++--
src/api2/config/drive.rs | 11 +++++++++--
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/src/api2/config/changer.rs b/src/api2/config/changer.rs
index 1b429659..8404d20b 100644
--- a/src/api2/config/changer.rs
+++ b/src/api2/config/changer.rs
@@ -59,8 +59,16 @@ pub fn create_changer(
check_drive_path(&linux_changers, &path)?;
- if config.sections.get(&name).is_some() {
- bail!("Entry '{}' already exists", name);
+ let existing: Vec<ScsiTapeChanger> = config.convert_to_typed_array("changer")?;
+
+ for changer in existing {
+ if changer.name == name {
+ bail!("Entry '{}' already exists", name);
+ }
+
+ if changer.path == path {
+ bail!("Path '{}' already in use by '{}'", path, changer.name);
+ }
}
let item = ScsiTapeChanger {
diff --git a/src/api2/config/drive.rs b/src/api2/config/drive.rs
index 78ebecb3..7d7803d3 100644
--- a/src/api2/config/drive.rs
+++ b/src/api2/config/drive.rs
@@ -56,8 +56,15 @@ pub fn create_drive(param: Value) -> Result<(), Error> {
check_drive_path(&linux_drives, &item.path)?;
- if config.sections.get(&item.name).is_some() {
- bail!("Entry '{}' already exists", item.name);
+ let existing: Vec<LinuxTapeDrive> = config.convert_to_typed_array("linux")?;
+
+ for drive in existing {
+ if drive.name == item.name {
+ bail!("Entry '{}' already exists", item.name);
+ }
+ if drive.path == item.path {
+ bail!("Path '{}' already used in drive '{}'", item.path, drive.name);
+ }
}
config.set_data(&item.name, "linux", &item)?;
--
2.20.1