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 7BCF378911 for ; Wed, 29 Jun 2022 11:08:44 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 72ED01B937 for ; Wed, 29 Jun 2022 11:08:44 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 for ; Wed, 29 Jun 2022 11:08:42 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 9217DF520; Wed, 29 Jun 2022 11:08:35 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 7E8CC19B46D; Wed, 29 Jun 2022 11:08:35 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 29 Jun 2022 11:08:29 +0200 Message-Id: <20220629090833.456340-3-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220629090833.456340-1-aderumier@odiso.com> References: <20220629090833.456340-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.025 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-firewall 1/1] move clone_vmfw_conf && remove_vmfw_conf to a Helpers 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: Wed, 29 Jun 2022 09:08:44 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/Firewall.pm | 25 ---------------------- src/PVE/Firewall/Helpers.pm | 41 +++++++++++++++++++++++++++++++++++++ src/PVE/Firewall/Makefile | 12 +++++++++++ src/PVE/Makefile | 2 ++ 4 files changed, 55 insertions(+), 25 deletions(-) create mode 100644 src/PVE/Firewall/Helpers.pm create mode 100644 src/PVE/Firewall/Makefile diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm index 71746d2..e6cf4cd 100644 --- a/src/PVE/Firewall.pm +++ b/src/PVE/Firewall.pm @@ -3340,31 +3340,6 @@ sub save_vmfw_conf { } } -sub remove_vmfw_conf { - my ($vmid) = @_; - - my $vmfw_conffile = "$pvefw_conf_dir/$vmid.fw"; - - unlink $vmfw_conffile; -} - -sub clone_vmfw_conf { - my ($vmid, $newid) = @_; - - my $sourcevm_conffile = "$pvefw_conf_dir/$vmid.fw"; - my $clonevm_conffile = "$pvefw_conf_dir/$newid.fw"; - - lock_vmfw_conf($newid, 10, sub { - if (-f $clonevm_conffile) { - unlink $clonevm_conffile; - } - if (-f $sourcevm_conffile) { - my $data = PVE::Tools::file_get_contents($sourcevm_conffile); - PVE::Tools::file_set_contents($clonevm_conffile, $data); - } - }); -} - sub read_vm_firewall_configs { my ($cluster_conf, $vmdata, $dir) = @_; diff --git a/src/PVE/Firewall/Helpers.pm b/src/PVE/Firewall/Helpers.pm new file mode 100644 index 0000000..3112ebc --- /dev/null +++ b/src/PVE/Firewall/Helpers.pm @@ -0,0 +1,41 @@ +package PVE::Firewall::Helpers; + +use strict; +use warnings; + +use PVE::Tools qw(file_get_contents file_set_contents); + +use base 'Exporter'; +our @EXPORT_OK = qw( +remove_vmfw_conf +clone_vmfw_conf +); + +my $pvefw_conf_dir = "/etc/pve/firewall"; + +sub remove_vmfw_conf { + my ($vmid) = @_; + + my $vmfw_conffile = "$pvefw_conf_dir/$vmid.fw"; + + unlink $vmfw_conffile; +} + +sub clone_vmfw_conf { + my ($vmid, $newid) = @_; + + my $sourcevm_conffile = "$pvefw_conf_dir/$vmid.fw"; + my $clonevm_conffile = "$pvefw_conf_dir/$newid.fw"; + + lock_vmfw_conf($newid, 10, sub { + if (-f $clonevm_conffile) { + unlink $clonevm_conffile; + } + if (-f $sourcevm_conffile) { + my $data = file_get_contents($sourcevm_conffile); + file_set_contents($clonevm_conffile, $data); + } + }); +} + +1; \ No newline at end of file diff --git a/src/PVE/Firewall/Makefile b/src/PVE/Firewall/Makefile new file mode 100644 index 0000000..1707cb5 --- /dev/null +++ b/src/PVE/Firewall/Makefile @@ -0,0 +1,12 @@ +DESTDIR= +PREFIX=/usr +PERLDIR=${DESTDIR}/${PREFIX}/share/perl5 + +SOURCES=Helpers.pm + +.PHONY: install +install: ${SOURCES} + install -d -m 0755 ${PERLDIR}/PVE/Firewall + for i in ${SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/Firewall/$$i; done + +clean: diff --git a/src/PVE/Makefile b/src/PVE/Makefile index 9fdfd9b..4edde9e 100644 --- a/src/PVE/Makefile +++ b/src/PVE/Makefile @@ -14,9 +14,11 @@ install: for i in ${LIB_SOURCES}; do install -D -m 0644 $$i ${PERLDIR}/PVE/$$i; done make -C API2 install make -C Service install + make -C Firewall install .PHONY: clean clean: rm -rf *~ make -C API2 clean make -C Service clean + make -C Firewall clean -- 2.30.2