summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/inc/certs.inc224
-rw-r--r--etc/inc/functions.inc1
-rw-r--r--etc/inc/xmlparse.inc16
-rw-r--r--usr/local/www/system_authservers.php2
-rw-r--r--usr/local/www/system_camanager.php459
-rw-r--r--usr/local/www/system_certmanager.php752
-rw-r--r--usr/local/www/system_groupmanager.php2
-rw-r--r--usr/local/www/system_usermanager.php2
-rwxr-xr-xusr/local/www/system_usermanager_settings.php2
9 files changed, 1455 insertions, 5 deletions
diff --git a/etc/inc/certs.inc b/etc/inc/certs.inc
new file mode 100644
index 0000000..f004abf
--- /dev/null
+++ b/etc/inc/certs.inc
@@ -0,0 +1,224 @@
+<?php
+/* $Id$ */
+/*
+ Copyright (C) 2008 Shrew Soft Inc
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+ DISABLE_PHP_LINT_CHECKING
+*/
+
+require_once("functions.inc");
+
+function & lookup_ca($refid) {
+ global $config;
+
+ foreach ($config['system']['ca'] as & $ca)
+ if ($ca['refid'] == $refid)
+ return $ca;
+
+ return false;
+}
+
+function & lookup_cert($refid) {
+ global $config;
+
+ foreach ($config['system']['cert'] as & $cert)
+ if ($cert['refid'] == $refid)
+ return $cert;
+
+ return false;
+}
+
+function ca_import(& $ca, $str) {
+
+ $ca['crt'] = base64_encode($str);
+
+ return true;
+}
+
+function ca_create(& $ca, $keylen, $lifetime, $dn) {
+
+ $args = array(
+ "digest_alg" => "sha1",
+ "private_key_bits" => $keylen,
+ "private_key_type" => OPENSSL_KEYTYPE_RSA,
+ "encrypt_key" => false);
+
+ // generate a new key pair
+ $res_key = openssl_pkey_new();
+
+ // generate a certificate signing request
+ $res_csr = openssl_csr_new($dn, $res_key, $args);
+
+ // self sign the certificate
+ $res_crt = openssl_csr_sign($res_csr, null, $res_key, $lifetime, $args);
+
+ // export our certificate data
+ openssl_pkey_export($res_key, $str_key);
+ openssl_x509_export($res_crt, $str_crt);
+
+ // return our ca information
+ $ca['crt'] = base64_encode($str_crt);
+ $ca['prv'] = base64_encode($str_key);
+ $ca['serial'] = 0;
+
+ return true;
+}
+
+function cert_import(& $cert, $crt_str, $key_str) {
+
+ $cert['crt'] = base64_encode($crt_str);
+ $cert['prv'] = base64_encode($key_str);
+
+ return true;
+}
+
+function cert_create(& $cert, $caref, $keylen, $lifetime, $dn) {
+
+ $ca =& lookup_ca($caref);
+ if (!$ca)
+ return false;
+
+ $ca_str_crt = base64_decode($ca['crt']);
+ $ca_str_key = base64_decode($ca['prv']);
+ $ca_res_crt = openssl_x509_read($ca_str_crt);
+ $ca_res_key = openssl_pkey_get_private($ca_str_key);
+ $ca_serial = $ca['serial']++;
+
+ $args = array(
+ "digest_alg" => "sha1",
+ "private_key_bits" => $keylen,
+ "private_key_type" => OPENSSL_KEYTYPE_RSA,
+ "encrypt_key" => false);
+
+ // generate a new key pair
+ $res_key = openssl_pkey_new();
+
+ // generate a certificate signing request
+ $res_csr = openssl_csr_new($dn, $res_key, $args);
+
+ // self sign the certificate
+ $res_crt = openssl_csr_sign($res_csr, $ca_res_crt, $ca_res_key, $lifetime,
+ $args, $ca_serial);
+
+ // export our certificate data
+ openssl_pkey_export($res_key, $str_key);
+ openssl_x509_export($res_crt, $str_crt);
+
+ // return our certificate information
+ $cert['caref'] = $caref;
+ $cert['crt'] = base64_encode($str_crt);
+ $cert['prv'] = base64_encode($str_key);
+
+ return true;
+}
+
+function csr_generate(& $cert, $keylen, $dn) {
+
+ $args = array(
+ "digest_alg" => "sha1",
+ "private_key_bits" => $keylen,
+ "private_key_type" => OPENSSL_KEYTYPE_RSA,
+ "encrypt_key" => false);
+
+ // generate a new key pair
+ $res_key = openssl_pkey_new();
+
+ // generate a certificate signing request
+ $res_csr = openssl_csr_new($dn, $res_key, $args);
+
+ // export our request data
+ openssl_pkey_export($res_key, $str_key);
+ openssl_csr_export($res_csr, $str_csr);
+
+ // return our request information
+ $cert['csr'] = base64_encode($str_csr);
+ $cert['prv'] = base64_encode($str_key);
+
+ return true;
+}
+
+function csr_complete(& $cert, $str_crt) {
+
+ // return our request information
+ $cert['crt'] = base64_encode($str_crt);
+ unset($cert['csr']);
+
+ return true;
+}
+
+function csr_get_subject($str_crt, $decode = true) {
+
+ if ($decode)
+ $str_crt = base64_decode($str_crt);
+
+ $components = openssl_csr_get_subject($str_crt);
+
+ if (!is_array($components))
+ return "unknown";
+
+ foreach ($components as $a => $v) {
+ if (!strlen($subject))
+ $subject = "{$a}={$v}";
+ else
+ $subject = "{$a}={$v}, {$subject}";
+ }
+
+ return $subject;
+}
+
+function cert_get_subject($str_crt, $decode = true) {
+
+ if ($decode)
+ $str_crt = base64_decode($str_crt);
+
+ $inf_crt = openssl_x509_parse($str_crt);
+ $components = $inf_crt['subject'];
+
+ if (!is_array($components))
+ return "unknown";
+
+ foreach ($components as $a => $v) {
+ if (!strlen($subject))
+ $subject = "{$a}={$v}";
+ else
+ $subject = "{$a}={$v}, {$subject}";
+ }
+
+ return $subject;
+}
+
+function cert_get_subject_array($crt) {
+ $str_crt = base64_decode($crt);
+ $inf_crt = openssl_x509_parse($str_crt);
+ $components = $inf_crt['subject'];
+ $subject_array = array();
+
+ foreach($components as $a => $v)
+ $subject_array[] = array('a' => $a, 'v' => $v);
+
+ return $subject_array;
+}
+
+?>
diff --git a/etc/inc/functions.inc b/etc/inc/functions.inc
index 0fd4811..c5c7cca 100644
--- a/etc/inc/functions.inc
+++ b/etc/inc/functions.inc
@@ -72,6 +72,7 @@ if(!function_exists("pfSenseHeader")) {
/* include all configuration functions */
require_once("auth.inc");
require_once("priv.inc");
+require_once("certs.inc");
require_once("captiveportal.inc");
require_once("filter.inc");
require_once("interfaces.inc");
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc
index fc74f3c..a7b3192 100644
--- a/etc/inc/xmlparse.inc
+++ b/etc/inc/xmlparse.inc
@@ -32,11 +32,17 @@
/* The following items will be treated as arrays in config.xml */
function listtags() {
- $ret = explode(" ", "element alias aliasurl allowedip cacert config columnitem disk dnsserver domainoverrides " .
- "earlyshellcmd encryption-algorithm-option field fieldname hash-algorithm-option " .
- "hosts group member interface_array item key lbpool menu mobilekey monitor_type mount onetoone option ppp package passthrumac phase1 phase2 priv proxyarpnet " .
- "queue pages pipe route row rule schedule service servernat servers serversdisabled earlyshellcmd shellcmd staticmap subqueue " .
- "timerange tunnel user authserver vip virtual_server vlan winsserver ntpserver wolentry widget depends_on_package gateway_item gateway_group dyndns dnsupdate gre gif bridged lagg");
+ $ret = explode(" ",
+ "element alias aliasurl allowedip cacert config columnitem disk ".
+ "dnsserver domainoverrides earlyshellcmd encryption-algorithm-option ".
+ "field fieldname hash-algorithm-option hosts group member ca cert ".
+ "interface_array item key lbpool menu mobilekey monitor_type ".
+ "mount onetoone option ppp package passthrumac phase1 phase2 priv ".
+ "proxyarpnet queue pages pipe route row rule schedule service ".
+ "servernat servers serversdisabled earlyshellcmd shellcmd staticmap ".
+ "subqueue timerange tunnel user authserver vip virtual_server vlan ".
+ "winsserver ntpserver wolentry widget depends_on_package ".
+ "gateway_item gateway_group dyndns dnsupdate gre gif bridged lagg");
return $ret;
}
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index 5a48b21..e85c615 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -344,6 +344,8 @@ function radius_srvcschange(){
$tab_array = array();
$tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
$tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
+ $tab_array[] = array(gettext("CAs"), false, "system_camanager.php");
+ $tab_array[] = array(gettext("Certificates"), false, "system_certmanager.php");
$tab_array[] = array(gettext("Servers"), true, "system_authservers.php");
$tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
display_top_tabs($tab_array);
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
new file mode 100644
index 0000000..168372c
--- /dev/null
+++ b/usr/local/www/system_camanager.php
@@ -0,0 +1,459 @@
+<?php
+/*
+ system_camanager.php
+
+ Copyright (C) 2008 Shrew Soft Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+
+##|+PRIV
+##|*IDENT=page-system-camanager
+##|*NAME=System: CA Manager
+##|*DESCR=Allow access to the 'System: CA Manager' page.
+##|*MATCH=system_camanager.php*
+##|-PRIV
+
+require("guiconfig.inc");
+
+$ca_methods = array(
+ "existing" => "Import an existing Certificate Authority",
+ "internal" => "Create an internal Certificate Authority");
+
+$ca_keylens = array( "512", "1024", "2048", "4096");
+
+$pgtitle = array("System", "Certificate Authority Manager");
+
+$id = $_GET['id'];
+if (isset($_POST['id']))
+ $id = $_POST['id'];
+
+if (!is_array($config['system']['ca']))
+ $config['system']['ca'] = array();
+
+$a_ca =& $config['system']['ca'];
+
+if (!is_array($config['system']['cert']))
+ $config['system']['cert'] = array();
+
+$a_cert =& $config['system']['cert'];
+
+$act = $_GET['act'];
+if ($_POST['act'])
+ $act = $_POST['act'];
+
+if ($act == "del") {
+
+ if (!$a_ca[$id]) {
+ pfSenseHeader("system_camanager.php");
+ exit;
+ }
+
+ $index = count($a_cert) - 1;
+ for (;$index >=0; $index--)
+ if ($a_cert[$index]['caref'] == $a_ca[$id]['refid'])
+ unset($a_cert[$index]);
+
+ $name = $a_ca[$id]['name'];
+ unset($a_ca[$id]);
+ write_config();
+ $savemsg = gettext("Certificate Authority")." {$name} ".
+ gettext("successfully deleted")."<br/>";
+}
+
+if ($act == "new") {
+ $pconfig['method'] = $_GET['method'];
+ $pconfig['keylen'] = "2048";
+ $pconfig['lifetime'] = "365";
+ $pconfig['dn_commonname'] = "internal-ca";
+}
+
+if ($_POST) {
+
+ unset($input_errors);
+ $pconfig = $_POST;
+
+ /* input validation */
+ if ($pconfig['method'] == "existing") {
+ $reqdfields = explode(" ", "name cert");
+ $reqdfieldsn = explode(",", "Desriptive name,Certificate data");
+ }
+ if ($pconfig['method'] == "internal") {
+ $reqdfields = explode(" ",
+ "name keylen lifetime dn_country dn_state dn_city ".
+ "dn_organization dn_email dn_commonname");
+ $reqdfieldsn = explode(",",
+ "Desriptive name,Key length,Lifetime,".
+ "Distinguished name Country Code,".
+ "Distinguished name State or Province,".
+ "Distinguished name City,".
+ "Distinguished name Organization,".
+ "Distinguished name Email Address,".
+ "Distinguished name Common Name");
+ }
+
+ do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+ /* if this is an AJAX caller then handle via JSON */
+ if (isAjax() && is_array($input_errors)) {
+ input_errors2Ajax($input_errors);
+ exit;
+ }
+
+ /* save modifications */
+ if (!$input_errors) {
+
+ $ca = array();
+ $ca['refid'] = uniqid();
+ if (isset($id) && $a_ca[$id])
+ $ca = $a_ca[$id];
+
+ $ca['name'] = $pconfig['name'];
+
+ if ($pconfig['method'] == "existing")
+ ca_import($ca, $pconfig['cert']);
+
+ if ($pconfig['method'] == "internal")
+ {
+ $dn = array(
+ 'countryName' => $pconfig['dn_country'],
+ 'stateOrProvinceName' => $pconfig['dn_state'],
+ 'localityName' => $pconfig['dn_city'],
+ 'organizationName' => $pconfig['dn_organization'],
+ 'emailAddress' => $pconfig['dn_email'],
+ 'commonName' => $pconfig['dn_commonname']);
+
+ ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn);
+ }
+
+ if (isset($id) && $a_ca[$id])
+ $a_ca[$id] = $ca;
+ else
+ $a_ca[] = $ca;
+
+ write_config();
+
+// pfSenseHeader("system_camanager.php");
+ }
+}
+
+include("head.inc");
+?>
+
+<body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>">
+<?php include("fbegin.inc"); ?>
+<script type="text/javascript">
+<!--
+
+function method_change() {
+
+ method = document.iform.method.selectedIndex;
+
+ switch (method) {
+ case 0:
+ document.getElementById("existing").style.display="";
+ document.getElementById("internal").style.display="none";
+ break;
+ case 1:
+ document.getElementById("existing").style.display="none";
+ document.getElementById("internal").style.display="";
+ break;
+ }
+}
+
+//-->
+</script>
+<?php
+ if ($input_errors)
+ print_input_errors($input_errors);
+ if ($savemsg)
+ print_info_box($savemsg);
+?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="tabnavtbl">
+ <?php
+ $tab_array = array();
+ $tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
+ $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
+ $tab_array[] = array(gettext("CAs"), true, "system_camanager.php");
+ $tab_array[] = array(gettext("Certificates"), false, "system_certmanager.php");
+ $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
+ $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
+ display_top_tabs($tab_array);
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="tabcont">
+
+ <?php if ($act == "new" || $act == "save" || $input_errors): ?>
+
+ <form action="system_camanager.php" method="post" name="iform" id="iform">
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
+ <td width="78%" class="vtable">
+ <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/>
+ </td>
+ </tr>
+ <?php if (!isset($id)): ?>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td>
+ <td width="78%" class="vtable">
+ <select name='method' id='method' class="formselect" onchange='method_change()'>
+ <?php
+ foreach($ca_methods as $method => $desc):
+ $selected = "";
+ if ($pconfig['method'] == $method)
+ $selected = "selected";
+ ?>
+ <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option>
+ <?php endforeach; ?>
+ </select>
+ </td>
+ </tr>
+ <?php endif; ?>
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing">
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">Existing Certificate Authority</td>
+ </tr>
+
+ <tr>
+ <td width="22%" valign="top" class="vncellreq">Certificate data</td>
+ <td width="78%" class="vtable">
+ <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea>
+ <br>
+ Paste a certificate in X.509 PEM format here.</td>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal">
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">Internal Certificate Authority</td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td>
+ <td width="78%" class="vtable">
+ <select name='keylen' id='keylen' class="formselect">
+ <?php
+ foreach( $ca_keylens as $len):
+ $selected = "";
+ if ($pconfig['keylen'] == $len)
+ $selected = "selected";
+ ?>
+ <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option>
+ <?php endforeach; ?>
+ </select>
+ bits
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td>
+ <td width="78%" class="vtable">
+ <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/>
+ days
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td>
+ <td width="78%" class="vtable">
+ <table border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td align="right">Country Code : &nbsp;</td>
+ <td align="left">
+ <input name="dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ US
+ <em>( two letters )</em>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">State or Province : &nbsp;</td>
+ <td align="left">
+ <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ Texas
+ </td>
+ </tr>
+ <tr>
+ <td align="right">City : &nbsp;</td>
+ <td align="left">
+ <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ Austin
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Organization : &nbsp;</td>
+ <td align="left">
+ <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ My Company Inc.
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Email Address : &nbsp;</td>
+ <td align="left">
+ <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ admin@mycompany.com
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Common Name : &nbsp;</td>
+ <td align="left">
+ <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ internal-ca
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td width="22%" valign="top">&nbsp;</td>
+ <td width="78%">
+ <input id="submit" name="save" type="submit" class="formbtn" value="Save" />
+ <?php if (isset($id) && $a_ca[$id]): ?>
+ <input name="id" type="hidden" value="<?=$id;?>" />
+ <?php endif;?>
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ <?php else: ?>
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="20%" class="listhdrr">Name</td>
+ <td width="10%" class="listhdrr">Internal</td>
+ <td width="10%" class="listhdrr">Certificates</td>
+ <td width="40%" class="listhdrr">Distinguished Name</td>
+ <td width="10%" class="list"></td>
+ </tr>
+ <?php
+ $i = 0;
+ foreach($a_ca as $ca):
+ $name = htmlspecialchars($ca['name']);
+ $subj = cert_get_subject($ca['crt']);
+ $subj = htmlspecialchars($subj);
+ $certcount = 0;
+
+ // TODO : Need gray certificate icon
+
+ if($ca['prv']) {
+ $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png";
+ $internal = "YES";
+
+ foreach ($a_cert as $cert)
+ if ($cert['caref'] == $ca['refid'])
+ $certcount++;
+ } else {
+ $caimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png";
+ $internal = "NO";
+ }
+ ?>
+ <tr>
+ <td class="listlr">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td align="left" valign="center">
+ <img src="<?=$caimg;?>" alt="CA" title="CA" border="0" height="16" width="16" />
+ </td>
+ <td align="left" valign="middle">
+ <?=$name;?>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="listr"><?=$internal;?>&nbsp;</td>
+ <td class="listr"><?=$certcount;?>&nbsp;</td>
+ <td class="listr"><?=$subj;?>&nbsp;</td>
+ <td valign="middle" nowrap class="list">
+ <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and all associated Certificates?");?>')">
+ <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete ca" alt="delete ca" width="17" height="17" border="0" />
+ </a>
+ </td>
+ </tr>
+ <?php
+ $i++;
+ endforeach;
+ ?>
+ <tr>
+ <td class="list" colspan="4"></td>
+ <td class="list">
+ <a href="system_camanager.php?act=new">
+ <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add or import ca" alt="add ca" width="17" height="17" border="0" />
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4">
+ <p>
+ <?=gettext("Additional trusted certificate authorities can be added here.");?>
+ </p>
+ </td>
+ </tr>
+ </table>
+
+ <?php endif; ?>
+
+ </td>
+ </tr>
+</table>
+<?php include("fend.inc");?>
+<script type="text/javascript">
+<!--
+
+method_change();
+
+//-->
+</script>
+
+</body>
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
new file mode 100644
index 0000000..f32b10a
--- /dev/null
+++ b/usr/local/www/system_certmanager.php
@@ -0,0 +1,752 @@
+<?php
+/*
+ system_certmanager.php
+
+ Copyright (C) 2008 Shrew Soft Inc.
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+*/
+
+##|+PRIV
+##|*IDENT=page-system-certmanager
+##|*NAME=System: Certificate Manager
+##|*DESCR=Allow access to the 'System: Certificate Manager' page.
+##|*MATCH=system_certmanager.php*
+##|-PRIV
+
+require("guiconfig.inc");
+
+$cert_methods = array(
+ "existing" => "Import an existing Certificate",
+ "internal" => "Create an internal Certificate",
+ "external" => "Create a Certificate Signing Request");
+
+$cert_keylens = array( "512", "1024", "2048", "4096");
+
+$pgtitle = array("System", "Certificate Manager");
+
+$id = $_GET['id'];
+if (isset($_POST['id']))
+ $id = $_POST['id'];
+
+if (!is_array($config['system']['ca']))
+ $config['system']['ca'] = array();
+
+$a_ca =& $config['system']['ca'];
+
+if (!is_array($config['system']['cert']))
+ $config['system']['cert'] = array();
+
+$a_cert =& $config['system']['cert'];
+
+$internal_ca_count = 0;
+foreach ($a_ca as $ca)
+ if ($ca['prv'])
+ $internal_ca_count++;
+
+$act = $_GET['act'];
+if ($_POST['act'])
+ $act = $_POST['act'];
+
+if ($act == "del") {
+
+ if (!$a_cert[$id]) {
+ pfSenseHeader("system_certmanager.php");
+ exit;
+ }
+
+ $name = $a_cert[$id]['name'];
+ unset($a_cert[$id]);
+ write_config();
+ $savemsg = gettext("Certificate")." {$name} ".
+ gettext("successfully deleted")."<br/>";
+}
+
+if ($act == "new") {
+ $pconfig['method'] = $_GET['method'];
+ $pconfig['keylen'] = "2048";
+ $pconfig['lifetime'] = "365";
+}
+
+if ($act == "csr") {
+
+ if (!$a_cert[$id]) {
+ pfSenseHeader("system_certmanager.php");
+ exit;
+ }
+
+ $pconfig['name'] = $a_cert[$id]['name'];
+ $pconfig['csr'] = base64_decode($a_cert[$id]['csr']);
+}
+
+if ($_POST) {
+
+ if ($_POST['save'] == "Save") {
+
+ unset($input_errors);
+ $pconfig = $_POST;
+
+ /* input validation */
+ if ($pconfig['method'] == "existing") {
+ $reqdfields = explode(" ",
+ "name cert key");
+ $reqdfieldsn = explode(",",
+ "Desriptive name,Certificate data,Key data");
+ }
+
+ if ($pconfig['method'] == "internal") {
+ $reqdfields = explode(" ",
+ "name caref keylen lifetime dn_country dn_state dn_city ".
+ "dn_organization dn_email dn_commonname");
+ $reqdfieldsn = explode(",",
+ "Desriptive name,Certificate authority,Key length,Lifetime,".
+ "Distinguished name Country Code,".
+ "Distinguished name State or Province,".
+ "Distinguished name City,".
+ "Distinguished name Organization,".
+ "Distinguished name Email Address,".
+ "Distinguished name Common Name");
+ }
+
+ if ($pconfig['method'] == "external") {
+ $reqdfields = explode(" ",
+ "name csr_keylen csr_dn_country csr_dn_state csr_dn_city ".
+ "csr_dn_organization csr_dn_email csr_dn_commonname");
+ $reqdfieldsn = explode(",",
+ "Desriptive name,Key length,".
+ "Distinguished name Country Code,".
+ "Distinguished name State or Province,".
+ "Distinguished name City,".
+ "Distinguished name Organization,".
+ "Distinguished name Email Address,".
+ "Distinguished name Common Name");
+ }
+
+ do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+ /* if this is an AJAX caller then handle via JSON */
+ if (isAjax() && is_array($input_errors)) {
+ input_errors2Ajax($input_errors);
+ exit;
+ }
+
+ /* save modifications */
+ if (!$input_errors) {
+
+ $cert = array();
+ $cert['refid'] = uniqid();
+ if (isset($id) && $a_cert[$id])
+ $cert = $a_cert[$id];
+
+ $cert['name'] = $pconfig['name'];
+
+ if ($pconfig['method'] == "existing")
+ cert_import($cert, $pconfig['cert'], $pconfig['key']);
+
+ if ($pconfig['method'] == "internal") {
+ $dn = array(
+ 'countryName' => $pconfig['dn_country'],
+ 'stateOrProvinceName' => $pconfig['dn_state'],
+ 'localityName' => $pconfig['dn_city'],
+ 'organizationName' => $pconfig['dn_organization'],
+ 'emailAddress' => $pconfig['dn_email'],
+ 'commonName' => $pconfig['dn_commonname']);
+
+ cert_create($cert, $pconfig['caref'], $pconfig['keylen'],
+ $pconfig['lifetime'], $dn);
+ }
+
+ if ($pconfig['method'] == "external") {
+ $dn = array(
+ 'countryName' => $pconfig['csr_dn_country'],
+ 'stateOrProvinceName' => $pconfig['csr_dn_state'],
+ 'localityName' => $pconfig['csr_dn_city'],
+ 'organizationName' => $pconfig['csr_dn_organization'],
+ 'emailAddress' => $pconfig['csr_dn_email'],
+ 'commonName' => $pconfig['csr_dn_commonname']);
+
+ csr_generate($cert, $pconfig['csr_keylen'], $dn);
+ }
+
+ if (isset($id) && $a_cert[$id])
+ $a_cert[$id] = $cert;
+ else
+ $a_cert[] = $cert;
+
+ write_config();
+
+// pfSenseHeader("system_certmanager.php");
+ }
+ }
+
+ if ($_POST['save'] == "Update") {
+ unset($input_errors);
+ $pconfig = $_POST;
+
+ /* input validation */
+ $reqdfields = explode(" ", "name cert");
+ $reqdfieldsn = explode(",", "Desriptive name,Final Certificate data");
+
+ do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
+
+ /* make sure this csr and certificate subjects match */
+ $subj_csr = csr_get_subject($pconfig['csr'], false);
+ $subj_cert = cert_get_subject($pconfig['cert'], false);
+
+ if (strcmp($subj_csr,$subj_cert))
+ $input_errors[] = gettext("The certificate subject '{$subj_cert}' does not match the signing request subject.");
+
+ /* if this is an AJAX caller then handle via JSON */
+ if (isAjax() && is_array($input_errors)) {
+ input_errors2Ajax($input_errors);
+ exit;
+ }
+
+ /* save modifications */
+ if (!$input_errors) {
+
+ $cert = $a_cert[$id];
+
+ $cert['name'] = $pconfig['name'];
+
+ csr_complete($cert, $pconfig['cert']);
+
+ $a_cert[$id] = $cert;
+
+ write_config();
+
+ pfSenseHeader("system_certmanager.php");
+ }
+ }
+}
+
+include("head.inc");
+?>
+
+<body link="#000000" vlink="#000000" alink="#000000" onload="<?= $jsevents["body"]["onload"] ?>">
+<?php include("fbegin.inc"); ?>
+<script type="text/javascript">
+<!--
+
+function method_change() {
+
+<?php
+ if ($internal_ca_count)
+ $submit_style = "";
+ else
+ $submit_style = "none";
+?>
+
+ method = document.iform.method.selectedIndex;
+
+ switch (method) {
+ case 0:
+ document.getElementById("existing").style.display="";
+ document.getElementById("internal").style.display="none";
+ document.getElementById("external").style.display="none";
+ break;
+ case 1:
+ document.getElementById("existing").style.display="none";
+ document.getElementById("internal").style.display="";
+ document.getElementById("external").style.display="none";
+ document.getElementById("submit").style.display="<?=$submit_style;?>";
+ break;
+ case 2:
+ document.getElementById("existing").style.display="none";
+ document.getElementById("internal").style.display="none";
+ document.getElementById("external").style.display="";
+ break;
+ }
+}
+
+<?php if ($internal_ca_count): ?>
+function internalca_change() {
+
+ index = document.iform.caref.selectedIndex;
+ caref = document.iform.caref[index].value;
+
+ switch (caref) {
+<?php
+ foreach ($a_ca as $ca):
+ if (!$ca['prv'])
+ continue;
+ $subject = cert_get_subject_array($ca['crt']);
+?>
+ case "<?=$ca['refid'];?>":
+ document.iform.dn_country.value = "<?=$subject[0]['v'];?>";
+ document.iform.dn_state.value = "<?=$subject[1]['v'];?>";
+ document.iform.dn_city.value = "<?=$subject[2]['v'];?>";
+ document.iform.dn_organization.value = "<?=$subject[3]['v'];?>";
+ break;
+<?php endforeach; ?>
+ }
+}
+<?php endif; ?>
+
+//-->
+</script>
+<?php
+ if ($input_errors)
+ print_input_errors($input_errors);
+ if ($savemsg)
+ print_info_box($savemsg);
+?>
+<table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td class="tabnavtbl">
+ <?php
+ $tab_array = array();
+ $tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
+ $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
+ $tab_array[] = array(gettext("CAs"), false, "system_camanager.php");
+ $tab_array[] = array(gettext("Certificates"), true, "system_certmanager.php");
+ $tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
+ $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
+ display_top_tabs($tab_array);
+ ?>
+ </td>
+ </tr>
+ <tr>
+ <td class="tabcont">
+
+ <?php if ($act == "new" || (($_POST['save'] == "Save") && $input_errors)): ?>
+
+ <form action="system_certmanager.php" method="post" name="iform" id="iform">
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
+ <td width="78%" class="vtable">
+ <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/>
+ </td>
+ </tr>
+ <?php if (!isset($id)): ?>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Method");?></td>
+ <td width="78%" class="vtable">
+ <select name='method' id='method' class="formselect" onchange='method_change()'>
+ <?php
+ foreach($cert_methods as $method => $desc):
+ $selected = "";
+ if ($pconfig['method'] == $method)
+ $selected = "selected";
+ ?>
+ <option value="<?=$method;?>"<?=$selected;?>><?=$desc;?></option>
+ <?php endforeach; ?>
+ </select>
+ </td>
+ </tr>
+ <?php endif; ?>
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0" id="existing">
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">Existing Certificate</td>
+ </tr>
+
+ <tr>
+ <td width="22%" valign="top" class="vncellreq">Certificate data</td>
+ <td width="78%" class="vtable">
+ <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea>
+ <br>
+ Paste a certificate in X.509 PEM format here.</td>
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq">Private key data</td>
+ <td width="78%" class="vtable">
+ <textarea name="key" id="key" cols="65" rows="7" class="formfld_cert"><?=$pconfig['key'];?></textarea>
+ <br>
+ Paste a private key in X.509 PEM format here.</td>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0" id="internal">
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">Internal Certificate</td>
+ </tr>
+
+ <?php if (!$internal_ca_count): ?>
+
+ <tr>
+ <td colspan="2" align="center" class="vtable">
+ No internal Certifica Authorities have been defined. You must
+ <a href="system_camanager.php?act=new&method=internal">create</a>
+ an internal CA before creating an internal certificate.
+ </td>
+ </tr>
+
+ <?php else: ?>
+
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Certificate authority");?></td>
+ <td width="78%" class="vtable">
+ <select name='caref' id='caref' class="formselect" onChange='internalca_change()'>
+ <?php
+ foreach( $a_ca as $ca):
+ if (!$ca['prv'])
+ continue;
+ $selected = "";
+ if ($pconfig['caref'] == $ca['refid'])
+ $selected = "selected";
+ ?>
+ <option value="<?=$ca['refid'];?>"<?=$selected;?>><?=$ca['name'];?></option>
+ <?php endforeach; ?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td>
+ <td width="78%" class="vtable">
+ <select name='keylen' class="formselect">
+ <?php
+ foreach( $cert_keylens as $len):
+ $selected = "";
+ if ($pconfig['keylen'] == $len)
+ $selected = "selected";
+ ?>
+ <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option>
+ <?php endforeach; ?>
+ </select>
+ bits
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td>
+ <td width="78%" class="vtable">
+ <input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/>
+ days
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td>
+ <td width="78%" class="vtable">
+ <table border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td align="right">Country Code : &nbsp;</td>
+ <td align="left">
+ <input name="dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>" readonly/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">State or Province : &nbsp;</td>
+ <td align="left">
+ <input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>" readonly/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">City : &nbsp;</td>
+ <td align="left">
+ <input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>" readonly/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Organization : &nbsp;</td>
+ <td align="left">
+ <input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>" readonly/>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Email Address : &nbsp;</td>
+ <td align="left">
+ <input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ webadmin@mycompany.com
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Common Name : &nbsp;</td>
+ <td align="left">
+ <input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ www.pfsense.org
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+
+ <?php endif; ?>
+
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0" id="external">
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">External Signing Request</td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Key length");?></td>
+ <td width="78%" class="vtable">
+ <select name='csr_keylen' class="formselect">
+ <?php
+ foreach( $cert_keylens as $len):
+ $selected = "";
+ if ($pconfig['keylen'] == $len)
+ $selected = "selected";
+ ?>
+ <option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option>
+ <?php endforeach; ?>
+ </select>
+ bits
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Distinguished name");?></td>
+ <td width="78%" class="vtable">
+ <table border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td align="right">Country Code : &nbsp;</td>
+ <td align="left">
+ <input name="csr_dn_country" type="text" class="formfld unknown" size="2" value="<?=htmlspecialchars($pconfig['csr_dn_country']);?>" />
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ US
+ &nbsp;
+ <em>( two letters )</em>
+ </td>
+ </tr>
+ <tr>
+ <td align="right">State or Province : &nbsp;</td>
+ <td align="left">
+ <input name="csr_dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_state']);?>" />
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ Texas
+ </td>
+ </tr>
+ <tr>
+ <td align="right">City : &nbsp;</td>
+ <td align="left">
+ <input name="csr_dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_city']);?>" />
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ Austin
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Organization : &nbsp;</td>
+ <td align="left">
+ <input name="csr_dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['csr_dn_organization']);?>" />
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ My Company Inc.
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Email Address : &nbsp;</td>
+ <td align="left">
+ <input name="csr_dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['csr_dn_email']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ webadmin@mycompany.com
+ </td>
+ </tr>
+ <tr>
+ <td align="right">Common Name : &nbsp;</td>
+ <td align="left">
+ <input name="csr_dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['csr_dn_commonname']);?>"/>
+ &nbsp;
+ <em>ex:</em>
+ &nbsp;
+ www.pfsense.org
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td width="22%" valign="top">&nbsp;</td>
+ <td width="78%">
+ <input id="submit" name="save" type="submit" class="formbtn" value="Save" />
+ <?php if (isset($id) && $a_cert[$id]): ?>
+ <input name="id" type="hidden" value="<?=$id;?>" />
+ <?php endif;?>
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ <?php elseif ($act == "csr" || (($_POST['save'] == "Update") && $input_errors)):?>
+
+ <form action="system_certmanager.php" method="post" name="iform" id="iform">
+ <table width="100%" border="0" cellpadding="6" cellspacing="0">
+ <tr>
+ <td width="22%" valign="top" class="vncellreq"><?=gettext("Descriptive name");?></td>
+ <td width="78%" class="vtable">
+ <input name="name" type="text" class="formfld unknown" id="name" size="20" value="<?=htmlspecialchars($pconfig['name']);?>"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="list" height="12"></td>
+ </tr>
+ <tr>
+ <td colspan="2" valign="top" class="listtopic">Complete Signing Request</td>
+ </tr>
+
+ <tr>
+ <td width="22%" valign="top" class="vncellreq">Signing Request data</td>
+ <td width="78%" class="vtable">
+ <textarea name="csr" id="csr" cols="65" rows="7" class="formfld_cert" readonly><?=$pconfig['csr'];?></textarea>
+ <br>
+ Copy the certificate signing data from here and forward it to your certificate authority for singing.</td>
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top" class="vncellreq">Final Certificate data</td>
+ <td width="78%" class="vtable">
+ <textarea name="cert" id="cert" cols="65" rows="7" class="formfld_cert"><?=$pconfig['cert'];?></textarea>
+ <br>
+ Paste the certificate received from your cerificate authority here.</td>
+ </td>
+ </tr>
+ <tr>
+ <td width="22%" valign="top">&nbsp;</td>
+ <td width="78%">
+ <input id="submit" name="save" type="submit" class="formbtn" value="Update" />
+ <?php if (isset($id) && $a_cert[$id]): ?>
+ <input name="id" type="hidden" value="<?=$id;?>" />
+ <input name="act" type="hidden" value="csr" />
+ <?php endif;?>
+ </td>
+ </tr>
+ </table>
+ </form>
+
+ <?php else:?>
+
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td width="20%" class="listhdrr">Name</td>
+ <td width="20%" class="listhdrr">CA</td>
+ <td width="40%" class="listhdrr">Distinguished Name</td>
+ <td width="10%" class="list"></td>
+ </tr>
+ <?php
+ $i = 0;
+ foreach($a_cert as $cert):
+ $name = htmlspecialchars($cert['name']);
+
+ if ($cert['crt']) {
+ $subj = htmlspecialchars(cert_get_subject($cert['crt']));
+ $caname = "<em>external</em>";
+ }
+
+ if ($cert['csr']) {
+ $subj = htmlspecialchars(csr_get_subject($cert['csr']));
+ $caname = "<em>external - signature pending</em>";
+ }
+
+ $ca = lookup_ca($cert['caref']);
+ if ($ca)
+ $caname = $ca['name'];
+
+ if($cert['prv'])
+ $certimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png";
+ else
+ $certimg = "/themes/{$g['theme']}/images/icons/icon_frmfld_cert.png";
+ ?>
+ <tr>
+ <td class="listlr">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td align="left" valign="center">
+ <img src="<?=$certimg;?>" alt="CA" title="CA" border="0" height="16" width="16" />
+ </td>
+ <td align="left" valign="middle">
+ <?=$name;?>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td class="listr"><?=$caname;?>&nbsp;</td>
+ <td class="listr"><?=$subj;?>&nbsp;</td>
+ <td valign="middle" nowrap class="list">
+ <a href="system_certmanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate?");?>')">
+ <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="delete cert" alt="delete cert" width="17" height="17" border="0" />
+ </a>
+ <?php if ($cert['csr']): ?>
+ &nbsp;
+ <a href="system_certmanager.php?act=csr&id=<?=$i;?>">
+ <img src="/themes/<?= $g['theme'];?>/images/icons/icon_e.gif" title="update csr" alt="update csr" width="17" height="17" border="0" />
+ </a>
+ <?php endif; ?>
+ </td>
+ </tr>
+ <?php
+ $i++;
+ endforeach;
+ ?>
+ <tr>
+ <td class="list" colspan="3"></td>
+ <td class="list">
+ <a href="system_certmanager.php?act=new">
+ <img src="/themes/<?= $g['theme'];?>/images/icons/icon_plus.gif" title="add or import ca" alt="add ca" width="17" height="17" border="0" />
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3">
+ <p>
+ <?=gettext("Additional certificates can be added here.");?>
+ </p>
+ </td>
+ </tr>
+ </table>
+
+ <?php endif; ?>
+
+ </td>
+ </tr>
+</table>
+<?php include("fend.inc");?>
+<script type="text/javascript">
+<!--
+
+method_change();
+internalca_change();
+
+//-->
+</script>
+
+</body>
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index dbcfa70..2c848b2 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -225,6 +225,8 @@ function presubmit() {
$tab_array = array();
$tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
$tab_array[] = array(gettext("Groups"), true, "system_groupmanager.php");
+ $tab_array[] = array(gettext("CAs"), false, "system_camanager.php");
+ $tab_array[] = array(gettext("Certificates"), false, "system_certmanager.php");
$tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
$tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
display_top_tabs($tab_array);
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index e348dfe..eef39c3 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -262,6 +262,8 @@ function presubmit() {
$tab_array = array();
$tab_array[] = array(gettext("Users"), true, "system_usermanager.php");
$tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
+ $tab_array[] = array(gettext("CAs"), false, "system_camanager.php");
+ $tab_array[] = array(gettext("Certificates"), false, "system_certmanager.php");
$tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
$tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php");
display_top_tabs($tab_array);
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php
index 815bf00..ca89dfa 100755
--- a/usr/local/www/system_usermanager_settings.php
+++ b/usr/local/www/system_usermanager_settings.php
@@ -220,6 +220,8 @@ include("head.inc");
$tab_array = array();
$tab_array[] = array(gettext("Users"), false, "system_usermanager.php");
$tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php");
+ $tab_array[] = array(gettext("CAs"), false, "system_camanager.php");
+ $tab_array[] = array(gettext("Certificates"), false, "system_certmanager.php");
$tab_array[] = array(gettext("Servers"), false, "system_authservers.php");
$tab_array[] = array(gettext("Settings"), true, "system_usermanager_settings.php");
display_top_tabs($tab_array);
OpenPOWER on IntegriCloud