netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/freeradius: fix certificate generation (#1277)

Browse Source
This commit is contained in:
alexanderharm
2019-03-29 16:03:39 +01:00
committed by Franco Fichtner
parent 71a8c22268
commit 29a06c77b4
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/freeradius/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= freeradius
PLUGIN_VERSION= 1.9.1
PLUGIN_VERSION= 1.9.2
PLUGIN_COMMENT= RADIUS Authentication, Authorization and Accounting Server
PLUGIN_DEPENDS= freeradius3
PLUGIN_MAINTAINER= m.muenz@gmail.com
net/freeradius/src/opnsense/mvc/app/controllers/OPNsense/Freeradius/forms/eap.xml
+1 -1
View File
@@ -15,7 +15,7 @@
<id>eap.ca</id>
<label>Root Certificate</label>
<type>dropdown</type>
<help>Choose the Root CA.</help>
<help>Choose the Root CA. This CA will be trusted to issue client certificates for authentication.</help>
</field>
<field>
<id>eap.certificate</id>
net/freeradius/src/opnsense/scripts/Freeradius/generate_certs.php
+20 -2
View File
@@ -68,14 +68,32 @@ if (isset($configObj->OPNsense->freeradius)) {
// generate ca pem file
if (!empty($cert->caref)) {
$cert = (array)$cert;
$ca_pem_content .= ca_chain($cert);
$cert_pem_content .= ca_chain($cert);
}
}
}
}
$cert_refid = (string)$find_cert->ca;
// if eap has a ca-certificate attached, search for its contents
if ($cert_refid != "") {
foreach ($configObj->ca as $ca) {
if ($cert_refid == (string)$ca->refid) {
// generate cert pem file
$pem_content = trim(str_replace("\n\n", "\n", str_replace(
"\r",
"",
base64_decode((string)$ca->crt)
)));
$pem_content .= "\n";
$ca_pem_content .= $pem_content;
}
}
}
$cert_refid = (string)$find_cert->crl;
// if eap has a certificate attached, search for its contents
// if eap has a crl attached, search for its contents
if ($cert_refid != "") {
foreach ($configObj->crl as $crl) {
if ($cert_refid == (string)$crl->refid && !empty((string)$crl->text)) {