fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Use a variable to handle the misc_dir

Browse source
This commit is contained in:
Li Chen 2013-11-25 18:24:46 +01:00
commit a9fdcaf9f2
3 changed files with 58 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

46
onyx/include/admin/certificate.php
View file

@ -24,39 +24,53 @@ function remove_directory($dir)
function new_client($name)
{
//TODO handle if already exist
putenv("OPENSSL_CONF=".ONYX. '../misc/openssl.cnf');
putenv("TOP_DIR=".ONYX. '../misc/pki');
$output = shell_exec(ONYX . "../misc/CA.sh -newclient $name");
if (isset($VAR['misc_dir']))
$misc_dir = $VAR['misc_dir'];
else
{
erreur("Merci d'ajouter la variable misc_dir dans root.xml");
return "admin/home";
}
//TODO handle if already exist
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("TOP_DIR=$misc_dir/pki");
$output = shell_exec("$misc_dir/CA.sh -newclient $name");
}
if (!empty($p[2]))
{
if (isset($VAR['misc_dir']))
$misc_dir = $VAR['misc_dir'];
else
{
erreur("Merci d'ajouter la variable misc_dir dans root.xml");
return "admin/home";
}
$misc_dir = $VAR['misc_dir'];
if ($p[2] == "newca")
{
//TODO handle if already exist
putenv("OPENSSL_CONF=".ONYX. '../misc/openssl.cnf');
putenv("TOP_DIR=".ONYX. '../misc/pki');
$output = shell_exec(ONYX . '../misc/CA.sh -newca');
putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
putenv("TOP_DIR=$misc_dir/pki");
$output = shell_exec("$misc_dir/CA.sh -newca");
//TODO handle the path ?
$ca_file = ONYX . '../misc/pki/cacert.crt';
$ca_file = "$misc_dir/pki/cacert.crt";
//TODO check permission ?
if (file_exists($ca_file))
{
$data = openssl_x509_parse(file_get_contents(ONYX . '../misc/pki/cacert.crt'));
$data = openssl_x509_parse(file_get_contents("$misc_dir/pki/cacert.crt"));
$template->assign("cert", $data);
}
}
elseif ($p[2] == "deleteca")
{
//TODO handle var path
$dir = ONYX . '../misc/pki';
$dir = "$misc_dir/pki";
remove_directory($dir);
}
}
//header("Location: /admin/");
//exit;
header("Location: /admin/");
exit;