From 64736d64cc2a93c7d1a4cb3037aac03944344952 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 2 Nov 2020 08:23:55 +0000
Subject: [PATCH 01/17] Closes #701

---
 installers/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installers/common.sh b/installers/common.sh
index 7fddc414..4d4a03e9 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -266,7 +266,7 @@ function _prompt_install_openvpn() {
 function _install_openvpn() {
     _install_log "Installing OpenVPN and enabling client configuration"
     echo "Adding packages via apt-get"
-    sudo apt-get install $apt_option openvpn || _install_status 1 "Unable to install openvpn"
+    sudo apt-get install -y openvpn || _install_status 1 "Unable to install openvpn"
     sudo sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php"
     echo "Enabling openvpn-client service on boot"
     sudo systemctl enable openvpn-client@client || _install_status 1 "Unable to enable openvpn-client daemon"

From 6ca12a184b525be9bfdccb0068815e31c1f63e2a Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 4 Nov 2020 01:05:35 +0000
Subject: [PATCH 02/17] Add DHCP for eth0 option to advanced tab

---
 templates/dhcp/advanced.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index 6366977c..eeec4a2d 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -4,7 +4,6 @@
   <div class="row">
     <div class="col-md-6">
       <h5><?php echo _("Upstream DNS servers") ?></h5>
-
       <div class="input-group">
         <input type="hidden" name="no-resolv" value="0">
         <div class="custom-control custom-switch">
@@ -48,6 +47,22 @@
           <?php echo optionsForSelect(dnsServers()) ?>
         </select>
       </div>
+
+      <h5><?php echo _("DHCP for eth0") ?></h5>
+      <div class="input-group">
+        <input type="hidden" name="dchp-eth0" value="0">
+        <div class="custom-control custom-switch">
+          <input class="custom-control-input" id="dchp-eth0" type="checkbox" name="dhcp-eth0" value="1" <?php echo $conf['dhcp-eth0'] ? ' checked="checked"' : "" ?> aria-describedby="dhcp-eth0-description">
+          <label class="custom-control-label" for="dhcp-eth"><?php echo _("Enable DHCP for wired ethernet") ?></label>
+        </div>
+        <p id="dhcp-eth0-description">
+          <small><?php echo _("Enable this option if you want RaspAP to provide IP addresses and connectivity to clients connected to the wired ethernet interface (eth0).") ?></small>
+          <br><small class="text-muted"><?php echo _("This option enables an additional <code>eth0</code> configuration to DHCP and dnsmasq.") ?></small>
+        </p>
+      </div>
+
+
+
     </div>
 
     <template id="dhcp-upstream-server">

From 06af0795f62f0bb2534081fbe65e1dddd1410466 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 6 Nov 2020 09:01:33 +0000
Subject: [PATCH 03/17] Add /bin/cp for 090_eth0.conf to sudoers

---
 installers/raspap.sudoers | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers
index ae42393c..2109bece 100644
--- a/installers/raspap.sudoers
+++ b/installers/raspap.sudoers
@@ -21,6 +21,7 @@ www-data ALL=(ALL) NOPASSWD:/bin/systemctl disable openvpn-client@client
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/ovpnclient.ovpn /etc/openvpn/client/client.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/authdata /etc/openvpn/client/login.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_raspap.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_eth0.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dhcpcd.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now
 www-data ALL=(ALL) NOPASSWD:/sbin/reboot

From a20877c377e6ed67af56bc523bf8e9c1ced13d87 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 6 Nov 2020 09:04:22 +0000
Subject: [PATCH 04/17] Add RASPI_DNSMASQ_ETH0 to default config

---
 config/config.php     | 1 +
 includes/defaults.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/config.php b/config/config.php
index 030df874..90b96247 100755
--- a/config/config.php
+++ b/config/config.php
@@ -11,6 +11,7 @@ define('RASPI_CACHE_PATH', sys_get_temp_dir() . '/raspap');
 // These are typical for default RPi installs. Modify if needed.
 define('RASPI_DNSMASQ_CONFIG', '/etc/dnsmasq.d/090_raspap.conf');
 define('RASPI_DNSMASQ_LEASES', '/var/lib/misc/dnsmasq.leases');
+define('RASPI_DNSMASQ_ETH0', '/etc/dnsmasq.d/090_eth0.conf');
 define('RASPI_ADBLOCK_LISTPATH', '/etc/raspap/adblock/');
 define('RASPI_ADBLOCK_CONFIG', '/etc/dnsmasq.d/090_adblock.conf');
 define('RASPI_HOSTAPD_CONFIG', '/etc/hostapd/hostapd.conf');
diff --git a/includes/defaults.php b/includes/defaults.php
index fb543d43..b69ef2aa 100755
--- a/includes/defaults.php
+++ b/includes/defaults.php
@@ -16,6 +16,7 @@ $defaults = [
   // These are typical for default RPi installs. Modify if needed.
   'RASPI_DNSMASQ_CONFIG' => '/etc/dnsmasq.d/090_raspap.conf',
   'RASPI_DNSMASQ_LEASES' => '/var/lib/misc/dnsmasq.leases',
+  'RASPI_DNSMASQ_ETH0' => '/etc/dnsmasq.d/090_eth0.conf',
   'RASPI_ADBLOCK_LISTPATH' => '/etc/raspap/adblock/',
   'RASPI_ADBLOCK_CONFIG' => '/etc/dnsmasq.d/090_adblock.conf',
   'RASPI_HOSTAPD_CONFIG' => '/etc/hostapd/hostapd.conf',

From ab05bf15c79c3d1f61748d74d99e5d3143ae2220 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Fri, 6 Nov 2020 09:05:43 +0000
Subject: [PATCH 05/17] Use dchp_eth0 to set toggle state

---
 templates/dhcp/advanced.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index eeec4a2d..6d507416 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -52,17 +52,14 @@
       <div class="input-group">
         <input type="hidden" name="dchp-eth0" value="0">
         <div class="custom-control custom-switch">
-          <input class="custom-control-input" id="dchp-eth0" type="checkbox" name="dhcp-eth0" value="1" <?php echo $conf['dhcp-eth0'] ? ' checked="checked"' : "" ?> aria-describedby="dhcp-eth0-description">
-          <label class="custom-control-label" for="dhcp-eth"><?php echo _("Enable DHCP for wired ethernet") ?></label>
+          <input class="custom-control-input" id="dhcp-eth0" type="checkbox" name="dhcp-eth0" value="1" <?php echo $dhcp_eth0 ? ' checked="checked"' : "" ?> aria-describedby="dhcp-eth0-description">
+          <label class="custom-control-label" for="dhcp-eth0"><?php echo _("Enable DHCP for wired ethernet") ?></label>
         </div>
         <p id="dhcp-eth0-description">
-          <small><?php echo _("Enable this option if you want RaspAP to provide IP addresses and connectivity to clients connected to the wired ethernet interface (eth0).") ?></small>
+          <small><?php echo _("Enable this option if you want RaspAP to provide IP addresses and connectivity to clients on the wired ethernet interface (eth0).") ?></small>
           <br><small class="text-muted"><?php echo _("This option enables an additional <code>eth0</code> configuration to DHCP and dnsmasq.") ?></small>
         </p>
       </div>
-
-
-
     </div>
 
     <template id="dhcp-upstream-server">

From 3e101e4c55437ef0c8ee5f040196db1b7655a71a Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 9 Nov 2020 17:46:19 +0000
Subject: [PATCH 06/17] Add /bin/rm 090_eth0.conf to sudoers

---
 installers/raspap.sudoers | 1 +
 1 file changed, 1 insertion(+)

diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers
index 2109bece..21ed9371 100644
--- a/installers/raspap.sudoers
+++ b/installers/raspap.sudoers
@@ -22,6 +22,7 @@ www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/ovpnclient.ovpn /etc/openvpn/client/cli
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/authdata /etc/openvpn/client/login.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_raspap.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_eth0.conf
+www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/dnsmasq.d/090_eth0.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dhcpcd.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now
 www-data ALL=(ALL) NOPASSWD:/sbin/reboot

From 0049518769e95d5dd35f6c3cd227b250e858f5be Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 9 Nov 2020 17:46:55 +0000
Subject: [PATCH 07/17] Minor: update label

---
 templates/dhcp/advanced.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index 6d507416..bd158f27 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -57,7 +57,7 @@
         </div>
         <p id="dhcp-eth0-description">
           <small><?php echo _("Enable this option if you want RaspAP to provide IP addresses and connectivity to clients on the wired ethernet interface (eth0).") ?></small>
-          <br><small class="text-muted"><?php echo _("This option enables an additional <code>eth0</code> configuration to DHCP and dnsmasq.") ?></small>
+          <br><small class="text-muted"><?php echo _("This option enables an additional <code>eth0</code> configuration for DHCP and dnsmasq.") ?></small>
         </p>
       </div>
     </div>

From 6d14cbaee57cad280b1b921a274fea3cc432ccdc Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 9 Nov 2020 17:48:32 +0000
Subject: [PATCH 08/17] Handle dhcp for eth0, udpdate dhcpcd + dnsmasq.conf

---
 includes/dhcp.php | 44 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 39 insertions(+), 5 deletions(-)

diff --git a/includes/dhcp.php b/includes/dhcp.php
index b1838214..4af64bce 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -81,15 +81,46 @@ function DisplayDHCPConfig()
 
                 $config .= "log-facility=/tmp/dnsmasq.log".PHP_EOL;
                 $config .= "conf-dir=/etc/dnsmasq.d".PHP_EOL;
-
                 file_put_contents("/tmp/dnsmasqdata", $config);
-                system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_CONFIG, $return);
+
+                // handle DHCP for eth0 option
+                if ($_POST['dhcp-eth0'] == "1" && $_POST['interface'] == "eth0") {
+                    $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
+                    if (!preg_match('/inteface eth0/', $dhcp_cnf)) {
+                        // set dhcp values from ini, fallback to default if undefined
+                        $eth0_cfg = parse_ini_file(RASPI_CONFIG_NETWORKING.'/eth0.ini', false, INI_SCANNER_RAW);
+                        $ip_address = ($eth0_cfg['ip_address'] == '') ? '172.16.10.1/24' : $eth0_cfg['ip_address'];
+                        $domain_name_server = ($eth0_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $eth0_cfg['domain_name_server'];
+
+                        // append eth0 config to dhcpcd.conf
+                        $cfg = $dhcp_conf;
+                        $cfg[] = '# RaspAP '.$_POST['interface'].' configuration';
+                        $cfg[] = 'interface '.$_POST['interface'];
+                        $cfg[] = 'static ip_address='.$ip_address;
+                        $cfg[] = 'static domain_name_server='.$domain_name_server;
+                        $cfg[] = PHP_EOL;
+                        $cfg = join(PHP_EOL, $cfg);
+                        $dhcp_cfg .= $cfg;
+                        file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
+                        system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return);
+                        $status->addMessage('DHCP configuration for eth0 added.', 'success');
+                    }
+                    system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_ETH0, $return);
+                    $status->addMessage('Dnsmasq configuration for eth0 added.', 'success');
+                } elseif (!isset($_POST['dhcp-eth0']) && file_exists(RASPI_DNSMASQ_ETH0)) {
+                    // todo: remove dhcpcd eth0 conf
+                    system('sudo rm '.RASPI_DNSMASQ_ETH0, $return);
+                    $status->addMessage('Dnsmasq configuration for eth0 removed.', 'success');
+                } else {
+                    system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_CONFIG, $return);
+                }
+
             } else {
                 $status->addMessage($errors, 'danger');
             }
 
             if ($return == 0) {
-                $status->addMessage('Dnsmasq configuration updated successfully', 'success');
+                $status->addMessage('Dnsmasq configuration updated successfully.', 'success');
             } else {
                 $status->addMessage('Dnsmasq configuration failed to be updated.', 'danger');
             }
@@ -176,7 +207,9 @@ function DisplayDHCPConfig()
             break;
         }
     }
-
+    if (file_exists(RASPI_DNSMASQ_ETH0)) {
+        $dhcp_eth0 = 1;
+    }
     exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
     exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
 
@@ -198,7 +231,8 @@ function DisplayDHCPConfig()
             "conf",
             "dhcpHost",
             "interfaces",
-            "leases"
+            "leases",
+            "dhcp_eth0"
         )
     );
 }

From e5f1d4ed0eef98376574f43358ce0af75c60586a Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Wed, 11 Nov 2020 12:40:22 +0000
Subject: [PATCH 09/17] Safe write dhcpcd.conf, validate static IP, handle
 revert cfg

---
 includes/dhcp.php | 56 +++++++++++++++++++++++++++++------------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/includes/dhcp.php b/includes/dhcp.php
index 4af64bce..ff5505f0 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -85,30 +85,44 @@ function DisplayDHCPConfig()
 
                 // handle DHCP for eth0 option
                 if ($_POST['dhcp-eth0'] == "1" && $_POST['interface'] == "eth0") {
-                    $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
-                    if (!preg_match('/inteface eth0/', $dhcp_cnf)) {
-                        // set dhcp values from ini, fallback to default if undefined
-                        $eth0_cfg = parse_ini_file(RASPI_CONFIG_NETWORKING.'/eth0.ini', false, INI_SCANNER_RAW);
-                        $ip_address = ($eth0_cfg['ip_address'] == '') ? '172.16.10.1/24' : $eth0_cfg['ip_address'];
-                        $domain_name_server = ($eth0_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $eth0_cfg['domain_name_server'];
+                    if (!file_exists(RASPI_CONFIG_NETWORKING.'/eth0.ini') || filesize(RASPI_CONFIG_NETWORKING.'/eth0.ini') ==0 ) {
+                        $status->addMessage('Static IP address for eth0 not found.', 'danger');
+                        $status->addMessage('Configure this interface in Networking > eth0.', 'danger');
+                        $return = 1;
+                    } else {
+                        $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
+                        if (!preg_match('/^interface\seth0$/m', $dhcp_cfg)) {
+                            // set dhcp values from ini
+                            $eth0_cfg = parse_ini_file(RASPI_CONFIG_NETWORKING.'/eth0.ini', false, INI_SCANNER_RAW);
+                            $ip_address = $eth0_cfg['ip_address'];
+                            $domain_name_server = ($eth0_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $eth0_cfg['domain_name_server'];
 
-                        // append eth0 config to dhcpcd.conf
-                        $cfg = $dhcp_conf;
-                        $cfg[] = '# RaspAP '.$_POST['interface'].' configuration';
-                        $cfg[] = 'interface '.$_POST['interface'];
-                        $cfg[] = 'static ip_address='.$ip_address;
-                        $cfg[] = 'static domain_name_server='.$domain_name_server;
-                        $cfg[] = PHP_EOL;
-                        $cfg = join(PHP_EOL, $cfg);
-                        $dhcp_cfg .= $cfg;
-                        file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
-                        system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return);
-                        $status->addMessage('DHCP configuration for eth0 added.', 'success');
+                            // append eth0 config to dhcpcd.conf
+                            $cfg = $dhcp_conf;
+                            $cfg[] = '# RaspAP '.$_POST['interface'].' configuration';
+                            $cfg[] = 'interface '.$_POST['interface'];
+                            $cfg[] = 'static ip_address='.$ip_address;
+                            $cfg[] = 'static domain_name_server='.$domain_name_server;
+                            $cfg[] = PHP_EOL;
+                            $cfg = join(PHP_EOL, $cfg);
+                            $dhcp_cfg .= $cfg;
+                            file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
+                            system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return);
+                            $status->addMessage('DHCP configuration for eth0 added.', 'success');
+                            system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_ETH0, $return);
+                            $status->addMessage('Dnsmasq configuration for eth0 added.', 'success');
+                        } else {
+                            $status->addMessage('DHCP for '.$_POST['interface'].' already enabled.', 'danger');
+                        }
                     }
-                    system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_ETH0, $return);
-                    $status->addMessage('Dnsmasq configuration for eth0 added.', 'success');
                 } elseif (!isset($_POST['dhcp-eth0']) && file_exists(RASPI_DNSMASQ_ETH0)) {
-                    // todo: remove dhcpcd eth0 conf
+                    // remove dhcpcd eth0 conf
+                    $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
+                    $dhcp_cfg = preg_replace('/^#\sRaspAP\seth0.*(\n.*){3,}/m', '', $dhcp_cfg);
+                    file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
+                    system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return);
+                    $status->addMessage('DHCP configuration for eth0 removed.', 'success');
+                    // remove dnsmasq eth0 conf
                     system('sudo rm '.RASPI_DNSMASQ_ETH0, $return);
                     $status->addMessage('Dnsmasq configuration for eth0 removed.', 'success');
                 } else {

From e54e8b5bc0999ef391412ff0383bba9733fbcc57 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sun, 15 Nov 2020 10:51:09 +0000
Subject: [PATCH 10/17] Update const RASPI_DNSMASQ_PREFIX

---
 config/config.php     | 2 +-
 includes/defaults.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/config.php b/config/config.php
index 90b96247..d80c8038 100755
--- a/config/config.php
+++ b/config/config.php
@@ -11,7 +11,7 @@ define('RASPI_CACHE_PATH', sys_get_temp_dir() . '/raspap');
 // These are typical for default RPi installs. Modify if needed.
 define('RASPI_DNSMASQ_CONFIG', '/etc/dnsmasq.d/090_raspap.conf');
 define('RASPI_DNSMASQ_LEASES', '/var/lib/misc/dnsmasq.leases');
-define('RASPI_DNSMASQ_ETH0', '/etc/dnsmasq.d/090_eth0.conf');
+define('RASPI_DNSMASQ_PREFIX', '/etc/dnsmasq.d/090_');
 define('RASPI_ADBLOCK_LISTPATH', '/etc/raspap/adblock/');
 define('RASPI_ADBLOCK_CONFIG', '/etc/dnsmasq.d/090_adblock.conf');
 define('RASPI_HOSTAPD_CONFIG', '/etc/hostapd/hostapd.conf');
diff --git a/includes/defaults.php b/includes/defaults.php
index b69ef2aa..e6ecab74 100755
--- a/includes/defaults.php
+++ b/includes/defaults.php
@@ -16,7 +16,7 @@ $defaults = [
   // These are typical for default RPi installs. Modify if needed.
   'RASPI_DNSMASQ_CONFIG' => '/etc/dnsmasq.d/090_raspap.conf',
   'RASPI_DNSMASQ_LEASES' => '/var/lib/misc/dnsmasq.leases',
-  'RASPI_DNSMASQ_ETH0' => '/etc/dnsmasq.d/090_eth0.conf',
+  'RASPI_DNSMASQ_PREFIX' => '/etc/dnsmasq.d/090_',
   'RASPI_ADBLOCK_LISTPATH' => '/etc/raspap/adblock/',
   'RASPI_ADBLOCK_CONFIG' => '/etc/dnsmasq.d/090_adblock.conf',
   'RASPI_HOSTAPD_CONFIG' => '/etc/hostapd/hostapd.conf',

From 17da7cfcab0c6130a6a5ebe744107683b8d39623 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sun, 15 Nov 2020 10:51:51 +0000
Subject: [PATCH 11/17] Move enable DHCP option to general tab

---
 templates/dhcp/advanced.php | 13 -------------
 templates/dhcp/general.php  | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index bd158f27..fda2eb00 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -47,19 +47,6 @@
           <?php echo optionsForSelect(dnsServers()) ?>
         </select>
       </div>
-
-      <h5><?php echo _("DHCP for eth0") ?></h5>
-      <div class="input-group">
-        <input type="hidden" name="dchp-eth0" value="0">
-        <div class="custom-control custom-switch">
-          <input class="custom-control-input" id="dhcp-eth0" type="checkbox" name="dhcp-eth0" value="1" <?php echo $dhcp_eth0 ? ' checked="checked"' : "" ?> aria-describedby="dhcp-eth0-description">
-          <label class="custom-control-label" for="dhcp-eth0"><?php echo _("Enable DHCP for wired ethernet") ?></label>
-        </div>
-        <p id="dhcp-eth0-description">
-          <small><?php echo _("Enable this option if you want RaspAP to provide IP addresses and connectivity to clients on the wired ethernet interface (eth0).") ?></small>
-          <br><small class="text-muted"><?php echo _("This option enables an additional <code>eth0</code> configuration for DHCP and dnsmasq.") ?></small>
-        </p>
-      </div>
     </div>
 
     <template id="dhcp-upstream-server">
diff --git a/templates/dhcp/general.php b/templates/dhcp/general.php
index e4023392..45b01c64 100644
--- a/templates/dhcp/general.php
+++ b/templates/dhcp/general.php
@@ -12,6 +12,22 @@
       </select>
     </div>
   </div>
+
+  <div class="row">
+    <div class="form-group col-md-6">
+      <div class="input-group">
+        <input type="hidden" name="dhcp-iface" value="0">
+        <div class="custom-control custom-switch">
+          <input class="custom-control-input" id="dhcp-iface" type="checkbox" name="dhcp-iface" value="1" <?php echo $dhcp_iface_enable ? ' checked="checked"' : "" ?> aria-describedby="dhcp-iface-description">
+          <label class="custom-control-label" for="dhcp-iface"><?php echo _("Enable DHCP for this interface") ?></label>
+        </div>
+        <p id="dhcp-iface-description">
+          <small><?php echo _("Enable this option if you want RaspAP assign IP addresses on the selected interface.") ?></small>
+        </p>
+      </div>
+     </div>
+  </div>
+
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Starting IP Address"); ?></label>

From d440dd805c9f063f06332365e1c4e4b89eed7f98 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sun, 15 Nov 2020 10:55:01 +0000
Subject: [PATCH 12/17] Update sudoers /etc/dnsmasq.d/

---
 installers/raspap.sudoers | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/installers/raspap.sudoers b/installers/raspap.sudoers
index 21ed9371..69262f1a 100644
--- a/installers/raspap.sudoers
+++ b/installers/raspap.sudoers
@@ -21,8 +21,8 @@ www-data ALL=(ALL) NOPASSWD:/bin/systemctl disable openvpn-client@client
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/ovpnclient.ovpn /etc/openvpn/client/client.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/authdata /etc/openvpn/client/login.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_raspap.conf
-www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_eth0.conf
-www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/dnsmasq.d/090_eth0.conf
+www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dnsmasqdata /etc/dnsmasq.d/090_*.conf
+www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/dnsmasq.d/090_*.conf
 www-data ALL=(ALL) NOPASSWD:/bin/cp /tmp/dhcpddata /etc/dhcpcd.conf
 www-data ALL=(ALL) NOPASSWD:/sbin/shutdown -h now
 www-data ALL=(ALL) NOPASSWD:/sbin/reboot

From daa6b877e65c5a94dec5a1ff7dac2e3279aa0da5 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Sun, 15 Nov 2020 10:55:33 +0000
Subject: [PATCH 13/17] Enable DHCP option for all interfaces

---
 includes/dhcp.php | 49 +++++++++++++++++++++++++----------------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/includes/dhcp.php b/includes/dhcp.php
index ff5505f0..449cdad1 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -83,21 +83,23 @@ function DisplayDHCPConfig()
                 $config .= "conf-dir=/etc/dnsmasq.d".PHP_EOL;
                 file_put_contents("/tmp/dnsmasqdata", $config);
 
-                // handle DHCP for eth0 option
-                if ($_POST['dhcp-eth0'] == "1" && $_POST['interface'] == "eth0") {
-                    if (!file_exists(RASPI_CONFIG_NETWORKING.'/eth0.ini') || filesize(RASPI_CONFIG_NETWORKING.'/eth0.ini') ==0 ) {
-                        $status->addMessage('Static IP address for eth0 not found.', 'danger');
-                        $status->addMessage('Configure this interface in Networking > eth0.', 'danger');
+                $iface = $_POST['interface'];
+                // handle DHCP for selected interface option
+                if ($_POST['dhcp-iface'] == "1") {
+                    $net_cfg = RASPI_CONFIG_NETWORKING.'/'.$iface.'.ini';
+                    if (!file_exists($net_cfg) || filesize($net_cfg) ==0 ) {
+                        $status->addMessage('Static IP address for '.$iface.' not found.', 'danger');
+                        $status->addMessage('Configure this interface in Networking > '.$iface.'.', 'danger');
                         $return = 1;
                     } else {
                         $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
-                        if (!preg_match('/^interface\seth0$/m', $dhcp_cfg)) {
+                        if (!preg_match('/^interface\s'.$iface.'$/m', $dhcp_cfg)) {
                             // set dhcp values from ini
-                            $eth0_cfg = parse_ini_file(RASPI_CONFIG_NETWORKING.'/eth0.ini', false, INI_SCANNER_RAW);
-                            $ip_address = $eth0_cfg['ip_address'];
-                            $domain_name_server = ($eth0_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $eth0_cfg['domain_name_server'];
+                            $iface_cfg = parse_ini_file($net_cfg, false, INI_SCANNER_RAW);
+                            $ip_address = $iface_cfg['ip_address'];
+                            $domain_name_server = ($iface_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $iface_cfg['domain_name_server'];
 
-                            // append eth0 config to dhcpcd.conf
+                            // append interface config to dhcpcd.conf
                             $cfg = $dhcp_conf;
                             $cfg[] = '# RaspAP '.$_POST['interface'].' configuration';
                             $cfg[] = 'interface '.$_POST['interface'];
@@ -108,23 +110,24 @@ function DisplayDHCPConfig()
                             $dhcp_cfg .= $cfg;
                             file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
                             system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return);
-                            $status->addMessage('DHCP configuration for eth0 added.', 'success');
-                            system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_ETH0, $return);
-                            $status->addMessage('Dnsmasq configuration for eth0 added.', 'success');
+                            $status->addMessage('DHCP configuration for '.$iface.' added.', 'success');
+                            system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $return);
+                            $status->addMessage('Dnsmasq configuration for '.$iface.' added.', 'success');
                         } else {
-                            $status->addMessage('DHCP for '.$_POST['interface'].' already enabled.', 'danger');
+                            $status->addMessage('DHCP for '.$iface.' already enabled.', 'danger');
                         }
                     }
-                } elseif (!isset($_POST['dhcp-eth0']) && file_exists(RASPI_DNSMASQ_ETH0)) {
-                    // remove dhcpcd eth0 conf
+                } elseif (($_POST['dhcp-iface'] == "0") && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) {
+                    // remove dhcp conf for selected interface
                     $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
-                    $dhcp_cfg = preg_replace('/^#\sRaspAP\seth0.*(\n.*){3,}/m', '', $dhcp_cfg);
+                    // todo: improve by removing extra blank lines
+                    $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'.*\n(.*\n){3}/m', '', $dhcp_cfg);
                     file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
                     system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return);
-                    $status->addMessage('DHCP configuration for eth0 removed.', 'success');
+                    $status->addMessage('DHCP configuration for '.$iface.'  removed.', 'success');
                     // remove dnsmasq eth0 conf
-                    system('sudo rm '.RASPI_DNSMASQ_ETH0, $return);
-                    $status->addMessage('Dnsmasq configuration for eth0 removed.', 'success');
+                    system('sudo rm '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $return);
+                    $status->addMessage('Dnsmasq configuration for '.$iface.' removed.', 'success');
                 } else {
                     system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_CONFIG, $return);
                 }
@@ -221,8 +224,8 @@ function DisplayDHCPConfig()
             break;
         }
     }
-    if (file_exists(RASPI_DNSMASQ_ETH0)) {
-        $dhcp_eth0 = 1;
+    if (file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) {
+        $dhcp_iface_enable = 1;
     }
     exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
     exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
@@ -246,7 +249,7 @@ function DisplayDHCPConfig()
             "dhcpHost",
             "interfaces",
             "leases",
-            "dhcp_eth0"
+            "dhcp_iface_enable"
         )
     );
 }

From 3b5c7805cb57dc0ba93f5a473340b01ee335d047 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 16 Nov 2020 18:18:51 +0000
Subject: [PATCH 14/17] Initial commit: AJAX get_netcfg

---
 ajax/networking/get_netcfg.php | 41 ++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 ajax/networking/get_netcfg.php

diff --git a/ajax/networking/get_netcfg.php b/ajax/networking/get_netcfg.php
new file mode 100644
index 00000000..f2e735a4
--- /dev/null
+++ b/ajax/networking/get_netcfg.php
@@ -0,0 +1,41 @@
+<?php
+
+require '../../includes/csrf.php';
+require_once '../../includes/config.php';
+
+$interface = $_GET['iface'];
+
+if (isset($interface)) {
+    exec('cat '. RASPI_DNSMASQ_PREFIX.$interface.'.conf', $return);
+    $conf = ParseConfig($return);
+
+    // populate data 
+    $dhcpdata['DHCPEnabled'] = empty($conf) ? false : true;
+    $arrRange = explode(",", $conf['dhcp-range']);
+    $dhcpdata['RangeStart'] = $arrRange[0];
+    $dhcpdata['RangeEnd'] = $arrRange[1];
+    $dhcpdata['RangeMask'] = $arrRange[2];
+    $dhcpdata['leaseTime'] = $arrRange[3];
+    $dhcpHost = $conf["dhcp-host"];
+    $dhcpHost = empty($dhcpHost) ? [] : $dhcpHost;
+    $dhcpdata['dhcpHost'] = is_array($dhcpHost) ? $dhcpHost : [ $dhcpHost ];
+    $upstreamServers = is_array($conf['server']) ? $conf['server'] : [ $conf['server'] ];
+    $dhcpdata['upstreamServers'] = array_filter($upstreamServers);
+
+    preg_match('/([0-9]*)([a-z])/i', $dhcpdata['leaseTime'], $arrRangeLeaseTime);
+    $dhcpdata['leaseTime'] = $arrRangeLeaseTime[1];
+    $dhcpdata['leaseTimeInterval'] = $arrRangeLeaseTime[2];
+
+    if (isset($conf['dhcp-option'])) {
+        $arrDns = explode(",", $conf['dhcp-option']);
+        if ($arrDns[0] == '6') {
+            if (count($arrDns) > 1) {
+                $dhcpdata['DNS1'] = $arrDns[1];
+            }
+            if (count($arrDns) > 2) {
+                $dhcpdata['DNS2'] = $arrDns[2];
+            }
+        }
+    }
+    echo json_encode($dhcpdata);
+}

From e0235d640a534ec8c7e74205ba6ee88c942d013f Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 16 Nov 2020 18:19:40 +0000
Subject: [PATCH 15/17] Added loadInterfaceDHCPSelect()

---
 app/js/custom.js | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/js/custom.js b/app/js/custom.js
index 0a35d917..0d8ce7f6 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -236,9 +236,28 @@ function loadWifiStations(refresh) {
             .load('ajax/networking/wifi_stations.php'+qs, complete);
     };
 }
-
 $(".js-reload-wifi-stations").on("click", loadWifiStations(true));
 
+
+function loadInterfaceDHCP(selected) {
+
+}
+
+function loadInterfaceDHCPSelect() {
+    var interface = $('#cbxdhcpiface').val();
+    console.log(interface);
+    $.get('ajax/networking/get_netcfg.php?iface='+interface,function(data){
+        jsonData = JSON.parse(data);
+        $('#dhcp-iface')[0].checked = jsonData.DHCPEnabled;
+        $('#txtrangestart').val(jsonData.RangeStart);
+        $('#txtrangeend').val(jsonData.RangeEnd);
+        $('#txtrangeleasetime').val(jsonData.leaseTime);
+        $('#txtdns1').val(jsonData.DNS1);
+        $('#txtdns2').val(jsonData.DNS2);
+        $('#cbxrangeleasetimeunits').val(jsonData.leaseTimeInterval);
+    });
+}
+
 function loadChannel() {
     $.get('ajax/networking/get_channel.php',function(data){
         jsonData = JSON.parse(data);

From 0f8e7b88b78e9db66fc1a51c768493c67f6bb5c6 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 16 Nov 2020 18:20:39 +0000
Subject: [PATCH 16/17] Add IDs to form elements for ajax

---
 templates/dhcp/general.php | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/templates/dhcp/general.php b/templates/dhcp/general.php
index 45b01c64..e2782cf4 100644
--- a/templates/dhcp/general.php
+++ b/templates/dhcp/general.php
@@ -3,13 +3,7 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code">Interface</label>
-      <select class="form-control" name="interface">
-        <?php foreach ($interfaces as $if) : ?>
-          <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
-          <?php $selected  = $if === $conf['interface'] ? ' selected="selected"' : '' ?>
-          <option value="<?php echo $if_quoted ?>"<?php echo $selected ?>><?php echo $if_quoted ?></option>
-        <?php endforeach ?>
-      </select>
+        <?php SelectorOptions('interface', $interfaces, $conf['interface'], 'cbxdhcpiface', 'loadInterfaceDHCPSelect', $DHCPDisabled); ?>
     </div>
   </div>
 
@@ -22,7 +16,7 @@
           <label class="custom-control-label" for="dhcp-iface"><?php echo _("Enable DHCP for this interface") ?></label>
         </div>
         <p id="dhcp-iface-description">
-          <small><?php echo _("Enable this option if you want RaspAP assign IP addresses on the selected interface.") ?></small>
+          <small><?php echo _("Enable this option if you want RaspAP to assign IP addresses on the selected interface.") ?></small>
         </p>
       </div>
      </div>
@@ -31,29 +25,29 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Starting IP Address"); ?></label>
-      <input type="text" class="form-control"name="RangeStart" value="<?php echo htmlspecialchars($RangeStart, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtrangestart" name="RangeStart" value="<?php echo htmlspecialchars($RangeStart, ENT_QUOTES); ?>" />
     </div>
   </div>
 
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("Ending IP Address"); ?></label>
-      <input type="text" class="form-control" name="RangeEnd" value="<?php echo htmlspecialchars($RangeEnd, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtrangeend" name="RangeEnd" value="<?php echo htmlspecialchars($RangeEnd, ENT_QUOTES); ?>" />
     </div>
   </div>
 
   <div class="row">
     <div class="form-group col-xs-3 col-sm-3">
       <label for="code"><?php echo _("Lease Time"); ?></label>
-      <input type="text" class="form-control" name="RangeLeaseTime" value="<?php echo htmlspecialchars($arrRangeLeaseTime[1], ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtrangeleasetime" name="RangeLeaseTime" value="<?php echo htmlspecialchars($arrRangeLeaseTime[1], ENT_QUOTES); ?>" />
     </div>
     <div class="col-xs-3 col-sm-3">
       <label for="code"><?php echo _("Interval"); ?></label>
-      <select name="RangeLeaseTimeUnits" class="form-control" >
-        <option value="m"<?php echo $mselected; ?>><?php echo _("Minute(s)"); ?></option>
-        <option value="h"<?php echo $hselected; ?>><?php echo _("Hour(s)"); ?></option>
-        <option value="d"<?php echo $dselected; ?>><?php echo _("Day(s)"); ?></option>
-        <option value="infinite"<?php echo $infiniteselected; ?>><?php echo _("Infinite"); ?></option>
+      <select id="cbxrangeleasetimeunits" name="RangeLeaseTimeUnits" class="form-control" >
+        <option value="m"><?php echo _("Minute(s)"); ?></option>
+        <option value="h"><?php echo _("Hour(s)"); ?></option>
+        <option value="d"><?php echo _("Day(s)"); ?></option>
+        <option value="infinite"><?php echo _("Infinite"); ?></option>
       </select>
     </div>
   </div>
@@ -61,14 +55,14 @@
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("DNS Server"); ?> 1</label>
-      <input type="text" class="form-control"name="DNS1" value="<?php echo htmlspecialchars($DNS1, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtdns1" name="DNS1" value="<?php echo htmlspecialchars($DNS1, ENT_QUOTES); ?>" />
     </div>
   </div>
 
   <div class="row">
     <div class="form-group col-md-6">
       <label for="code"><?php echo _("DNS Server"); ?> 2</label>
-      <input type="text" class="form-control" name="DNS2" value="<?php echo htmlspecialchars($DNS2, ENT_QUOTES); ?>" />
+      <input type="text" class="form-control" id="txtdns2" name="DNS2" value="<?php echo htmlspecialchars($DNS2, ENT_QUOTES); ?>" />
     </div>
   </div>
 

From 209d74136373c462ad70aa38569f21f189243c17 Mon Sep 17 00:00:00 2001
From: billz <billzimmerman@gmail.com>
Date: Mon, 16 Nov 2020 18:21:31 +0000
Subject: [PATCH 17/17] Remove parse DHCP, moved to AJAX handler

---
 includes/dhcp.php | 64 +----------------------------------------------
 1 file changed, 1 insertion(+), 63 deletions(-)

diff --git a/includes/dhcp.php b/includes/dhcp.php
index 449cdad1..e498b962 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -176,57 +176,6 @@ function DisplayDHCPConfig()
     }
 
     $serviceStatus = $dnsmasq_state ? "up" : "down";
-
-    exec('cat '. RASPI_DNSMASQ_CONFIG, $return);
-    $conf = ParseConfig($return);
-    $arrRange = explode(",", $conf['dhcp-range']);
-    $RangeStart = $arrRange[0];
-    $RangeEnd = $arrRange[1];
-    $RangeMask = $arrRange[2];
-    $leaseTime = $arrRange[3];
-    $dhcpHost = $conf["dhcp-host"];
-    $dhcpHost = empty($dhcpHost) ? [] : $dhcpHost;
-    $dhcpHost = is_array($dhcpHost) ? $dhcpHost : [ $dhcpHost ];
-    $upstreamServers = is_array($conf['server']) ? $conf['server'] : [ $conf['server'] ];
-    $upstreamServers = array_filter($upstreamServers);
-
-    $DNS1 = '';
-    $DNS2 = '';
-    if (isset($conf['dhcp-option'])) {
-        $arrDns = explode(",", $conf['dhcp-option']);
-        if ($arrDns[0] == '6') {
-            if (count($arrDns) > 1) {
-                $DNS1 = $arrDns[1];
-            }
-            if (count($arrDns) > 2) {
-                $DNS2 = $arrDns[2];
-            }
-        }
-    }
-  
-    $hselected = '';
-    $mselected = '';
-    $dselected = '';
-    $infiniteselected = '';
-    preg_match('/([0-9]*)([a-z])/i', $leaseTime, $arrRangeLeaseTime);
-    if ($leaseTime === 'infinite') {
-        $infiniteselected = ' selected="selected"';
-    } else {
-        switch ($arrRangeLeaseTime[2]) {
-        case 'h':
-            $hselected = ' selected="selected"';
-            break;
-        case 'm':
-            $mselected = ' selected="selected"';
-            break;
-        case 'd':
-            $dselected = ' selected="selected"';
-            break;
-        }
-    }
-    if (file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) {
-        $dhcp_iface_enable = 1;
-    }
     exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
     exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
 
@@ -234,22 +183,11 @@ function DisplayDHCPConfig()
         "dhcp", compact(
             "status",
             "serviceStatus",
-            "RangeStart",
-            "RangeEnd",
-            "DNS1",
-            "DNS2",
-            "upstreamServers",
-            "arrRangeLeaseTime",
-            "mselected",
-            "hselected",
-            "dselected",
-            "infiniteselected",
             "dnsmasq_state",
             "conf",
             "dhcpHost",
             "interfaces",
-            "leases",
-            "dhcp_iface_enable"
+            "leases"
         )
     );
 }