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

Update w/ checkHTTPAccess()

Browse Source
This commit is contained in:
billz
2025-07-14 02:24:49 -07:00
parent 4f57e259dd
commit c21d5a1790
1 changed files with 72 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
includes/internetRoute.php
View File

@@ -1,5 +1,4 @@
<?php
/*
* Fetches details of the kernel routing table
*
@@ -32,14 +31,19 @@ function getRouteInfo($checkAccess)
if (!empty($routes)) {
foreach ($routes as $i => $route) {
$prop = explode(' ', $route);
$rInfo[$i]["interface"] = $prop[0];
$rInfo[$i]["interface"] = $dev = $prop[0];
$rInfo[$i]["ip-address"] = $prop[1];
$rInfo[$i]["gateway"] = $prop[2];
// resolve the name of the gateway (if possible)
unset($host);
exec('host ' . $prop[2] . ' | sed -rn "s/.*domain name pointer (.*)\./\1/p" | head -n 1', $host);
$rInfo[$i]["gw-name"] = empty($host) ? "*" : $host[0];
if (isset($checkAccess) && $checkAccess) {
// check if AP
unset($isAP);
exec("iwconfig $dev 2> /dev/null | sed -rn 's/.*(mode:master).*/1/ip'", $isAP);
$isAP = !empty($isAP);
$rInfo[$i]["isAP"] = $isAP;
if (isset($checkAccess) && $checkAccess && !$isAP) {
// check internet connectivity w/ and w/o DNS resolution
unset($okip);
exec('ping -W1 -c 1 -I ' . $prop[0] . ' ' . RASPI_ACCESS_CHECK_IP . ' | sed -rn "s/.*icmp_seq=1.*time=.*/OK/p"', $okip);
@@ -47,6 +51,7 @@ function getRouteInfo($checkAccess)
unset($okdns);
exec('ping -W1 -c 1 -I ' . $prop[0] . ' ' . RASPI_ACCESS_CHECK_DNS . ' | sed -rn "s/.*icmp_seq=1.*time=.*/OK/p"', $okdns);
$rInfo[$i]["access-dns"] = empty($okdns) ? false : true;
$rInfo[$i]["access-url"] = preg_match('/OK.*/',checkHTTPAccess($prop[0]));
}
}
} else {
@@ -55,6 +60,70 @@ function getRouteInfo($checkAccess)
return $rInfo;
}
function detectCaptivePortal($iface) {
$result=checkHTTPAccess($iface, true);
$checkConnect=array( "state"=>"FAILED", "URL"=>"", "interface"=> $iface, "url" => "" );
if ( !empty($result) && !preg_match('/FAILED/i',$result) ) {
$checkConnect["state"]=preg_match('/(PORTAL|OK)/i',$result);
if ( preg_match('/PORTAL (.*)/i',$result ,$url) && !empty($url) ) {
$checkConnect["URL"]=$url[1];
}
}
return $checkConnect;
}
function checkHTTPAccess($iface, $detectPortal=false) {
$ret="FAILED no HTTP access";
exec('timeout 5 curl -is ' . RASPI_ACCESS_CHECK_URL . ' --interface ' . $iface, $rcurl);
if ( !empty($rcurl) && preg_match("/^HTTP\/[0-9\.]+ ([0-9]+)/m",$rcurl=implode("\n",$rcurl),$code) ) {
$code = $code[1];
if ( $code == 200 ) {
if ( preg_match("/<meta\s*http-equiv=\"refresh\".*content=\".*url=([^\s]+)\".*>/", $rcurl, $url) ) {
$code = 302;
$rcurl = "Location: " . $url[1];
unset($url);
}
}
switch($code) {
case 302:
case 307:
if ( $detectPortal ) {
if ( preg_match("/^Location:\s*(https?:\/\/[^?[:space:]]+)/m", $rcurl, $url) ) {
$url=$url[1];
if ( preg_match('/^https?:\/\/([^:\/]*).*/i', $url, $srv) && isset($srv[1]) ) {
$srv=$srv[1];
if ( preg_match('/^(([0-9]{1,3}\.){3}[0-9]{1,3}).*/', $srv, $ip) && isset($ip[1]) ) {
$ret="PORTAL " . $url;
}
else {
exec('timeout 7 sudo nmap --script=broadcast-dhcp-discover -e ' . $iface . ' 2> /dev/null | sed -rn "s/.*Domain Name Server:\s*(([0-9]{1,3}\.){3}[0-9]{1,3}).*/\1/pi"', $nameserver);
if ( !empty($nameserver) ) {
$nameserver=$nameserver[0];
exec('host ' . $srv . ' ' . $nameserver . ' | sed -rn "s/.*has address ((([0-9]{1,3}\.){3}[0-9]{1,3})).*/\1/p"', $ip2);
if ( !empty($ip2) ) {
$ip2=$ip2[0];
$url=preg_replace("/" . $srv . "/",$ip2,$url);
$ret="PORTAL " . $url;
}
else $ret="FAILED name " . $srv . " could not be resolved";
}
else $ret="FAILED no name server";
}
}
}
}
break;
case RASPI_ACCESS_CHECK_URL_CODE:
$ret="OK internet access";
break;
default:
$ret="FAILED unexpected response " . $code[0];
break;
}
}
return $ret;
}
/*
* Fetches raw output of ip route
*
@@ -65,4 +134,3 @@ function getRouteInfoRaw()
exec('ip route list', $routes);
return $routes;
}