mirror of
https://github.com/billz/raspap-webgui.git
synced 2023-10-10 13:37:24 +02:00
Get VPN state from active tun/wg device
This commit is contained in:
parent
2f1a6af0ba
commit
882535b130
@ -142,28 +142,47 @@ function ReadFirewallConf() {
|
|||||||
$conf["client-device"] = "";
|
$conf["client-device"] = "";
|
||||||
$conf["restricted-ips"] = "";
|
$conf["restricted-ips"] = "";
|
||||||
}
|
}
|
||||||
|
exec('ifconfig | grep -E -i "tun+"', $ret);
|
||||||
|
$conf["openvpn-enable"] = !empty($ret);
|
||||||
|
unset($ret);
|
||||||
|
exec('ifconfig | grep -E -i "wg+"', $ret);
|
||||||
|
$conf["wireguard-enable"] = !empty($ret);
|
||||||
return $conf;
|
return $conf;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getVPN_IPs() {
|
function getVPN_IPs() {
|
||||||
$ips = "";
|
$ips = "";
|
||||||
# get openvpn server IPs for UDP (if existing)
|
# get openvpn and wireguard server IPs
|
||||||
if ( RASPI_OPENVPN_ENABLED && ($fconf = glob(RASPI_OPENVPN_CLIENT_PATH ."/*.conf")) !== false && !empty($fconf) ) {
|
if ( RASPI_OPENVPN_ENABLED && ($fconf = glob(RASPI_OPENVPN_CLIENT_PATH ."/*.conf")) !== false && !empty($fconf) ) {
|
||||||
foreach ( $fconf as $f ) {
|
foreach ( $fconf as $f ) {
|
||||||
unset($result);
|
unset($result);
|
||||||
exec('cat '.$f.' | sed -rn "s/^remote\s*([a-z0-9\.\-\_]*)\s*([0-9]*).*$/\1/ip" ', $result);
|
exec('cat '.$f.' | sed -rn "s/^remote\s*([a-z0-9\.\-\_]*)\s*([0-9]*).*$/\1 \2/ip" ', $result);
|
||||||
$ip = (isset($result[0])) ? $result[0] : "";
|
if ( !empty($result) ) {
|
||||||
unset($result);
|
$result = explode(" ",$result[0]);
|
||||||
exec('cat '.$f.' | sed -rn "s/^proto\s*([a-z]*).*$/\1/ip" ', $result);
|
$ip = (isset($result[0])) ? $result[0] : "";
|
||||||
$proto = (isset($result[0])) ? $result[0] : "";
|
$port = (isset($result[1])) ? $result[1] : "";
|
||||||
if ( !empty($ip) && trim(strtolower($proto)) === "udp" ) {
|
if ( !empty($ip) ) {
|
||||||
$ip = gethostbyname($ip);
|
$ip = gethostbyname($ip);
|
||||||
if ( filter_var($ip,FILTER_VALIDATE_IP) && strpos($ips, $ip) === false ) $ips .= " $ip";
|
if ( filter_var($ip,FILTER_VALIDATE_IP) && strpos($ips, $ip) === false ) $ips .= " $ip";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
# get wireguard server IPs for UDP (if existing)
|
# get wireguard server IPs
|
||||||
if ( RASPI_WIREGUARD_ENABLED && ($fconf = glob(RASPI_WIREGUARD_PATH ."/*.conf")) !== false && !empty($fconf) ) {
|
if ( RASPI_WIREGUARD_ENABLED && ($fconf = glob(RASPI_WIREGUARD_PATH ."/*.conf")) !== false && !empty($fconf) ) {
|
||||||
|
foreach ( $fconf as $f ) {
|
||||||
|
unset($result);
|
||||||
|
exec('sudo /bin/cat '.$f.' | sed -rn "s/^endpoint\s*=\s*([a-z0-9\.\-\_]*:[0-9]*).*$/\1/ip" ', $result);
|
||||||
|
if ( !empty($result) ) {
|
||||||
|
$result = explode(":",$result[0]);
|
||||||
|
$ip = (isset($result[0])) ? $result[0] : "";
|
||||||
|
$port = (isset($result[1])) ? $result[1] : "";
|
||||||
|
if ( !empty($ip) ) {
|
||||||
|
$ip = gethostbyname($ip);
|
||||||
|
if ( filter_var($ip,FILTER_VALIDATE_IP) && strpos($ips, $ip) === false ) $ips .= " $ip";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return trim($ips);
|
return trim($ips);
|
||||||
}
|
}
|
||||||
|
@ -63,3 +63,4 @@ www-data ALL=(ALL) NOPASSWD:/bin/cat /etc/wireguard/wg-*.key
|
|||||||
www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/wireguard/*.conf
|
www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/wireguard/*.conf
|
||||||
www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/wireguard/wg-*.key
|
www-data ALL=(ALL) NOPASSWD:/bin/rm /etc/wireguard/wg-*.key
|
||||||
www-data ALL=(ALL) NOPASSWD:/tmp/iptables_raspap.sh
|
www-data ALL=(ALL) NOPASSWD:/tmp/iptables_raspap.sh
|
||||||
|
www-data ALL=(ALL) NOPASSWD:/tmp/ip6tables_raspap.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user