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

Apply escapeshellarg to OpenVPN auth + client configs

Browse Source
This commit is contained in:
billz 2024-09-20 09:06:43 +02:00
parent 3889e2f04d
commit 74c7fb8c7a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/openvpn.php
View File

@ -62,7 +62,7 @@ function DisplayOpenVPNConfig()
ftruncate($f, 0); ftruncate($f, 0);
fclose($f); fclose($f);
} }
} elseif (isset($_POST['log-openvpn']) || file_exists('/tmp/openvpn.log')) { } elseif (isset($_POST['log-openvpn']) || filesize('/tmp/openvpn.log') >0) {
$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');
@ -127,7 +127,7 @@ function SaveOpenVPNConfig($status, $file, $authUser, $authPassword)
$auth = $authUser .PHP_EOL . $authPassword .PHP_EOL; $auth = $authUser .PHP_EOL . $authPassword .PHP_EOL;
file_put_contents($tmp_authdata, $auth); file_put_contents($tmp_authdata, $auth);
chmod($tmp_authdata, 0644); chmod($tmp_authdata, 0644);
$client_auth = RASPI_OPENVPN_CLIENT_PATH.pathinfo($file['name'], PATHINFO_FILENAME).'_login.conf'; $client_auth = escapeshellarg(RASPI_OPENVPN_CLIENT_PATH.pathinfo($file['name'], PATHINFO_FILENAME).'_login.conf');
system("sudo mv $tmp_authdata $client_auth", $return); system("sudo mv $tmp_authdata $client_auth", $return);
system("sudo rm ".RASPI_OPENVPN_CLIENT_LOGIN, $return); system("sudo rm ".RASPI_OPENVPN_CLIENT_LOGIN, $return);
system("sudo ln -s $client_auth ".RASPI_OPENVPN_CLIENT_LOGIN, $return); system("sudo ln -s $client_auth ".RASPI_OPENVPN_CLIENT_LOGIN, $return);
@ -144,7 +144,7 @@ function SaveOpenVPNConfig($status, $file, $authUser, $authPassword)
} }
// Move uploaded ovpn config from /tmp and create symlink // Move uploaded ovpn config from /tmp and create symlink
$client_ovpn = RASPI_OPENVPN_CLIENT_PATH.pathinfo($file['name'], PATHINFO_FILENAME).'_client.conf'; $client_ovpn = escapeshellarg(RASPI_OPENVPN_CLIENT_PATH.pathinfo($file['name'], PATHINFO_FILENAME).'_client.conf');
chmod($tmp_ovpn, 0644); chmod($tmp_ovpn, 0644);
system("sudo mv $tmp_ovpn $client_ovpn", $return); system("sudo mv $tmp_ovpn $client_ovpn", $return);
system("sudo rm ".RASPI_OPENVPN_CLIENT_CONFIG, $return); system("sudo rm ".RASPI_OPENVPN_CLIENT_CONFIG, $return);