[Freeipa-devel] [PATCH 0014] Support multiple user and host certificates
Fraser Tweedale
ftweedal at redhat.com
Wed May 27 13:53:15 UTC 2015
This patch adds supports for multiple user / host certificates. No
schema change is needed ('usercertificate' attribute is already
multi-value). The revoke-previous-cert behaviour of host-mod and
user-mod has been removed but revocation behaviour of -del and
-disable is preserved.
The latest profiles/caacl patchset (0001..0013 v5) depends on this
patch for correct cert-request behaviour.
There is one design question (or maybe more, let me know): the
`--out=FILENAME' option to {host,service} show saves ONE certificate
to the named file. I propose to either:
a) write all certs, suffixing suggested filename with either a
sequential numerical index, e.g. "cert.pem" becomes
"cert.pem.1", "cert.pem.2", and so on; or
b) as above, but suffix with serial number and, if there are
different issues, some issuer-identifying information.
Let me know your thoughts.
Thanks,
Fraser
-------------- next part --------------
>From 333654797908ab6a71a84b51723bd1d5e59637d0 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal at redhat.com>
Date: Wed, 27 May 2015 08:02:08 -0400
Subject: [PATCH] Support multiple host and service certificates
Update the framework to support multiple host and service
certificates.
host-mod now sets 'usercertificate' values without revoking existing
certificate. Similarly, service-mod does nothing with preexisting
'usercertificate' values where previously it raised an error.
The existing behaviour of host-disable, host-del, service-disable
and service-del (revoke existing certificate) is preserved but now
applies to all certificates in the host or service entry.
Part of: http://www.freeipa.org/page/V4/User_Certificates
---
ipalib/plugins/host.py | 64 +++++++++++++----------------------------------
ipalib/plugins/service.py | 55 ++++++++++++++++------------------------
2 files changed, 38 insertions(+), 81 deletions(-)
diff --git a/ipalib/plugins/host.py b/ipalib/plugins/host.py
index c47439743da45b8629d1b2afbd210d87591784ce..880a3b5d3c2de79a9752ec3fa64ed729ffd42641 100644
--- a/ipalib/plugins/host.py
+++ b/ipalib/plugins/host.py
@@ -493,7 +493,7 @@ class host(LDAPObject):
label=_('Random password'),
flags=('no_create', 'no_update', 'no_search', 'virtual_attribute'),
),
- Bytes('usercertificate?', validate_certificate,
+ Bytes('usercertificate*', validate_certificate,
cli_name='certificate',
label=_('Certificate'),
doc=_('Base-64 encoded server certificate'),
@@ -640,11 +640,11 @@ class host_add(LDAPCreate):
entry_attrs['userpassword'] = ipa_generate_password(characters=host_pwd_chars)
# save the password so it can be displayed in post_callback
setattr(context, 'randompassword', entry_attrs['userpassword'])
- cert = options.get('usercertificate')
- if cert:
- cert = x509.normalize_certificate(cert)
+ certs = options.get('usercertificate', [])
+ certs_der = map(x509.normalize_certificate, certs)
+ for cert in certs_der:
x509.verify_cert_subject(ldap, keys[-1], cert)
- entry_attrs['usercertificate'] = cert
+ entry_attrs['usercertificate'] = certs_der
entry_attrs['managedby'] = dn
entry_attrs['objectclass'].append('ieee802device')
entry_attrs['objectclass'].append('ipasshhost')
@@ -786,8 +786,7 @@ class host_del(LDAPDelete):
entry_attrs = ldap.get_entry(dn, ['usercertificate'])
except errors.NotFound:
self.obj.handle_not_found(*keys)
- cert = entry_attrs.single_value.get('usercertificate')
- if cert:
+ for cert in entry_attrs.get('usercertificate', []):
cert = x509.normalize_certificate(cert)
try:
serial = unicode(x509.get_serial_number(cert, x509.DER))
@@ -864,39 +863,10 @@ class host_mod(LDAPUpdate):
if 'krbprincipalaux' not in obj_classes:
obj_classes.append('krbprincipalaux')
entry_attrs['objectclass'] = obj_classes
- cert = x509.normalize_certificate(entry_attrs.get('usercertificate'))
- if cert:
- if self.api.Command.ca_is_enabled()['result']:
- x509.verify_cert_subject(ldap, keys[-1], cert)
- entry_attrs_old = ldap.get_entry(dn, ['usercertificate'])
- oldcert = entry_attrs_old.single_value.get('usercertificate')
- if oldcert:
- oldcert = x509.normalize_certificate(oldcert)
- try:
- serial = x509.get_serial_number(oldcert, x509.DER)
- serial = unicode(serial)
- try:
- result = api.Command['cert_show'](serial)['result']
- if 'revocation_reason' not in result:
- try:
- api.Command['cert_revoke'](
- serial, revocation_reason=4)
- except errors.NotImplementedError:
- # some CA's might not implement revoke
- pass
- except errors.NotImplementedError:
- # some CA's might not implement revoke
- pass
- except NSPRError, nsprerr:
- if nsprerr.errno == -8183:
- # If we can't decode the cert them proceed with
- # modifying the host.
- self.log.info("Problem decoding certificate %s" %
- nsprerr.args[1])
- else:
- raise nsprerr
- entry_attrs['usercertificate'] = cert
+ for usercertificate in entry_attrs.get('usercertificate', []):
+ cert = x509.normalize_certificate(usercertificate)
+ x509.verify_cert_subject(ldap, keys[-1], cert)
if options.get('random'):
entry_attrs['userpassword'] = ipa_generate_password(characters=host_pwd_chars)
@@ -1148,10 +1118,9 @@ class host_disable(LDAPQuery):
entry_attrs = ldap.get_entry(dn, ['usercertificate'])
except errors.NotFound:
self.obj.handle_not_found(*keys)
- cert = entry_attrs.single_value.get('usercertificate')
- if cert:
- if self.api.Command.ca_is_enabled()['result']:
- cert = x509.normalize_certificate(cert)
+ if self.api.Command.ca_is_enabled()['result']:
+ certs = entry_attrs.get('usercertificate', [])
+ for cert in map(x509.normalize_certificate, certs):
try:
serial = unicode(x509.get_serial_number(cert, x509.DER))
try:
@@ -1175,10 +1144,11 @@ class host_disable(LDAPQuery):
else:
raise nsprerr
- # Remove the usercertificate altogether
- entry_attrs['usercertificate'] = None
- ldap.update_entry(entry_attrs)
- done_work = True
+ if len(certs) > 0:
+ # Remove the usercertificate altogether
+ entry_attrs['usercertificate'] = None
+ ldap.update_entry(entry_attrs)
+ done_work = True
self.obj.get_password_attributes(ldap, dn, entry_attrs)
if entry_attrs['has_keytab']:
diff --git a/ipalib/plugins/service.py b/ipalib/plugins/service.py
index b37dc7b4bf56b69df204fd29e9487f1390197bbe..8e8f5e9d8683d55e1e334ea880163d84b3d80079 100644
--- a/ipalib/plugins/service.py
+++ b/ipalib/plugins/service.py
@@ -437,7 +437,7 @@ class service(LDAPObject):
primary_key=True,
normalizer=lambda value: normalize_principal(value),
),
- Bytes('usercertificate?', validate_certificate,
+ Bytes('usercertificate*', validate_certificate,
cli_name='certificate',
label=_('Certificate'),
doc=_('Base-64 encoded server certificate'),
@@ -503,11 +503,11 @@ class service_add(LDAPCreate):
self.obj.validate_ipakrbauthzdata(entry_attrs)
- cert = options.get('usercertificate')
- if cert:
- dercert = x509.normalize_certificate(cert)
+ certs = options.get('usercertificate', [])
+ certs_der = map(x509.normalize_certificate, certs)
+ for dercert in certs_der
x509.verify_cert_subject(ldap, hostname, dercert)
- entry_attrs['usercertificate'] = dercert
+ entry_attrs['usercertificate'] = certs_der
if not options.get('force', False):
# We know the host exists if we've gotten this far but we
@@ -555,9 +555,7 @@ class service_del(LDAPDelete):
entry_attrs = ldap.get_entry(dn, ['usercertificate'])
except errors.NotFound:
self.obj.handle_not_found(*keys)
- cert = entry_attrs.get('usercertificate')
- if cert:
- cert = cert[0]
+ for cert in entry_attrs.get('usercertificate', []):
try:
serial = unicode(x509.get_serial_number(cert, x509.DER))
try:
@@ -597,25 +595,13 @@ class service_mod(LDAPUpdate):
self.obj.validate_ipakrbauthzdata(entry_attrs)
- if 'usercertificate' in options:
- (service, hostname, realm) = split_principal(keys[-1])
- cert = options.get('usercertificate')
- if cert:
- dercert = x509.normalize_certificate(cert)
- x509.verify_cert_subject(ldap, hostname, dercert)
- try:
- entry_attrs_old = ldap.get_entry(dn, ['usercertificate'])
- except errors.NotFound:
- self.obj.handle_not_found(*keys)
- if 'usercertificate' in entry_attrs_old:
- # FIXME: what to do here? do we revoke the old cert?
- fmt = 'entry already has a certificate, serial number: %s' % (
- x509.get_serial_number(entry_attrs_old['usercertificate'][0], x509.DER)
- )
- raise errors.GenericError(format=fmt)
- entry_attrs['usercertificate'] = dercert
- else:
- entry_attrs['usercertificate'] = None
+ (service, hostname, realm) = split_principal(keys[-1])
+
+ certs = options.get('usercertificate', [])
+ certs_der = map(x509.normalize_certificate, certs)
+ for dercert in certs_der:
+ x509.verify_cert_subject(ldap, hostname, dercert)
+ entry_attrs['usercertificate'] = certs_der
update_krbticketflags(ldap, entry_attrs, attrs_list, options, True)
@@ -815,9 +801,9 @@ class service_disable(LDAPQuery):
# See if we do any work at all here and if not raise an exception
done_work = False
- if 'usercertificate' in entry_attrs:
- if self.api.Command.ca_is_enabled()['result']:
- cert = x509.normalize_certificate(entry_attrs.get('usercertificate')[0])
+ if self.api.Command.ca_is_enabled()['result']:
+ certs = entry_attrs.get('usercertificate', [])
+ for cert in map(x509.normalize_certificate, certs):
try:
serial = unicode(x509.get_serial_number(cert, x509.DER))
try:
@@ -839,10 +825,11 @@ class service_disable(LDAPQuery):
else:
raise nsprerr
- # Remove the usercertificate altogether
- entry_attrs['usercertificate'] = None
- ldap.update_entry(entry_attrs)
- done_work = True
+ if len(certs) > 0:
+ # Remove the usercertificate altogether
+ entry_attrs['usercertificate'] = None
+ ldap.update_entry(entry_attrs)
+ done_work = True
self.obj.get_password_attributes(ldap, dn, entry_attrs)
if entry_attrs['has_keytab']:
--
2.1.0
More information about the Freeipa-devel
mailing list