Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-04-25 19:29:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Execute pihole through wrapper

Browse Source 
All different exec() calls basically just calls sudo pihole,
with various different syntaxes. Using a wrapper function
allows sanitization of arguments for better safety.

Signed-off-by: Samu Voutilainen <smar@smar.fi>
This commit is contained in:
Samu Voutilainen
2020-01-25 11:19:23 +02:00
parent ae13014565
commit 39ec67829b
8 changed files with 99 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api.php
View File

@@ -20,8 +20,16 @@ $data = array();
// Common API functions
if (isset($_GET['status']))
{
$pistatus = exec('sudo pihole status web');
if ($pistatus == "1")
$pistatus = pihole_execute('status web');
if(isset($pistatus[0]))
{
$pistatus = $pistatus[0];
}
else
{
$pistatus = null;
}
if ($pistatus === "1")
{
$data = array_merge($data, array("status" => "enabled"));
}
@@ -42,7 +50,7 @@ elseif (isset($_GET['enable']) && $auth)
// Skip token validation if explicit auth string is given
check_csrf($_GET['token']);
}
exec('sudo pihole enable');
pihole_execute('enable');
$data = array_merge($data, array("status" => "enabled"));
unlink("../custom_disable_timer");
}
@@ -63,12 +71,12 @@ elseif (isset($_GET['disable']) && $auth)
if($disable > 0)
{
$timestamp = time();
exec("sudo pihole disable ".$disable."s");
pihole_execute("disable ".$disable."s");
file_put_contents("../custom_disable_timer",($timestamp+$disable)*1000);
}
else
{
exec('sudo pihole disable');
pihole_execute('disable');
unlink("../custom_disable_timer");
}
$data = array_merge($data, array("status" => "disabled"));