frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-03-01 10:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Validate/handle custom hosts input

Browse Source
This commit is contained in:
billz
2020-09-19 22:26:52 +01:00
parent b533b7ab98
commit 3644109cec
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
includes/adblock.php
View File

@@ -11,6 +11,7 @@ function DisplayAdBlockConfig()
{ {
$status = new StatusMessages(); $status = new StatusMessages();
$enabled = false; $enabled = false;
$custom_enabled = false;
if (!RASPI_MONITOR_ENABLED) { if (!RASPI_MONITOR_ENABLED) {
if (isset($_POST['saveadblocksettings'])) { if (isset($_POST['saveadblocksettings'])) {
@@ -20,13 +21,38 @@ function DisplayAdBlockConfig()
} elseif ($_POST['adblock-enable'] == "0") { } elseif ($_POST['adblock-enable'] == "0") {
$config = null; $config = null;
} }
file_put_contents("/tmp/dnsmasqdata", $config); if ($_POST['adblock-custom-enable'] == "1") {
system('sudo cp /tmp/dnsmasqdata '.RASPI_ADBLOCK_CONFIG, $return); // validate custom hosts input
$lines = preg_split('/\r\n|\n|\r/', trim($_POST['adblock-custom-hosts']));
foreach ($lines as $line) {
$ip_host = preg_split('/\s+/', $line);
$index++;
//echo $host[1] . '<br>';
if (!filter_var($ip_host[0], FILTER_VALIDATE_IP)) {
$errors .= _('Invalid custom IP address found on line '.$index);
break;
}
if (!validate_host($ip_host[1])) {
$errors .= _('Invalid custom host found on line '.$index);
break;
}
}
file_put_contents("/tmp/dnsmasq_custom", $_POST['adblock-custom-hosts']);
system("sudo cp /tmp/dnsmasq_custom " .RASPI_ADBLOCK_LISTPATH .'custom.txt', $return);
$config.= 'addn-hosts=' .RASPI_ADBLOCK_LISTPATH .'custom.txt'.PHP_EOL;
$custom_enabled = true;
}
if ($return == 0) { if (empty($errors)) {
$status->addMessage('Adblock configuration updated successfully', 'success'); file_put_contents("/tmp/dnsmasqdata", $config);
system('sudo cp /tmp/dnsmasqdata '.RASPI_ADBLOCK_CONFIG, $return);
if ($return == 0) {
$status->addMessage('Adblock configuration updated successfully', 'success');
} else {
$status->addMessage('Adblock configuration failed to be updated.', 'danger');
}
} else { } else {
$status->addMessage('Adblock configuration failed to be updated.', 'danger'); $status->addMessage($errors, 'danger');
} }
} elseif (isset($_POST['restartadblock']) || isset($_POST['startadblock'])) { } elseif (isset($_POST['restartadblock']) || isset($_POST['startadblock'])) {
exec('sudo /bin/systemctl restart dnsmasq.service', $dnsmasq, $return); exec('sudo /bin/systemctl restart dnsmasq.service', $dnsmasq, $return);
@@ -53,7 +79,8 @@ function DisplayAdBlockConfig()
"status", "status",
"serviceStatus", "serviceStatus",
"dnsmasq_state", "dnsmasq_state",
"enabled" "enabled",
"custom_enabled"
) )
); );
} }