diff options
author | Rob Crittenden <rcritten@redhat.com> | 2012-03-06 15:53:07 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-03-14 04:40:35 -0400 |
commit | d4a80dbe52158f204e78afea742fc3322bbc65e5 (patch) | |
tree | e57040a9b05bef1f652a89b75b2ad13faf8fbbc9 /ipalib | |
parent | e9d68a7b001d23a7bac7cbf52e270c0723f1f69d (diff) | |
download | freeipa-d4a80dbe52158f204e78afea742fc3322bbc65e5.tar.gz freeipa-d4a80dbe52158f204e78afea742fc3322bbc65e5.tar.xz freeipa-d4a80dbe52158f204e78afea742fc3322bbc65e5.zip |
Display serial number as HEX (DECIMAL) when showing certificates.
https://fedorahosted.org/freeipa/ticket/1991
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/plugins/cert.py | 36 | ||||
-rw-r--r-- | ipalib/plugins/host.py | 3 | ||||
-rw-r--r-- | ipalib/plugins/internal.py | 1 | ||||
-rw-r--r-- | ipalib/plugins/service.py | 4 |
4 files changed, 25 insertions, 19 deletions
diff --git a/ipalib/plugins/cert.py b/ipalib/plugins/cert.py index 130ebc79f..7a3888121 100644 --- a/ipalib/plugins/cert.py +++ b/ipalib/plugins/cert.py @@ -232,37 +232,32 @@ class cert_request(VirtualCommand): ) has_output_params = ( - Str('certificate?', + Str('certificate', label=_('Certificate'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('subject?', + Str('subject', label=_('Subject'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('issuer?', + Str('issuer', label=_('Issuer'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('valid_not_before?', + Str('valid_not_before', label=_('Not Before'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('valid_not_after?', + Str('valid_not_after', label=_('Not After'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('md5_fingerprint?', + Str('md5_fingerprint', label=_('Fingerprint (MD5)'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('sha1_fingerprint?', + Str('sha1_fingerprint', label=_('Fingerprint (SHA1)'), - flags=['no_create', 'no_update', 'no_search'], ), - Str('serial_number?', + Str('serial_number', label=_('Serial number'), - flags=['no_create', 'no_update', 'no_search'], + ), + Str('serial_number_hex', + label=_('Serial number (hex)'), ), ) @@ -456,9 +451,12 @@ class cert_show(VirtualCommand): Str('sha1_fingerprint', label=_('Fingerprint (SHA1)'), ), - Str('revocation_reason?', + Str('revocation_reason', label=_('Revocation reason'), ), + Str('serial_number_hex', + label=_('Serial number (hex)'), + ), ) takes_options = ( @@ -565,10 +563,10 @@ class cert_remove_hold(VirtualCommand): takes_args = _serial_number has_output_params = ( - Flag('unrevoked?', + Flag('unrevoked', label=_('Unrevoked'), ), - Str('error_string?', + Str('error_string', label=_('Error'), ), ) diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py index 3814215cb..9db98e713 100644 --- a/ipalib/plugins/host.py +++ b/ipalib/plugins/host.py @@ -146,6 +146,9 @@ host_output_params = ( Str('serial_number', label=_('Serial Number'), ), + Str('serial_number_hex', + label=_('Serial Number (hex)'), + ), Str('issuer', label=_('Issuer'), ), diff --git a/ipalib/plugins/internal.py b/ipalib/plugins/internal.py index deff866ee..160b40154 100644 --- a/ipalib/plugins/internal.py +++ b/ipalib/plugins/internal.py @@ -313,6 +313,7 @@ class i18n_messages(Command): "revoke_confirmation": _("To confirm your intention to revoke this certificate, select a reason from the pull-down list, and click the \"Revoke\" button."), "revoked": _("Certificate Revoked"), "serial_number": _("Serial Number"), + "serial_number_hex": _("Serial Number (hex)"), "sha1_fingerprint": _("SHA1 Fingerprint"), "superseded": _("Superseded"), "unspecified": _("Unspecified"), diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py index 71e4ac465..e75d71f03 100644 --- a/ipalib/plugins/service.py +++ b/ipalib/plugins/service.py @@ -96,6 +96,9 @@ output_params = ( Str('serial_number', label=_('Serial Number'), ), + Str('serial_number_hex', + label=_('Serial Number (hex)'), + ), Str('issuer', label=_('Issuer'), ), @@ -190,6 +193,7 @@ def set_certificate_attrs(entry_attrs): cert = x509.load_certificate(cert, datatype=x509.DER) entry_attrs['subject'] = unicode(cert.subject) entry_attrs['serial_number'] = unicode(cert.serial_number) + entry_attrs['serial_number_hex'] = u'0x%X' % cert.serial_number entry_attrs['issuer'] = unicode(cert.issuer) entry_attrs['valid_not_before'] = unicode(cert.valid_not_before_str) entry_attrs['valid_not_after'] = unicode(cert.valid_not_after_str) |