zer.ooo/web
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

When the user specifies they want an embedded config they no longer get a zip file containing everything *and* an embedded config

Browse source
This commit is contained in:
Tim Bazuin 2019-08-03 13:45:37 +02:00
parent e581cda081
commit 21c8c34d7d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Handler/Panel/ConfigBuilder/Action.php
View file

@ -16,21 +16,29 @@ class Action extends Session
$zipFile = tempnam(sys_get_temp_dir(), '0zip');
$zip = new \ZipArchive();
$zip->open($zipFile, \ZipArchive::CREATE);
$cert = $this->post('cert');
$wantEmbedded = $this->post('want-embedded');
$server = ServerQuery::create()->findOneByFingerprint($this->post('fingerprint'));
$name = $server->getFqdn();
$this->fillZipWithCaAndConfig($zip, $server);
if ($cert !== null && $wantEmbedded !== null) {
$certModel = CertificateQuery::create()->findOneByUserAndName($this->getUser(), $cert);
$this->fillZipWithEmbeddedConfig($zip, $server, $certModel);
$name .= '-' . $certModel->getName() . '.' . $certModel->getSerial();
}
$cert = $this->post('cert');
if ($cert !== null) {
if ($cert !== null && $wantEmbedded === null) {
$certModel = CertificateQuery::create()->findOneByUserAndName($this->getUser(), $cert);
$this->addClientCertificateData($zip, $certModel);
$this->fillZipWithEmbeddedConfig($zip, $server, $certModel);
$name .= '-' . $certModel->getName() . '.' . $certModel->getSerial();
}
if ($wantEmbedded === null) {
$this->fillZipWithCaAndConfig($zip, $server);
}
$zip->close();
$zipContents = file_get_contents($zipFile);
@ -68,7 +76,7 @@ class Action extends Session
$parameters = [
'server' => $server,
'crt' => $cert->getCertificate(),
'cert' => $cert->getCertificate(),
'key' => '',
];