diff options
author | jim-p <jimp@pfsense.org> | 2016-08-03 10:47:13 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2016-08-03 10:48:13 -0400 |
commit | da0f70ed65b2f0f7d8831d3743c3d0f3e6aac382 (patch) | |
tree | 28bf5d6c5741683b46c3b35e4486454358ed3d58 /src/usr/local | |
parent | 00dc6b2ab06549c63ba974b30cefd7660add0819 (diff) | |
download | pfsense-da0f70ed65b2f0f7d8831d3743c3d0f3e6aac382.zip pfsense-da0f70ed65b2f0f7d8831d3743c3d0f3e6aac382.tar.gz |
Add a field to CA/Cert pages for OU, which is required by some external CAs and users. Fixes #6672
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/system_camanager.php | 17 | ||||
-rw-r--r-- | src/usr/local/www/system_certmanager.php | 28 |
2 files changed, 40 insertions, 5 deletions
diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 1015e5d..d9112b1 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -269,6 +269,9 @@ if ($_POST) { 'organizationName' => $pconfig['dn_organization'], 'emailAddress' => $pconfig['dn_email'], 'commonName' => $pconfig['dn_commonname']); + if (!empty($pconfig['dn_organizationalunit'])) { + $dn['organizationalUnitName'] = $pconfig['dn_organizationalunit']; + } if (!ca_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['digest_alg'])) { while ($ssl_err = openssl_error_string()) { $input_errors = array(); @@ -283,7 +286,9 @@ if ($_POST) { 'organizationName' => $pconfig['dn_organization'], 'emailAddress' => $pconfig['dn_email'], 'commonName' => $pconfig['dn_commonname']); - + if (!empty($pconfig['dn_organizationalunit'])) { + $dn['organizationalUnitName'] = $pconfig['dn_organizationalunit']; + } if (!ca_inter_create($ca, $pconfig['keylen'], $pconfig['lifetime'], $dn, $pconfig['caref'], $pconfig['digest_alg'])) { while ($ssl_err = openssl_error_string()) { $input_errors = array(); @@ -568,7 +573,15 @@ $section->addInput(new Form_Input( 'Organization', 'text', $pconfig['dn_organization'], - ['placeholder' => 'e.g. My Company Inc.'] + ['placeholder' => 'e.g. My Company Inc'] +)); + +$section->addInput(new Form_Input( + 'dn_organizationalunit', + 'Organizational Unit', + 'text', + $pconfig['dn_organizationalunit'], + ['placeholder' => 'e.g. My Department Name (optional)'] )); $section->addInput(new Form_Input( diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 34d0ebd..f5fa3ca 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -391,7 +391,9 @@ if ($_POST) { 'organizationName' => $pconfig['dn_organization'], 'emailAddress' => $pconfig['dn_email'], 'commonName' => $pconfig['dn_commonname']); - + if (!empty($pconfig['dn_organizationalunit'])) { + $dn['organizationalUnitName'] = $pconfig['dn_organizationalunit']; + } if (count($altnames)) { $altnames_tmp = ""; foreach ($altnames as $altname) { @@ -417,6 +419,9 @@ if ($_POST) { 'organizationName' => $pconfig['csr_dn_organization'], 'emailAddress' => $pconfig['csr_dn_email'], 'commonName' => $pconfig['csr_dn_commonname']); + if (!empty($pconfig['csr_dn_organizationalunit'])) { + $dn['organizationalUnitName'] = $pconfig['csr_dn_organizationalunit']; + } if (count($altnames)) { $altnames_tmp = ""; foreach ($altnames as $altname) { @@ -686,7 +691,15 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { 'Organization', 'text', $pconfig['dn_organization'], - ['placeholder' => 'e.g. My Company Inc.'] + ['placeholder' => 'e.g. My Company Inc'] + )); + + $section->addInput(new Form_Input( + 'dn_organizationalunit', + 'Organizational Unit', + 'text', + $pconfig['dn_organizationalunit'], + ['placeholder' => 'e.g. My Department Name (optional)'] )); $section->addInput(new Form_Input( @@ -805,7 +818,15 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) { 'Organization', 'text', $pconfig['csr_dn_organization'], - ['placeholder' => 'e.g. My Company Inc.'] + ['placeholder' => 'e.g. My Company Inc'] + )); + + $section->addInput(new Form_Input( + 'csr_dn_organizationalunit', + 'Organizational Unit', + 'text', + $pconfig['csr_dn_organizationalunit'], + ['placeholder' => 'e.g. My Department Name (optional)'] )); $section->addInput(new Form_Input( @@ -1093,6 +1114,7 @@ events.push(function() { $('#dn_city').val("<?=$subject[2]['v'];?>"); $('#dn_organization').val("<?=$subject[3]['v'];?>"); $('#dn_email').val("<?=$subject[4]['v'];?>"); + $('#dn_organizationalunit').val("<?=$subject[6]['v'];?>"); break; <?php endforeach; |