From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6F5558B74A for ; Mon, 24 Oct 2022 12:02:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 501DD1807F for ; Mon, 24 Oct 2022 12:02:24 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 24 Oct 2022 12:02:23 +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 E972B44B58 for ; Mon, 24 Oct 2022 12:02:22 +0200 (CEST) From: Leo Nunner To: pve-devel@lists.proxmox.com Date: Mon, 24 Oct 2022 12:02:01 +0200 Message-Id: <20221024100202.44338-2-l.nunner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024100202.44338-1-l.nunner@proxmox.com> References: <20221024100202.44338-1-l.nunner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.188 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 firewall 1/1] fix #4268: add 'force' parameter to delete IPSet with members X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Oct 2022 10:02:24 -0000 Currently, trying to delete a non-empty IPSet will throw an error. Manually deleting all members of the set might be a time-consuming process, which the force parameter allows to bypass. Signed-off-by: Leo Nunner --- src/PVE/API2/Firewall/IPSet.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/Firewall/IPSet.pm b/src/PVE/API2/Firewall/IPSet.pm index ec9326f..a5f69e9 100644 --- a/src/PVE/API2/Firewall/IPSet.pm +++ b/src/PVE/API2/Firewall/IPSet.pm @@ -132,6 +132,11 @@ sub register_delete_ipset { my $properties = $class->additional_parameters(); $properties->{name} = get_standard_option('ipset-name'); + $properties->{force} = { + type => 'boolean', + optional => 1, + description => 'Delete all members of the IPSet, if there are any.', + }; $class->register_method({ name => 'delete_ipset', @@ -154,7 +159,7 @@ sub register_delete_ipset { my ($cluster_conf, $fw_conf, $ipset) = $class->load_config($param); die "IPSet '$param->{name}' is not empty\n" - if scalar(@$ipset); + if scalar(@$ipset) && !$param->{force}; $class->save_ipset($param, $fw_conf, undef); -- 2.30.2