diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2016-10-12 12:58:46 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-10-13 21:03:46 +0200 |
| commit | 16dad1c3cb09acee946bc5b2409447279a8bc0de (patch) | |
| tree | bf1ac996ea98360a74c3bea9364300b3f3c2f33c | |
| parent | 6c09d6f8788b5436d6c9a5af4cc079a843f00e33 (diff) | |
| download | freeipa-16dad1c3cb09acee946bc5b2409447279a8bc0de.tar.gz freeipa-16dad1c3cb09acee946bc5b2409447279a8bc0de.tar.xz freeipa-16dad1c3cb09acee946bc5b2409447279a8bc0de.zip | |
cert: add revocation reason back to cert-find output
In commit c718ef058847bb39e78236e8af0ad69ac961bbcf some param values were
accidentally removed from cert-find output.
In commit 22d5f579bbd8bb452cf1bf620294ab6ade6e7c47 `serial_number_hex` and
`revoked` were added back.
Add back `revocation_reason` as well. Also, do not include `revoked` with
--raw, as it's a virtual attribute.
https://fedorahosted.org/freeipa/ticket/6269
Reviewed-By: Pavel Vomacka <pvomacka@redhat.com>
| -rw-r--r-- | ipaserver/plugins/cert.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ipaserver/plugins/cert.py b/ipaserver/plugins/cert.py index e65cf1f06..d13974e01 100644 --- a/ipaserver/plugins/cert.py +++ b/ipaserver/plugins/cert.py @@ -1231,16 +1231,17 @@ class cert_find(Search, CertMethod): obj = {'serial_number': serial_number} else: obj = ra_obj - obj['issuer'] = issuer - obj['subject'] = DN(ra_obj['subject']) - obj['revoked'] = ( - ra_obj['status'] in (u'REVOKED', u'REVOKED_EXPIRED')) - if all: - ra_obj = ra.get_certificate(str(serial_number)) - if not raw: + obj.update(ra.get_certificate(str(serial_number))) + + if not raw: + obj['issuer'] = issuer + obj['subject'] = DN(ra_obj['subject']) + obj['revoked'] = ( + ra_obj['status'] in (u'REVOKED', u'REVOKED_EXPIRED')) + if all: obj['certificate'] = ( - ra_obj['certificate'].replace('\r\n', '')) + obj['certificate'].replace('\r\n', '')) self.obj._parse(obj) obj['cacn'] = ca_obj['cn'][0] |