IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

cert: include CA name in cert command output

Browse Source 
Include name of the CA that issued a certificate in cert-request, cert-show
and cert-find.

This allows the caller to call further commands on the cert without having
to call ca-find to find the name of the CA.

https://fedorahosted.org/freeipa/ticket/6151

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Jan Cholasta 2016-08-23 13:59:33 +02:00 committed by Martin Basti
parent 22d5f579bb
commit 117274ff04
1 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ipaserver/plugins/cert.py
View File

@ -263,6 +263,15 @@ def bind_principal_can_manage_cert(cert):
class BaseCertObject(Object): class BaseCertObject(Object):
takes_params = ( takes_params = (
Str(
'cacn?',
cli_name='ca',
default=IPA_CA_CN,
autofill=True,
label=_('Issuing CA'),
doc=_('Name of issuing CA'),
flags={'no_create', 'no_update', 'no_search'},
),
Bytes( Bytes(
'certificate', validate_certificate, 'certificate', validate_certificate,
label=_("Certificate"), label=_("Certificate"),
@ -459,14 +468,7 @@ class BaseCertObject(Object):
class BaseCertMethod(Method): class BaseCertMethod(Method):
def get_options(self): def get_options(self):
yield Str('cacn?', yield self.obj.params['cacn'].clone(query=True)
cli_name='ca',
default=IPA_CA_CN,
autofill=True,
query=True,
label=_('Issuing CA'),
doc=_('Name of issuing CA'),
)
for option in super(BaseCertMethod, self).get_options(): for option in super(BaseCertMethod, self).get_options():
yield option yield option
@ -555,7 +557,8 @@ class cert_request(Create, BaseCertMethod, VirtualCommand):
# referencing nonexistant CA) and look up authority ID. # referencing nonexistant CA) and look up authority ID.
# #
ca = kw['cacn'] ca = kw['cacn']
ca_id = api.Command.ca_show(ca)['result']['ipacaid'][0] ca_obj = api.Command.ca_show(ca)['result']
ca_id = ca_obj['ipacaid'][0]
""" """
Access control is partially handled by the ACI titled Access control is partially handled by the ACI titled
@ -747,6 +750,7 @@ class cert_request(Create, BaseCertMethod, VirtualCommand):
if not raw: if not raw:
self.obj._parse(result, all) self.obj._parse(result, all)
result['request_id'] = int(result['request_id']) result['request_id'] = int(result['request_id'])
result['cacn'] = ca_obj['cn'][0]
# Success? Then add it to the principal's entry # Success? Then add it to the principal's entry
# (unless the profile tells us not to) # (unless the profile tells us not to)
@ -926,6 +930,7 @@ class cert_show(Retrieve, CertMethod, VirtualCommand):
self.obj._parse(result, all) self.obj._parse(result, all)
result['revoked'] = ('revocation_reason' in result) result['revoked'] = ('revocation_reason' in result)
self.obj._fill_owners(result) self.obj._fill_owners(result)
result['cacn'] = ca_obj['cn'][0]
return dict(result=result, value=pkey_to_value(serial_number, options)) return dict(result=result, value=pkey_to_value(serial_number, options))
@ -1196,11 +1201,19 @@ class cert_find(Search, CertMethod):
raise raise
return result, False, complete return result, False, complete
ca_objs = self.api.Command.ca_find()['result']
ca_objs = {DN(ca['ipacasubjectdn'][0]): ca for ca in ca_objs}
ra = self.api.Backend.ra ra = self.api.Backend.ra
for ra_obj in ra.find(ra_options): for ra_obj in ra.find(ra_options):
issuer = DN(ra_obj['issuer']) issuer = DN(ra_obj['issuer'])
serial_number = ra_obj['serial_number'] serial_number = ra_obj['serial_number']
try:
ca_obj = ca_objs[issuer]
except KeyError:
continue
if pkey_only: if pkey_only:
obj = {'serial_number': serial_number} obj = {'serial_number': serial_number}
else: else:
@ -1217,6 +1230,8 @@ class cert_find(Search, CertMethod):
ra_obj['certificate'].replace('\r\n', '')) ra_obj['certificate'].replace('\r\n', ''))
self.obj._parse(obj) self.obj._parse(obj)
obj['cacn'] = ca_obj['cn'][0]
result[issuer, serial_number] = obj result[issuer, serial_number] = obj
return result, False, complete return result, False, complete