Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2026-02-15 07:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #593 from pi-hole/fix/non-local-FTL

Browse Source 
Explicitly allow non-local FTL installations
This commit is contained in:
DL6ER
2017-10-23 08:47:02 +02:00
committed by GitHub
parent b02d752efa 2f3dc0befe
commit fd766dfdbb
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api.php
View File

@@ -13,6 +13,7 @@ require("scripts/pi-hole/php/password.php");
require("scripts/pi-hole/php/auth.php");
check_cors();
$FTL_IP = "127.0.0.1";
$data = array();
@@ -74,7 +75,7 @@ elseif (isset($_GET['disable']) && $auth)
}
// Other API functions
if(!testFTL() && !isset($_GET["PHP"]))
if(!testFTL($FTL_IP) && !isset($_GET["PHP"]))
{
$data = array_merge($data, array("FTLnotrunning" => true));
}

3
api_FTL.php
View File

@@ -12,7 +12,8 @@ if(!isset($api))
die("Direct call to api_FTL.php is not allowed!");
}
$socket = connectFTL("127.0.0.1");
// $FTL_IP is defined in api.php
$socket = connectFTL($FTL_IP);
if (isset($_GET['type'])) {
$data["type"] = "FTL";

15
scripts/pi-hole/php/FTL.php
View File

@@ -6,10 +6,19 @@
* This file is copyright under the latest version of the EUPL.
* Please see LICENSE file for your rights under this license. */
function testFTL()
function testFTL($address)
{
$ret = shell_exec("pidof pihole-FTL");
return intval($ret);
if($address === "127.0.0.1")
{
$ret = shell_exec("pidof pihole-FTL");
return intval($ret);
}
// We cannot relly test for a distant FTL instance
// in the same way, so for any other IP address
// we simply return true here and rely on the API
// socket connection itself to fail if there is nothing
// on that address
return true;
}
function connectFTL($address, $port=4711, $quiet=true)