From 32fd2a716b6619debba6b6a5e5775f71b7432449 Mon Sep 17 00:00:00 2001 From: Alexander Wilke Date: Thu, 22 Dec 2011 23:17:44 +0000 Subject: Added information on freeradius cert-manager that there are some disadvantages compared to built-in pfsense Cert-Manager. Explainaition how to use pfsense built-in cert-manager with freeradius. some small fixes on cert-creation and some typos. --- config/freeradius2/freeradius.inc | 41 +++++++++++++++++++++----------- config/freeradius2/freeradiuscerts.xml | 21 +++++++++++++--- config/freeradius2/freeradiuseapconf.xml | 25 ++++++++++--------- pkg_config.8.xml | 3 +-- pkg_config.8.xml.amd64 | 3 +-- 5 files changed, 59 insertions(+), 34 deletions(-) diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc index 28e209b0..5395fdd2 100755 --- a/config/freeradius2/freeradius.inc +++ b/config/freeradius2/freeradius.inc @@ -1533,7 +1533,7 @@ function freeradius_allcertcnf_resync() { $varcertscreateclient = ($arrcerts['varcertscreateclient']?$arrcerts['varcertscreateclient']:'no'); // General variables for deleting: CA, Server, Client - $varcertsdeleteall = ($arrcerts['varcertsdeleteall']?$arrcerts['varcertsdeleteall']:'yes'); + $varcertsdeleteall = ($arrcerts['varcertsdeleteall']?$arrcerts['varcertsdeleteall']:'no'); if ($arrcerts['varcertscreateclient'] == 'yes') { @@ -1543,8 +1543,8 @@ function freeradius_allcertcnf_resync() { exec("rm -f /usr/local/etc/raddb/certs/client.crt"); exec("rm -f /usr/local/etc/raddb/certs/client.key"); exec("rm -f /usr/local/etc/raddb/certs/client.tar"); - - + + // run fuction to create ONLY new client.cnf files based on user input from freeradiuscert.xml freeradius_clientcertcnf_resync(); @@ -1552,11 +1552,18 @@ function freeradius_allcertcnf_resync() { // make bootstrap executable and run to create cert based on client.cnf files exec("chmod 0770 /usr/local/etc/raddb/certs/bootstrap"); exec("/usr/local/etc/raddb/certs/bootstrap"); - - // make bootstrap read-write only for root - exec("chmod 0600 /usr/local/etc/raddb/certs/bootstrap"); - exec("cd /usr/local/etc/raddb/certs && tar -cf client.tar client.crt client.csr client.key ca.der"); - exec("chmod 0600 /usr/local/etc/raddb/certs/client.tar"); + + // rename client generated XX.pem to client.pem // use regex to replace spaces and so on. + $varserial = preg_replace("/\s/","",file_get_contents('/usr/local/etc/raddb/certs/serial.old')); + if (file_exists("/usr/local/etc/raddb/certs/$varserial.pem")) + rename("/usr/local/etc/raddb/certs/$varserial.pem","/usr/local/etc/raddb/certs/client.pem"); + + + // tar client-cert files + exec("cd /usr/local/etc/raddb/certs && tar -cf client.tar client.crt client.csr client.key ca.der client.pem"); + + // Make all files in certs folder re-only for root + exec("chmod -R 0600 /usr/local/etc/raddb/certs/"); } @@ -1570,8 +1577,11 @@ function freeradius_allcertcnf_resync() { exec("rm -f /usr/local/etc/raddb/certs/*.key"); exec("rm -f /usr/local/etc/raddb/certs/*.p12"); exec("rm -f /usr/local/etc/raddb/certs/serial*"); - exec("rm -f /usr/local/etc/raddb/certs/index.txt*"); + exec("rm -f /usr/local/etc/raddb/certs/index*"); + exec("rm -f /usr/local/etc/raddb/certs/dh"); + exec("rm -f /usr/local/etc/raddb/certs/random"); exec("rm -f /usr/local/etc/raddb/certs/client.tar"); + // run fuctions to create new .cnf files based on user input from freeradiuscert.xml freeradius_cacertcnf_resync(); @@ -1586,11 +1596,14 @@ function freeradius_allcertcnf_resync() { // make bootstrap executable and run to create certs based on .cnf files exec("chmod 0770 /usr/local/etc/raddb/certs/bootstrap"); exec("/usr/local/etc/raddb/certs/bootstrap"); - - // make bootstrap read-write only for root - exec("chmod 0600 /usr/local/etc/raddb/certs/bootstrap"); - exec("cd /usr/local/etc/raddb/certs && tar -cf client.tar client.crt client.csr client.key ca.der"); - exec("chmod 0600 /usr/local/etc/raddb/certs/client.tar"); + + // rename client generated 02.pem to client.pem + if (file_exists("/usr/local/etc/raddb/certs/02.pem")) + rename("/usr/local/etc/raddb/certs/02.pem","/usr/local/etc/raddb/certs/client.pem"); + + // tar client-cert files + exec("cd /usr/local/etc/raddb/certs && tar -cf client.tar client.crt client.csr client.key ca.der client.pem"); + exec("chmod -R 0600 /usr/local/etc/raddb/certs/"); // If there were changes on the certificates we need to restart freeradius restart_service('freeradius'); diff --git a/config/freeradius2/freeradiuscerts.xml b/config/freeradius2/freeradiuscerts.xml index 7503fe49..a0b4ac0f 100644 --- a/config/freeradius2/freeradiuscerts.xml +++ b/config/freeradius2/freeradiuscerts.xml @@ -94,7 +94,7 @@ Delete ALL existing Certificates ? varcertsdeleteall ALL existing CAs, Server-Certs and Client-Certs in freeradius certs folder!
- You must delete all existing if you want to create new ones. (Default: Yes)
+ You must delete all existing if you want to create new ones. (Default: No)
Important:
If you like to use certs created on another PC just disable this and click save.]]> select @@ -104,6 +104,21 @@ + + READ BEFORE DOING ANYTHING HERE! + varcertsREADBEFORE + This field is just to make sure you know what you are doing here!
+ If you enter anything the changes here will take effect after "save" - if it's empty - nothing will happen

+ + This page uses the freeradius2 built-in script called "bootstrap" to create CA and certs. The disatvantage of this script is that nothing of your changes will be saved in the global config.xml file. So after a systemcrash or reinstallation of freeradius2 package + all your CA and certs will be lost. If you have a backup of all these files on an USB stick or another server than you can copy them back in the freeradius certs folder.

+ + The better way is to use the pfsense built-in Cert Manager (SYSTEM-> Cert Manager). The CA-Cert and Server-Cert you created there you just have to copy to the freeradius certs folder and pointing to these certs in eap. + The advantage of this is that all your CA and certs will be saved in global config.xml and can be restored.]]> + input + + + Distinguished Name for CA, Server and Client listtopic @@ -171,8 +186,8 @@ Certificate Password (CA, Server and Client) varcertspassword - - This is the password you need to enter in eap.conf so that freeradius can read the cert. (Default: whatever)]]> + password whatever diff --git a/config/freeradius2/freeradiuseapconf.xml b/config/freeradius2/freeradiuseapconf.xml index 504e9bed..40b161f8 100644 --- a/config/freeradius2/freeradiuseapconf.xml +++ b/config/freeradius2/freeradiuseapconf.xml @@ -145,36 +145,35 @@ Private Key Password vareapconfprivatekeypassword - - This is the password which you chose in "Certificates" tab. (Default: whatever)]]> + + This field could be empty. (Default: whatever)]]> password whatever - Private Key File + Server Private Key File vareapconfprivatekeyfile - must be in /usr/local/etc/raddb/certs/ (Default: server.pem)]]> - input - server.pem - - - Private Key File - vareapconfprivatekeyfile - must be in /usr/local/etc/raddb/certs/ (Default: server.pem)]]> + must be in /usr/local/etc/raddb/certs/ (Default: server.pem)
+ TIP: You could use "SYSTEM-> Cert Manager" instead of the freeradius Cert script.
+ You just have to export it there and copy it in the freeradius certs folder.]]> input server.pem Server Certificate File vareapconfcertificatefile - must be in /usr/local/etc/raddb/certs/ (Default: server.pem)]]> + must be in /usr/local/etc/raddb/certs/ (Default: server.pem)
+ TIP: You could use "SYSTEM-> Cert Manager" instead of the freeradius Cert script.
+ You just have to export it there and copy it in the freeradius certs folder.]]> input server.pem CA File vareapconfcafile - must be in /usr/local/etc/raddb/certs/ (Default: ca.pem)]]> + must be in /usr/local/etc/raddb/certs/ (Default: server.pem)
+ TIP: You could use "SYSTEM-> Cert Manager" instead of the freeradius Cert script.
+ You just have to export it there and copy it in the freeradius certs folder.]]> input ca.pem diff --git a/pkg_config.8.xml b/pkg_config.8.xml index c6a52aec..520df97f 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -764,10 +764,9 @@ Do not use together with freeradius package. Both are using the same XML files.]]> http://forum.pfsense.org/index.php/topic,43675.0.html System - 2.1.12 pkg v1.3.4 + 2.1.12 pkg v1.3.5 BETA 2.0 - 2.0.1 Nachtfalke http://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-8-stable/All/ freeradius-2.1.12.tbz diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 52c0ecc5..d49c9bb3 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -806,10 +806,9 @@ Do not use together with freeradius package. Both are using the same XML files.]]> http://forum.pfsense.org/index.php/topic,43675.0.html System - 2.1.12 pkg v1.3.4 + 2.1.12 pkg v1.3.5 BETA 2.0 - 2.0.1 Nachtfalke http://ftp.freebsd.org/pub/FreeBSD/ports/amd64/packages-8-stable/All/ freeradius-2.1.12.tbz -- cgit v1.2.3