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

OpenVPN export, inline cert+key for https://github.com/opnsense/core/issues/2787

Browse Source
This commit is contained in:
Ad Schellevis 2018-11-19 22:17:19 +01:00
parent 0b028c1799
commit 811d9efd65
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/opnsense/mvc/app/library/OPNsense/OpenVPN/PlainOpenVPN.php
View File

@ -118,12 +118,36 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
return $conf;
}
/**
* @return array inline OpenVPN files
*/
protected function openvpnInlineFiles()
{
$conf = array();
if ($this->config['mode'] !== "server_user") {
$conf[] = "<cert>";
$conf = array_merge($conf, explode("\n", trim($this->config['client_crt'])));
$conf[] = "</cert>";
$conf[] = "<key>";
$conf = array_merge($conf, explode("\n", trim($this->config['client_prv'])));
$conf[] = "</key>";
}
if (!empty($this->config['tls'])) {
$conf[] = "<tls-auth>";
$conf = array_merge($conf, explode("\n", trim(base64_decode($this->config['tls']))));
$conf[] = "</tls-auth>";
}
return $conf;
}
/**
* @return string content
*/
public function getContent()
{
return implode("\n", $this->openvpnConfParts());
return implode("\n", array_merge($this->openvpnConfParts(), $this->openvpnInlineFiles()));
}
}