beenull/raspap-webgui-mirror
1
0
Fork 0
mirror of https://github.com/RaspAP/raspap-webgui.git synced 2024-09-19 19:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixup dhcp cfg save/update

Browse source
This commit is contained in:
billz 2020-11-26 17:20:12 +00:00
parent 827f37385f
commit 5045cbfd33
1 changed files with 51 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
includes/dhcp.php
View file

@ -69,9 +69,9 @@ function SaveDHCPConfig($status)
$return = 1; $return = 1;
if (($_POST['dhcp-iface'] == "1")) { if (($_POST['dhcp-iface'] == "1")) {
$errors = ValidateDHCPInput(); $errors = ValidateDHCPInput();
if (empty($errors)) { if (empty($errors)) {
$return = UpdateDnsmasqCfg($iface,$status); $return = UpdateDHCPConfig($iface,$status);
} else { } else {
$status->addMessage($errors, 'danger'); $status->addMessage($errors, 'danger');
} }
@ -79,12 +79,12 @@ function SaveDHCPConfig($status)
$status->addMessage('Dnsmasq configuration failed to be updated.', 'danger'); $status->addMessage('Dnsmasq configuration failed to be updated.', 'danger');
return false; return false;
} }
$return = UpdateDHCPCfg($iface,$status); $return = UpdateDnsmasqConfig($iface,$status);
// process disable dhcp option // process disable dhcp option
} elseif (($_POST['dhcp-iface'] == "0") && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) { } elseif (($_POST['dhcp-iface'] == "0") && file_exists(RASPI_DNSMASQ_PREFIX.$iface.'.conf')) {
// remove dhcp conf for selected interface // remove dhcp conf for selected interface
$return = RemoveDHCPCfg($iface,$status); $return = RemoveDHCPConfig($iface,$status);
} }
if ($return == 0) { if ($return == 0) {
@ -105,14 +105,16 @@ function ValidateDHCPInput()
) { ) {
$errors .= _('Invalid interface name.').'<br />'.PHP_EOL; $errors .= _('Invalid interface name.').'<br />'.PHP_EOL;
} }
if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/', $_POST['RangeStart']) if (!filter_var($_POST['StaticIP'], FILTER_VALIDATE_IP) && !empty($_POST['StaticIP'])) {
&& !empty($_POST['RangeStart']) $errors .= _('Invalid static IP address.').'<br />'.PHP_EOL;
) { // allow ''/null ? }
if (!filter_var($_POST['DefaultGateway'], FILTER_VALIDATE_IP)) {
$errors .= _('Invalid default gateway.').'<br />'.PHP_EOL;
}
if (!filter_var($_POST['RangeStart'], FILTER_VALIDATE_IP) && !empty($_POST['RangeStart'])) {
$errors .= _('Invalid DHCP range start.').'<br />'.PHP_EOL; $errors .= _('Invalid DHCP range start.').'<br />'.PHP_EOL;
} }
if (!preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\z/', $_POST['RangeEnd']) if (!filter_var($_POST['RangeEnd'], FILTER_VALIDATE_IP) && !empty($_POST['RangeEnd'])) {
&& !empty($_POST['RangeEnd'])
) { // allow ''/null ?
$errors .= _('Invalid DHCP range end.').'<br />'.PHP_EOL; $errors .= _('Invalid DHCP range end.').'<br />'.PHP_EOL;
} }
if (!ctype_digit($_POST['RangeLeaseTime']) && $_POST['RangeLeaseTimeUnits'] !== 'infinite') { if (!ctype_digit($_POST['RangeLeaseTime']) && $_POST['RangeLeaseTimeUnits'] !== 'infinite') {
@ -121,10 +123,13 @@ function ValidateDHCPInput()
if (!in_array($_POST['RangeLeaseTimeUnits'], array('m', 'h', 'd', 'infinite'))) { if (!in_array($_POST['RangeLeaseTimeUnits'], array('m', 'h', 'd', 'infinite'))) {
$errors .= _('Unknown DHCP lease time unit.').'<br />'.PHP_EOL; $errors .= _('Unknown DHCP lease time unit.').'<br />'.PHP_EOL;
} }
if ($_POST['Metric'] !== '' && !ctype_digit($_POST['Metric'])) {
$errors .= _('Invalid metric value, not a number.').'<br />'.PHP_EOL;
}
return $errors; return $errors;
} }
function UpdateDnsmasqCfg($iface,$status) function UpdateDnsmasqConfig($iface,$status)
{ {
$config = 'interface='.$iface.PHP_EOL. $config = 'interface='.$iface.PHP_EOL.
'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd']. 'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].
@ -173,45 +178,46 @@ function UpdateDnsmasqCfg($iface,$status)
return $result; return $result;
} }
function UpdateDHCPCfg($iface,$status) function UpdateDHCPConfig($iface,$status)
{ {
$net_cfg = RASPI_CONFIG_NETWORKING.'/'.$iface.'.ini'; $cfg[] = '# RaspAP '.$iface.' configuration';
if (!file_exists($net_cfg) || filesize($net_cfg) ==0 ) { $cfg[] = 'interface '.$iface;
$status->addMessage('Static IP address for '.$iface.' not found.', 'danger'); $cfg[] = 'static ip_address='.$_POST['StaticIP'];
$status->addMessage('Configure this interface in Networking > '.$iface.'.', 'danger'); if (isset($_POST['DefaultGateway'])) {
$return = 1; $cfg[] = 'static routers='.$_POST['DefaultGateway'];
} else { }
$dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); if ($_POST['DNS1'] !== '' || $_POST['DNS2'] !== '') {
if (!preg_match('/^interface\s'.$iface.'$/m', $dhcp_cfg)) { $cfg[] = 'static domain_name_server='.$_POST['DNS1'].' '.$_POST['DNS2'];
// set dhcp values from ini }
$iface_cfg = parse_ini_file($net_cfg, false, INI_SCANNER_RAW); if ($_POST['Metric'] !== '') {
$ip_address = $iface_cfg['ip_address']; $cfg[] = 'metric '.$_POST['Metric'];
$domain_name_server = ($iface_cfg['domain_name_server'] =='') ? '1.1.1.1 8.8.8.8' : $iface_cfg['domain_name_server']; }
if ($_POST['Fallback'] == 1) {
$cfg[] = 'fallback static_'.$iface;
}
$cfg[] = PHP_EOL;
$cfg = join(PHP_EOL, $cfg);
// append interface config to dhcpcd.conf $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
$cfg = $dhcp_conf;
$cfg[] = '# RaspAP '.$iface.' configuration'; if (!preg_match('/^interface\s'.$iface.'$/m', $dhcp_cfg)) {
$cfg[] = 'interface '.$iface; $dhcp_cfg .= $cfg;
$cfg[] = 'static ip_address='.$ip_address; file_put_contents("/tmp/dhcpddata", $dhcp_cfg);
$cfg[] = 'static domain_name_server='.$domain_name_server; system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $result);
$cfg[] = PHP_EOL; $status->addMessage('DHCP configuration for '.$iface.' added.', 'success');
$cfg = join(PHP_EOL, $cfg); } else {
$dhcp_cfg .= $cfg; $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'\s.*?(?=\s*^\s*$)/ms', $cfg, $dhcp_cfg, 1);
file_put_contents("/tmp/dhcpddata", $dhcp_cfg); file_put_contents("/tmp/dhcpddata", rtrim($dhcp_cfg).PHP_EOL);
system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $result); $status->addMessage('DHCP configuration for '.$iface.' updated.', 'success');
$status->addMessage('DHCP configuration for '.$iface.' added.', 'success');
} else {
$status->addMessage('DHCP for '.$iface.' already enabled.', 'success');
}
} }
return $result; return $result;
} }
function RemoveDHCPCfg($iface,$status) function RemoveDHCPConfig($iface,$status)
{ {
$dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG);
$dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'.*\n(.*\n){3}/m', '', $dhcp_cfg); $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$iface.'\s.*?(?=\s*^\s*$)/ms', '', $dhcp_cfg, 1);
file_put_contents("/tmp/dhcpddata", rtrim($dhcp_cfg).PHP_EOL); file_put_contents("/tmp/dhcpddata", rtrim($dhcp_cfg).PHP_EOL.PHP_EOL);
system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $result); system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $result);
if ($result == 0) { if ($result == 0) {
$status->addMessage('DHCP configuration for '.$iface.' removed.', 'success'); $status->addMessage('DHCP configuration for '.$iface.' removed.', 'success');
@ -219,7 +225,7 @@ function RemoveDHCPCfg($iface,$status)
$status->addMessage('Failed to remove DHCP configuration for '.$iface.'.', 'danger'); $status->addMessage('Failed to remove DHCP configuration for '.$iface.'.', 'danger');
return $result; return $result;
} }
// remove dnsmasq eth0 conf // remove dnsmasq conf
system('sudo rm '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $result); system('sudo rm '.RASPI_DNSMASQ_PREFIX.$iface.'.conf', $result);
if ($result == 0) { if ($result == 0) {
$status->addMessage('Dnsmasq configuration for '.$iface.' removed.', 'success'); $status->addMessage('Dnsmasq configuration for '.$iface.' removed.', 'success');
@ -229,3 +235,4 @@ function RemoveDHCPCfg($iface,$status)
return $result; return $result;
} }