diff options
author | John Dennis <jdennis@redhat.com> | 2011-10-18 18:19:25 -0400 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2011-10-21 15:29:47 +0000 |
commit | 9a039acb224ab3dd6c739f141233000b50c28e6f (patch) | |
tree | b018e5d662344b2a503123870fe3a15a2e80862a /install | |
parent | c9ef39918abc41f0f68c4e6c1b4495fb0a4c976b (diff) | |
download | freeipa-9a039acb224ab3dd6c739f141233000b50c28e6f.tar.gz freeipa-9a039acb224ab3dd6c739f141233000b50c28e6f.tar.xz freeipa-9a039acb224ab3dd6c739f141233000b50c28e6f.zip |
Ticket 1201 - Unable to Download Certificate with Browser
Certificates are passed through the IPA XML-RPC and JSON as binary
data in DER X509 format. Queries peformed against the LDAP server
also return binary DER X509 format. In all cases the binary DER
data is base-64 encoded.
PEM is standard text format for certificates. It also uses base64 to
encode the binary DER data, but had specific formatting
requirements. The base64 data must be wrapped inside PEM delimiters
and the base64 data must be line wrapped at 64 characters.
Most external software which accepts certificates as input will only
accept DER or PEM format (e.g. openssl & NSS). Although base64 is
closely related to PEM it is not PEM unless the PEM delimters are
present and the base64 data is line wrapped at 64 characters.
We already convert binary DER certificates which have been passed as
base64 in other parts of the IPA code. However this conversion has not
been available in the web UI. When the web UI presented certificates
it did so by filling a dialog box with a single line of base64 data. A
user could not copy this data and use it as input to openssl or NSS
for example.
We resolve this problem by introducing new javascript functions in
certificate.js. IPA.cert.pem_cert_format(text) will examine the text
input and if it's already in PEM format just return it unmodified,
otherwise it will line wrap the base64 data and add the PEM
delimiters. Thus it is safe to call on either a previously formated
PEM cert or a binary DER cert encoded as base64. This applies to
pem_csr_format() as well for CSR's.
Because pem_cert_format() is safe to call on either format the web UI
will see the use of the flag add_pem_delimiters was eliminated except
in the one case where the IPA.cert.download_dialog() was being abused
to display PKCS12 binary data (pkcs12 is neither a cert nor a cert
request). Because of the abuse of the cert.download_dialog() for
pkcs12 it was necessary to retain the flag which in effect said "do
not treat the data as PEM".
Modify the CSR (Certificate Signing Request) dialog box to accept a
PEM formatted CSR. Remove the artifical PEM delimiters above and below
the dialog box which were used to suggest the input needed to be sans
the delimiters. The dialog box continues to accept bare base64 thus
allowing either text format.
Also note this solves the display of certificate data in the UI
without touching anything existing code in the server or command line,
thus it's isolated.
Diffstat (limited to 'install')
-rwxr-xr-x | install/ui/certificate.js | 108 | ||||
-rw-r--r-- | install/ui/entitle.js | 9 |
2 files changed, 102 insertions, 15 deletions
diff --git a/install/ui/certificate.js b/install/ui/certificate.js index 9334ad037..6136edaf0 100755 --- a/install/ui/certificate.js +++ b/install/ui/certificate.js @@ -28,6 +28,27 @@ IPA.cert.END_CERTIFICATE = '-----END CERTIFICATE-----'; IPA.cert.BEGIN_CERTIFICATE_REQUEST = '-----BEGIN CERTIFICATE REQUEST-----'; IPA.cert.END_CERTIFICATE_REQUEST = '-----END CERTIFICATE REQUEST-----'; +/* + * Pre-compiled regular expression to match a PEM cert. + * + * regexp group 1: entire canonical cert (delimiters plus base64) + * regexp group 2: base64 data inside PEM delimiters + */ +IPA.cert.PEM_CERT_REGEXP = RegExp('(-----BEGIN CERTIFICATE-----([^-]*)-----END CERTIFICATE-----)'); + +/* + * Pre-compiled regular expression to match a CSR (Certificate Signing Request). + * The delimiter "CERTIFICATE REQUEST" is the cononical standard, however some legacy + * software will produce a delimiter with "NEW" in it, i.e. "NEW CERTIFICATE REQUEST" + * This regexp will work with either form. + * + * regexp group 1: entire canonical CSR (delimiters plus base64) + * regexp group 2: base64 data inside canonical CSR delimiters + * regexp group 3: entire legacy CSR (delimiters plus base64) + * regexp group 4: base64 data inside legacy CSR delimiters + */ +IPA.cert.PEM_CSR_REGEXP = RegExp('(-----BEGIN CERTIFICATE REQUEST-----([^-]*)-----END CERTIFICATE REQUEST-----)|(-----BEGIN NEW CERTIFICATE REQUEST-----([^-]*)-----END NEW CERTIFICATE REQUEST-----)'); + IPA.cert.CERTIFICATE_STATUS_MISSING = 0; IPA.cert.CERTIFICATE_STATUS_VALID = 1; IPA.cert.CERTIFICATE_STATUS_REVOKED = 2; @@ -74,6 +95,77 @@ IPA.cert.parse_dn = function(dn) { return result; }; +IPA.cert.pem_format_base64 = function(text) { + /* + * Input is assumed to be base64 possibly with embedded whitespace. + * Format the base64 text such that it conforms to PEM, which is a + * sequence of 64 character lines, except for the last line which + * may be less than 64 characters. The last line does NOT have a + * new line appended to it. + */ + var formatted = ""; + + /* Strip out any whitespace including line endings */ + text = text.replace(/\s*/g,""); + + /* + * Break up into lines with 64 chars each. + * Do not add a newline to final line. + */ + for (var i = 0; i < text.length; i+=64) { + formatted += text.substring(i, i+64); + if (i+64 < text.length) { + formatted += "\n"; + } + } + return (formatted); +}; + +IPA.cert.pem_cert_format = function(text) { + /* + * Input is assumed to be either PEM formated data or the + * base64 encoding of DER binary certificate data. Return data + * in PEM format. The function checks if the input text is PEM + * formatted, if so it just returns the input text. Otherwise + * the input is treated as base64 which is formatted to be PEM> + */ + + /* + * Does the text already have the PEM delimiters? + * If so just return the text unmodified. + */ + if (text.match(IPA.cert.PEM_CERT_REGEXP)) { + return text; + } + /* No PEM delimiters so format the base64 & add the delimiters. */ + return IPA.cert.BEGIN_CERTIFICATE + "\n" + + IPA.cert.pem_format_base64(text) + "\n" + + IPA.cert.END_CERTIFICATE; +}; + +IPA.cert.pem_csr_format = function(text) { + /* + * Input is assumed to be either PEM formated data or the base64 + * encoding of DER binary certificate request (csr) data. Return + * data in PEM format. The function checks if the input text is + * PEM formatted, if so it just returns the input text. Otherwise + * the input is treated as base64 which is formatted to be PEM> + */ + + /* + * Does the text already have the PEM delimiters? + * If so just return the text unmodified. + */ + if (text.match(IPA.cert.PEM_CSR_REGEXP)) { + return text; + } + + /* No PEM delimiters so format the base64 & add the delimiters. */ + return IPA.cert.BEGIN_CERTIFICATE_REQUEST + "\n" + + IPA.cert.pem_format_base64(text) + "\n" + + IPA.cert.END_CERTIFICATE_REQUEST; +}; + IPA.cert.download_dialog = function(spec) { spec = spec || {}; @@ -103,9 +195,7 @@ IPA.cert.download_dialog = function(spec) { var certificate = that.certificate; if (that.add_pem_delimiters) { - certificate = IPA.cert.BEGIN_CERTIFICATE+'\n'+ - that.certificate+'\n'+ - IPA.cert.END_CERTIFICATE; + certificate = IPA.cert.pem_cert_format(that.certificate); } textarea.val(certificate); @@ -357,11 +447,8 @@ IPA.cert.request_dialog = function(spec) { label: IPA.messages.buttons.issue, click: function() { var values = {}; - var request = that.textarea.val(); - request = - IPA.cert.BEGIN_CERTIFICATE_REQUEST+'\n'+ - $.trim(request)+'\n'+ - IPA.cert.END_CERTIFICATE_REQUEST+'\n'; + var request = $.trim(that.textarea.val()); + request = IPA.cert.pem_csr_format(request); values['request'] = request; if (that.request) { that.request(values); @@ -383,15 +470,10 @@ IPA.cert.request_dialog = function(spec) { that.container.append('<br/>'); that.container.append('<br/>'); - that.container.append(IPA.cert.BEGIN_CERTIFICATE_REQUEST); - that.container.append('<br/>'); - that.textarea = $('<textarea/>', { style: 'width: 100%; height: 225px;' }).appendTo(that.container); - that.container.append('<br/>'); - that.container.append(IPA.cert.END_CERTIFICATE_REQUEST); }; return that; diff --git a/install/ui/entitle.js b/install/ui/entitle.js index eaa960693..a44318d04 100644 --- a/install/ui/entitle.js +++ b/install/ui/entitle.js @@ -514,8 +514,7 @@ IPA.entitle.certificate_column = function(spec) { click: function() { var dialog = IPA.cert.download_dialog({ title: IPA.messages.objects.entitle.download_certificate, - certificate: certificate, - add_pem_delimiters: false + certificate: certificate }); dialog.open(); return false; @@ -723,6 +722,12 @@ IPA.entitle.download_widget = function(spec) { return; } + /* + * WARNING - despite using cert.download_dialog() and passing + * a certificate, it's NOT a certificate, it's a binary + * PKCS12 file that's been base64 encoded! + * Hence the reason add_pem_delimiters is false. + */ var dialog = IPA.cert.download_dialog({ title: IPA.messages.objects.entitle.download_certificate, certificate: userpkcs12[0].__base64__, |