frodovdr
/
raspap-webgui
mirror of https://github.com/billz/raspap-webgui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1388 from RaspAP/maint/php-strict-types 

Fixes php8 strict_types errors + numerous warnings
This commit is contained in:
Bill Zimmerman 2023-09-06 03:54:21 -07:00 committed by GitHub
parent 16a413aa9f ceea867c69
commit 67df02fe4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 105 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ajax/networking/get_frequencies.php
View File

@ -9,6 +9,7 @@ if (isset($_POST['interface'])) {
define( 'NL80211_BAND_24GHZ', 0x1 ); define( 'NL80211_BAND_24GHZ', 0x1 );
define( 'NL80211_BAND_5GHZ', 0x2 ); define( 'NL80211_BAND_5GHZ', 0x2 );
$iface = escapeshellcmd($_POST['interface']); $iface = escapeshellcmd($_POST['interface']);
$flags = 0;
// get physical device for selected interface // get physical device for selected interface
exec("iw dev | awk '/$iface/ {print line}{line = $0}'", $return); exec("iw dev | awk '/$iface/ {print line}{line = $0}'", $return);

2
app/lib/system.php
View File

@ -49,7 +49,7 @@ class Sysinfo
public function usedMemory() public function usedMemory()
{ {
$used = shell_exec("free -m | awk 'NR==2{ total=$2 ; used=$3 } END { print used/total*100}'"); $used = shell_exec("free -m | awk 'NR==2{ total=$2 ; used=$3 } END { print used/total*100}'");
return floor($used); return floor(intval($used));
} }
public function processorCount() public function processorCount()

7
includes/adblock.php
View File

@ -75,8 +75,11 @@ function DisplayAdBlockConfig()
$dnsmasq_state = ($dnsmasq[0] > 0); $dnsmasq_state = ($dnsmasq[0] > 0);
$serviceStatus = $dnsmasq_state && $enabled ? "up" : "down"; $serviceStatus = $dnsmasq_state && $enabled ? "up" : "down";
$adblock_custom_content = file_get_contents(RASPI_ADBLOCK_LISTPATH .'custom.txt'); if (file_exists(RASPI_ADBLOCK_LISTPATH .'custom.txt')) {
$adblock_custom_content = file_get_contents(RASPI_ADBLOCK_LISTPATH .'custom.txt');
} else {
$adblock_custom_content = '';
}
$adblock_log = ''; $adblock_log = '';
exec('sudo chmod o+r '.RASPI_DHCPCD_LOG); exec('sudo chmod o+r '.RASPI_DHCPCD_LOG);
$handle = fopen(RASPI_DHCPCD_LOG, "r"); $handle = fopen(RASPI_DHCPCD_LOG, "r");

45
includes/functions.php
View File

@ -58,7 +58,7 @@ function cidr2mask($cidr)
$ipLong = ip2long($ip); $ipLong = ip2long($ip);
$netmaskLong = bindec(str_pad(str_repeat('1', $prefixLength), 32, '0')); $netmaskLong = bindec(str_pad(str_repeat('1', $prefixLength), 32, '0'));
$netmask = long2ip($netmaskLong); $netmask = long2ip(intval($netmaskLong));
return $netmask; return $netmask;
} }
@ -318,23 +318,23 @@ function CSRFMetaTag()
*/ */
function CSRFValidate() function CSRFValidate()
{ {
$post_token = $_POST['csrf_token']; if(isset($_POST['csrf_token'])) {
$header_token = $_SERVER['HTTP_X_CSRF_TOKEN']; $post_token = $_POST['csrf_token'];
$header_token = $_SERVER['HTTP_X_CSRF_TOKEN'];
if (empty($post_token) && empty($header_token)) { if (empty($post_token) && empty($header_token)) {
return false; return false;
} }
$request_token = $post_token;
$request_token = $post_token; if (empty($post_token)) {
if (empty($post_token)) { $request_token = $header_token;
$request_token = $header_token; }
} if (hash_equals($_SESSION['csrf_token'], $request_token)) {
return true;
if (hash_equals($_SESSION['csrf_token'], $request_token)) { } else {
return true; error_log('CSRF violation');
} else { return false;
error_log('CSRF violation'); }
return false;
} }
} }
@ -430,8 +430,9 @@ function ParseConfig($arrConfig)
continue; continue;
} }
list($option, $value) = array_map("trim", explode("=", $line, 2)); if (strpos($line, "=") !== false) {
list($option, $value) = array_map("trim", explode("=", $line, 2));
}
if (empty($config[$option])) { if (empty($config[$option])) {
$config[$option] = $value ?: true; $config[$option] = $value ?: true;
} else { } else {
@ -684,8 +685,10 @@ function getColorOpt()
} }
function getSidebarState() function getSidebarState()
{ {
if ($_COOKIE['sidebarToggled'] == 'true' ) { if(isset($_COOKIE['sidebarToggled'])) {
return"toggled"; if ($_COOKIE['sidebarToggled'] == 'true' ) {
return "toggled";
}
} }
} }

52
includes/hostapd.php
View File

@ -40,22 +40,25 @@ function DisplayHostAPDConfig()
exec($cmd, $txpower); exec($cmd, $txpower);
$txpower = intval($txpower[0]); $txpower = intval($txpower[0]);
if (isset($_POST['interface'])) {
$interface = escapeshellarg($_POST['interface']);
}
if (!RASPI_MONITOR_ENABLED) { if (!RASPI_MONITOR_ENABLED) {
if (isset($_POST['SaveHostAPDSettings'])) { if (isset($_POST['SaveHostAPDSettings'])) {
SaveHostAPDConfig($arrSecurity, $arrEncType, $arr80211Standard, $interfaces, $status); SaveHostAPDConfig($arrSecurity, $arrEncType, $arr80211Standard, $interfaces, $status);
} }
} }
$arrHostapdConf = parse_ini_file('/etc/raspap/hostapd.ini'); $arrHostapdConf = parse_ini_file(RASPI_CONFIG.'/hostapd.ini');
if (!RASPI_MONITOR_ENABLED) { if (!RASPI_MONITOR_ENABLED) {
if (isset($_POST['StartHotspot']) || isset($_POST['RestartHotspot'])) { if (isset($_POST['StartHotspot']) || isset($_POST['RestartHotspot'])) {
$status->addMessage('Attempting to start hotspot', 'info'); $status->addMessage('Attempting to start hotspot', 'info');
if ($arrHostapdConf['BridgedEnable'] == 1) { if ($arrHostapdConf['BridgedEnable'] == 1) {
exec('sudo /etc/raspap/hostapd/servicestart.sh --interface br0 --seconds 3', $return); exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --interface br0 --seconds 3', $return);
} elseif ($arrHostapdConf['WifiAPEnable'] == 1) { } elseif ($arrHostapdConf['WifiAPEnable'] == 1) {
exec('sudo /etc/raspap/hostapd/servicestart.sh --interface uap0 --seconds 3', $return); exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --interface uap0 --seconds 3', $return);
} else { } else {
exec('sudo /etc/raspap/hostapd/servicestart.sh --seconds 3', $return); exec('sudo '.RASPI_CONFIG.'/hostapd/servicestart.sh --seconds 3', $return);
} }
foreach ($return as $line) { foreach ($return as $line) {
$status->addMessage($line, 'info'); $status->addMessage($line, 'info');
@ -69,9 +72,11 @@ function DisplayHostAPDConfig()
} }
} }
exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig); exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig);
exec('iwgetid '. escapeshellarg($_POST['interface']). ' -r', $wifiNetworkID); if (isset($interface)) {
if (!empty($wifiNetworkID[0])) { exec('iwgetid '. $interface. ' -r', $wifiNetworkID);
$managedModeEnabled = true; if (!empty($wifiNetworkID[0])) {
$managedModeEnabled = true;
}
} }
$hostapdstatus = $system->hostapdStatus(); $hostapdstatus = $system->hostapdStatus();
$serviceStatus = $hostapdstatus[0] == 0 ? "down" : "up"; $serviceStatus = $hostapdstatus[0] == 0 ? "down" : "up";
@ -98,16 +103,18 @@ function DisplayHostAPDConfig()
$arrConfig['country_code'] = $country_code[0]; $arrConfig['country_code'] = $country_code[0];
} }
// set txpower with iw if value is non-default ('auto') // set txpower with iw if value is non-default ('auto')
if (isset($_POST['txpower']) && ($_POST['txpower'] != 'auto')) { if (isset($_POST['txpower'])) {
$txpower = intval($_POST['txpower']); if ($_POST['txpower'] != 'auto') {
$sdBm = $txpower * 100; $txpower = intval($_POST['txpower']);
exec('sudo /sbin/iw dev '.escapeshellarg($_POST['interface']).' set txpower fixed '.$sdBm, $return); $sdBm = $txpower * 100;
$status->addMessage('Setting transmit power to '.$_POST['txpower'].' dBm.', 'success'); exec('sudo /sbin/iw dev '.$interface.' set txpower fixed '.$sdBm, $return);
$txpower = $_POST['txpower']; $status->addMessage('Setting transmit power to '.$_POST['txpower'].' dBm.', 'success');
} elseif ($_POST['txpower'] == 'auto') { $txpower = $_POST['txpower'];
exec('sudo /sbin/iw dev '.escapeshellarg($_POST['interface']).' set txpower auto', $return); } elseif ($_POST['txpower'] == 'auto') {
$status->addMessage('Setting transmit power to '.$_POST['txpower'].'.', 'success'); exec('sudo /sbin/iw dev '.$interface.' set txpower auto', $return);
$txpower = $_POST['txpower']; $status->addMessage('Setting transmit power to '.$_POST['txpower'].'.', 'success');
$txpower = $_POST['txpower'];
}
} }
$countries_5Ghz_max48ch = RASPI_5GHZ_ISO_ALPHA2; $countries_5Ghz_max48ch = RASPI_5GHZ_ISO_ALPHA2;
@ -132,6 +139,8 @@ function DisplayHostAPDConfig()
if ($selectedHwMode === $hwModeDisabled) { if ($selectedHwMode === $hwModeDisabled) {
unset($selectedHwMode); unset($selectedHwMode);
} }
} else {
$hwModeDisabled = null;
} }
echo renderTemplate( echo renderTemplate(
@ -168,13 +177,16 @@ function DisplayHostAPDConfig()
*/ */
function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status) function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
{ {
// It should not be possible to send bad data for these fields so clearly // It should not be possible to send bad data for these fields.
// someone is up to something if they fail. Fail silently. // If wpa fields are absent, return false and log securely.
if (!(array_key_exists($_POST['wpa'], $wpa_array) if (!(array_key_exists($_POST['wpa'], $wpa_array)
&& array_key_exists($_POST['wpa_pairwise'], $enc_types) && array_key_exists($_POST['wpa_pairwise'], $enc_types)
&& array_key_exists($_POST['hw_mode'], $modes)) && array_key_exists($_POST['hw_mode'], $modes))
) { ) {
error_log("Attempting to set hostapd config with wpa='".$_POST['wpa']."', wpa_pairwise='".$_POST['wpa_pairwise']."' and hw_mode='".$_POST['hw_mode']."'"); // FIXME: log injection $err = "Attempting to set hostapd config with wpa='".escapeshellarg($_POST['wpa']);
$err .= "', wpa_pairwise='".$escapeshellarg(_POST['wpa_pairwise']);
$err .= "and hw_mode='".$escapeshellarg(_POST['hw_mode'])."'";
error_log($err);
return false; return false;
} }
// Validate input // Validate input

2
includes/openvpn.php
View File

@ -64,7 +64,7 @@ function DisplayOpenVPNConfig()
ftruncate($f, 0); ftruncate($f, 0);
fclose($f); fclose($f);
} }
} elseif (isset($_POST['log-openvpn']) || filesize('/tmp/openvpn.log') >0) { } elseif (isset($_POST['log-openvpn']) || file_exists('/tmp/openvpn.log')) {
$logEnable = 1; $logEnable = 1;
exec("sudo /etc/raspap/openvpn/openvpnlog.sh", $logOutput); exec("sudo /etc/raspap/openvpn/openvpnlog.sh", $logOutput);
$logOutput = file_get_contents('/tmp/openvpn.log'); $logOutput = file_get_contents('/tmp/openvpn.log');

6
includes/system.php
View File

@ -125,7 +125,11 @@ function DisplaySystem(&$extraFooterScripts)
exec('cat '. RASPI_LIGHTTPD_CONFIG, $return); exec('cat '. RASPI_LIGHTTPD_CONFIG, $return);
$conf = ParseConfig($return); $conf = ParseConfig($return);
$serverPort = $conf['server.port']; $serverPort = $conf['server.port'];
$serverBind = str_replace('"', '',$conf['server.bind']); if (isset($conf['server.bind'])) {
$serverBind = str_replace('"', '',$conf['server.bind']);
} else {
$serverBind = '';
}
// define locales // define locales
$arrLocales = getLocales(); $arrLocales = getLocales();

70
includes/wifi_functions.php
View File

@ -77,44 +77,46 @@ function nearbyWifiStations(&$networks, $cached = true)
if ( isset($lastnet['index']) ) $index = $lastnet['index'] + 1; if ( isset($lastnet['index']) ) $index = $lastnet['index'] + 1;
} }
array_shift($scan_results); if (is_array($scan_results)) {
foreach ($scan_results as $network) { array_shift($scan_results);
$arrNetwork = preg_split("/[\t]+/", $network); // split result into array foreach ($scan_results as $network) {
$ssid = $arrNetwork[4]; $arrNetwork = preg_split("/[\t]+/", $network); // split result into array
$ssid = $arrNetwork[4];
// exclude raspap ssid // exclude raspap ssid
if (empty($ssid) || $ssid == $ap_ssid) { if (empty($ssid) || $ssid == $ap_ssid) {
continue; continue;
} }
// filter SSID string: unprintable 7bit ASCII control codes, delete or quotes -> ignore network // filter SSID string: unprintable 7bit ASCII control codes, delete or quotes -> ignore network
if (preg_match('[\x00-\x1f\x7f\'\`\´\"]', $ssid)) { if (preg_match('[\x00-\x1f\x7f\'\`\´\"]', $ssid)) {
continue; continue;
} }
// If network is saved // If network is saved
if (array_key_exists($ssid, $networks)) { if (array_key_exists($ssid, $networks)) {
$networks[$ssid]['visible'] = true; $networks[$ssid]['visible'] = true;
$networks[$ssid]['channel'] = ConvertToChannel($arrNetwork[1]); $networks[$ssid]['channel'] = ConvertToChannel($arrNetwork[1]);
// TODO What if the security has changed? // TODO What if the security has changed?
} else { } else {
$networks[$ssid] = array( $networks[$ssid] = array(
'ssid' => $ssid, 'ssid' => $ssid,
'configured' => false, 'configured' => false,
'protocol' => ConvertToSecurity($arrNetwork[3]), 'protocol' => ConvertToSecurity($arrNetwork[3]),
'channel' => ConvertToChannel($arrNetwork[1]), 'channel' => ConvertToChannel($arrNetwork[1]),
'passphrase' => '', 'passphrase' => '',
'visible' => true, 'visible' => true,
'connected' => false, 'connected' => false,
'index' => $index 'index' => $index
); );
++$index; ++$index;
} }
// Save RSSI, if the current value is larger than the already stored // Save RSSI, if the current value is larger than the already stored
if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4], $networks)) { if (array_key_exists(4, $arrNetwork) && array_key_exists($arrNetwork[4], $networks)) {
if (! array_key_exists('RSSI', $networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2]) { if (! array_key_exists('RSSI', $networks[$arrNetwork[4]]) || $networks[$ssid]['RSSI'] < $arrNetwork[2]) {
$networks[$ssid]['RSSI'] = $arrNetwork[2]; $networks[$ssid]['RSSI'] = $arrNetwork[2];
}
} }
} }
} }

2
installers/common.sh
View File

@ -227,8 +227,6 @@ function _install_dependencies() {
fi fi
if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then
dhcpcd_package="dhcpcd5" dhcpcd_package="dhcpcd5"
fi
if [ ${OS,,} = "ubuntu" ]; then
iw_package="iw" iw_package="iw"
fi fi