dhcp: dnsmasq: untaint when deleting configuration files

[pve-network.git] / src / PVE / Network / SDN / Dhcp / Dnsmasq.pm

diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
index 58ce387ffd401352ca50b64caa46062b2f5f5c24..2844943e66eedc168857a4357215da50b68e3c3e 100644 (file)
--- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
+++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm
@@ -11,6 +11,8 @@ use PVE::Tools qw(file_set_contents run_command lock_file);
 use File::Copy;
 use Net::DBus;
 
+use PVE::RESTEnvironment qw(log_warn);
+
 my $DNSMASQ_CONFIG_ROOT = '/etc/dnsmasq.d';
 my $DNSMASQ_DEFAULT_ROOT = '/etc/default';
 my $DNSMASQ_LEASE_ROOT = '/var/lib/misc';
@@ -19,6 +21,18 @@ sub type {
     return 'dnsmasq';
 }
 
+my sub assert_dnsmasq_installed {
+    my ($noerr) = @_;
+
+    my $bin_path = "/usr/sbin/dnsmasq";
+    if (!-e $bin_path) {
+       return if $noerr; # just ignore, e.g., in case zone doesn't use DHCP at all
+       log_warn("please install the 'dnsmasq' package in order to use the DHCP feature!");
+       die "cannot reload with missing 'dnsmasq' package\n";
+    }
+    return 1;
+}
+
 sub add_ip_mapping {
     my ($class, $dhcpid, $macdb, $mac, $ip4, $ip6) = @_;
 
@@ -196,7 +210,6 @@ except-interface=lo
 enable-ra
 quiet-ra
 bind-dynamic
-no-resolv
 no-hosts
 dhcp-leasefile=$DNSMASQ_LEASE_ROOT/dnsmasq.$dhcpid.leases
 dhcp-hostsfile=$config_directory/ethers
@@ -221,11 +234,19 @@ CFG
        $default_dnsmasq_config
     );
 
-    unlink glob "$config_directory/10-*.conf";
+    my @config_files = ();
+    PVE::Tools::dir_glob_foreach($config_directory, '10-.*\.conf', sub {
+       my ($file) = @_;
+       push @config_files, "$config_directory/$file";
+    });
+
+    unlink @config_files;
 }
 
 sub after_configure {
-    my ($class, $dhcpid) = @_;
+    my ($class, $dhcpid, $noerr) = @_;
+
+    return if !assert_dnsmasq_installed($noerr);
 
     my $service_name = "dnsmasq\@$dhcpid";
 
@@ -235,7 +256,9 @@ sub after_configure {
 }
 
 sub before_regenerate {
-    my ($class) = @_;
+    my ($class, $noerr) = @_;
+
+    return if !assert_dnsmasq_installed($noerr);
 
     PVE::Tools::run_command(['systemctl', 'stop', "dnsmasq@*"]);
     PVE::Tools::run_command(['systemctl', 'disable', 'dnsmasq@']);