matthieu/pve-network
1
0
Fork 0
forked from Mirror/pve-network
Code Pull requests Activity

ipam: move mac-cache.db to unprivileged sdn/ subdirectory

Browse source 
follows commit:
0f48bc6 ("ipam: move state file of PVE plugin over to common sdn directory")
as far as reasoning goes, and also closely code-wise (if only to make
the clean-up with PVE 9.0 a bit more straight-forward):
files in priv/ are sensitive in the sense that access there can be
used to hijack (external systems) - the mac-cache can be kept next to
the remaining sdn-config.

minimally tested on my machine.
depends on the pve-cluster commit sent with this.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2024-11-18 21:55:37 +01:00 committed by Thomas Lamprecht
parent 89dfb8f879
commit 478e17c7e0
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/PVE/Network/SDN/Ipams.pm
View file

@ -20,9 +20,34 @@ PVE::Network::SDN::Ipams::NetboxPlugin->register();
PVE::Network::SDN::Ipams::PhpIpamPlugin->register(); PVE::Network::SDN::Ipams::PhpIpamPlugin->register();
PVE::Network::SDN::Ipams::Plugin->init(); PVE::Network::SDN::Ipams::Plugin->init();
my $macdb_filename = 'priv/macs.db'; my $macdb_filename = "sdn/mac-cache.json";
my $macdb_filename_legacy = 'priv/macs.db';
cfs_register_file($macdb_filename, \&json_reader, \&json_writer); cfs_register_file(
$macdb_filename,
sub {
my ($filename , $data) = @_;
if (defined($data)) {
return json_reader($filename, $data);
} else {
# TODO: remove legacy cache file handling with PVE 9+ after ensuring all call sites got
# switched over.
return cfs_read_file($macdb_filename_legacy);
}
},
sub {
my ($filename , $data) = @_;
# TODO: remove below with PVE 9+, add a pve8to9 check to allow doing so.
if (-e $macdb_filename_legacy && -e $macdb_filename) {
# only clean-up if we succeeded to write the new path at least once
unlink $macdb_filename_legacy or $!{ENOENT} or warn "failed to unlink legacy MAC cache - $!\n";
}
return json_writer->($filename, $data);
}
);
# drop reading $macdb_filename_legacy with PVE 9+ - for now do not write it anymore.
cfs_register_file($macdb_filename_legacy, \&json_reader, undef);
sub json_reader { sub json_reader {
my ($filename, $data) = @_; my ($filename, $data) = @_;