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

Added function validateDnsmasqInput() + update saveDHCPConfig

Browse source
This commit is contained in:
billz 2024-01-12 12:21:56 +00:00
parent effa38c0a0
commit f778cd78a7
1 changed files with 40 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
includes/dhcp.php
View file

@ -108,9 +108,18 @@ function saveDHCPConfig($status)
return false; return false;
} }
if (($_POST['dhcp-iface'] == "1")) { if (($_POST['dhcp-iface'] == "1") || (isset($_POST['mac']))) {
$return = updateDnsmasqConfig($iface,$status); $errors = validateDnsmasqInput();
if (empty($errors)) {
$return = updateDnsmasqConfig($iface,$status);
} else {
foreach ($errors as $error) {
$status->addMessage($error, 'danger');
}
$return = 1;
}
} }
if ($return == 0) { if ($return == 0) {
$status->addMessage('Dnsmasq configuration updated successfully.', 'success'); $status->addMessage('Dnsmasq configuration updated successfully.', 'success');
} else { } else {
@ -179,6 +188,34 @@ function compareIPs($ip1, $ip2)
return $ipu1 > $ipu2; return $ipu1 > $ipu2;
} }
/**
* Validates Dnsmasq user input from the $_POST object
*
* @return array $errors
*/
function validateDnsmasqInput()
{
$errors = [];
$encounteredIPs = [];
if (isset($_POST["static_leases"]["mac"])) {
for ($i=0; $i < count($_POST["static_leases"]["mac"]); $i++) {
$mac = trim($_POST["static_leases"]["mac"][$i]);
$ip = trim($_POST["static_leases"]["ip"][$i]);
if (!validateMac($mac)) {
$errors[] = _('Invalid MAC address: '.$mac);
}
if (in_array($ip, $encounteredIPs)) {
$errors[] = _('Duplicate IP address entered: ' . $ip);
} else {
$encounteredIPs[] = $ip;
}
}
}
return $errors;
}
/** /**
* Updates a dnsmasq configuration * Updates a dnsmasq configuration
* *
@ -188,6 +225,7 @@ function compareIPs($ip1, $ip2)
*/ */
function updateDnsmasqConfig($iface,$status) function updateDnsmasqConfig($iface,$status)
{ {
$config = '# RaspAP '.$iface.' configuration'.PHP_EOL; $config = '# RaspAP '.$iface.' configuration'.PHP_EOL;
$config .= 'interface='.$iface.PHP_EOL.'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].','.$_POST['SubnetMask'].','; $config .= 'interface='.$iface.PHP_EOL.'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].','.$_POST['SubnetMask'].',';
if ($_POST['RangeLeaseTimeUnits'] !== 'i') { if ($_POST['RangeLeaseTimeUnits'] !== 'i') {