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

OpenVPN export: offer the ability to export a user without a certificate and increase consistency between export types.

Browse Source
This commit is contained in:
Ad Schellevis 2021-05-18 10:08:07 +02:00
parent 408ef03b6a
commit 2ba6da4eef
5 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/mvc/app/controllers/OPNsense/OpenVPN/Api/ExportController.php
View File

@ -203,7 +203,12 @@ class ExportController extends ApiControllerBase
*/
public function accountsAction($vpnid)
{
$result = array();
$result = [
null => [
"description" => gettext("(none) Exclude certificate from export"),
"users" => []
]
];
$server = $this->findServer($vpnid);
if ($server !== null) {
// collect certificates for this server's ca

20
src/opnsense/mvc/app/library/OPNsense/OpenVPN/ArchiveOpenVPN.php
View File

@ -75,16 +75,18 @@ class ArchiveOpenVPN extends PlainOpenVPN
mkdir($content_dir, 0700, true);
if (empty($this->config['cryptoapi'])) {
// export keypair
$p12 = $this->export_pkcs12(
$this->config['client_crt'],
$this->config['client_prv'],
!empty($this->config['p12_password']) ? $this->config['p12_password'] : null,
!empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : null
);
if (!empty($this->config['client_crt'])) {
// export keypair
$p12 = $this->export_pkcs12(
$this->config['client_crt'],
$this->config['client_prv'],
!empty($this->config['p12_password']) ? $this->config['p12_password'] : null,
!empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : null
);
file_put_contents("{$content_dir}/{$base_filename}.p12", $p12);
$conf[] = "pkcs12 {$base_filename}.p12";
file_put_contents("{$content_dir}/{$base_filename}.p12", $p12);
$conf[] = "pkcs12 {$base_filename}.p12";
}
} else {
// use internal Windows store, only flush ca (when available)
if (!empty($this->config['server_ca_chain'])) {

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

@ -180,7 +180,8 @@ class PlainOpenVPN extends BaseExporter implements IExportProvider
}
$conf[] = "</ca>";
}
if ($this->config['mode'] !== "server_user" && empty($this->config['cryptoapi'])) {
if (!empty($this->config['client_crt']) && empty($this->config['cryptoapi'])) {
$conf[] = "<cert>";
$conf = array_merge($conf, explode("\n", trim($this->config['client_crt'])));
$conf[] = "</cert>";

20
src/opnsense/mvc/app/library/OPNsense/OpenVPN/TheGreenBow.php
View File

@ -170,15 +170,17 @@ class TheGreenBow extends BaseExporter implements IExportProvider
}
// client certificate
$output->cfg_ssl->cfg_sslconnection->authentication->certificate[0]->public_key =
"\n" . $this->config['client_crt'];
$output->cfg_ssl->cfg_sslconnection->authentication->certificate[0]->private_key =
"\n" . $this->config['client_prv'];
// server CA-chain
$output->cfg_ssl->cfg_sslconnection->authentication->certificate[1]->public_key = "\n" . implode(
"\n",
$this->config['server_ca_chain']
);
if (!empty($this->config['client_crt'])) {
$output->cfg_ssl->cfg_sslconnection->authentication->certificate[0]->public_key =
"\n" . $this->config['client_crt'];
$output->cfg_ssl->cfg_sslconnection->authentication->certificate[0]->private_key =
"\n" . $this->config['client_prv'];
// server CA-chain
$output->cfg_ssl->cfg_sslconnection->authentication->certificate[1]->public_key = "\n" . implode(
"\n",
$this->config['server_ca_chain']
);
}
// export to DOM to reformat+pretty-print output
$dom = new \DOMDocument("1.0");

20
src/opnsense/mvc/app/library/OPNsense/OpenVPN/ViscosityVisz.php
View File

@ -109,16 +109,18 @@ class ViscosityVisz extends PlainOpenVPN
mkdir($content_dir, 0700, true);
if (empty($this->config['cryptoapi'])) {
// export keypair
$p12 = $this->export_pkcs12(
$this->config['client_crt'],
$this->config['client_prv'],
!empty($this->config['p12_password']) ? $this->config['p12_password'] : null,
!empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : null
);
if (!empty($this->config['client_crt'])) {
// export keypair
$p12 = $this->export_pkcs12(
$this->config['client_crt'],
$this->config['client_prv'],
!empty($this->config['p12_password']) ? $this->config['p12_password'] : null,
!empty($this->config['server_ca_chain']) ? $this->config['server_ca_chain'] : null
);
file_put_contents("{$content_dir}/pkcs.p12", $p12);
$conf[] = "pkcs12 pkcs.p12";
file_put_contents("{$content_dir}/pkcs.p12", $p12);
$conf[] = "pkcs12 pkcs.p12";
}
} else {
// use internal Windows store, only flush ca (when available)
if (!empty($this->config['server_ca_chain'])) {