lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(openvpn export) make sure we remove the top level temp dir for Viscosity exports

Browse Source
This commit is contained in:
Ad Schellevis 2016-12-18 12:22:34 +01:00
parent 41b9d3feac
commit 92d7bce2f0
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/www/vpn_openvpn_export.php
View File

@ -464,9 +464,6 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead
{
global $config;
$uniq = uniqid();
$tempdir = "/tmp/openvpn-export-{$uniq}";
$validconfig = openvpn_client_export_validate_config($srvid, $usrid, $crtid);
if (!$validconfig) {
return false;
@ -475,11 +472,9 @@ function viscosity_openvpn_client_config_exporter($srvid, $usrid, $crtid, $usead
list($settings, $server_cert, $server_ca, $servercn, $user, $cert, $nokeys) = $validconfig;
// create template directory
$baseTempDir = "/tmp/openvpn-export-" . uniqid();
$tempdir = $baseTempDir . "/Viscosity.visc";
mkdir($tempdir, 0700, true);
mkdir($tempdir . "/Viscosity.visc", 0700, true);
// Append new Viscosity.visc directory on top
$tempdir = $tempdir . "/Viscosity.visc/";
// write cofiguration file
$prefix = openvpn_client_export_prefix($srvid, $usrid, $crtid);
@ -570,7 +565,7 @@ EOF;
}
// Remove temporary directory
exec("rm -rf {$tempdir}");
exec("rm -rf {$baseTempDir}");
return $outputfile;
}