diff options
| author | Fraser Tweedale <ftweedal@redhat.com> | 2016-10-20 14:42:17 +1000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2016-11-11 07:05:14 +0100 |
| commit | cdd41e06e6ef97efafd36ee9e4c8d3be9e4099e7 (patch) | |
| tree | 241b9f5b8c765525652a21d275643ecfa3d2e8ff /ipaserver | |
| parent | 2644c955489ee5b22ecc0227c5cd8ed1e90ee648 (diff) | |
| download | freeipa-cdd41e06e6ef97efafd36ee9e4c8d3be9e4099e7.tar.gz freeipa-cdd41e06e6ef97efafd36ee9e4c8d3be9e4099e7.tar.xz freeipa-cdd41e06e6ef97efafd36ee9e4c8d3be9e4099e7.zip | |
Ensure correct IPA CA nickname in DS and HTTP NSSDBs
During replica installation, if the IPA deployment has a custom
subject_base, the routines that create the DS and HTTP NSSDBs
erroneously compare the subject of CA certs to the *default* subject
base. This causes the IPA CA cert to be added to the NSSDBs with a
nickname derived from the subject name, instead of "{REALM} IPA CA".
At a later stage of installation, the `upload_cacrt` plugin reads
certs from the HTTP NSSDB in order to update the cn=certificates
LDAP certstore. The NSSDB nickname of the cert is used as the CN
for the entry. Because the IPA CA cert was not installed in the
HTTP NSSDB with the "{REALM} IPA CA", this causes a spurious entry
for the IPA CA to be added to the certstore.
To avoid this scenario, use the deployment's actual subject base
when deciding if a cert is the IPA CA cert.
Fixes: https://fedorahosted.org/freeipa/ticket/6415
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/server/replicainstall.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index a58f8eb21..f4cb2475d 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -1265,7 +1265,7 @@ class DsInstance(service.Service): os.chown(paths.DS_KEYTAB, pent.pw_uid, pent.pw_gid) def __get_ds_cert(self): - subject = DN(('O', self.realm)) + subject = self.subject_base or DN(('O', self.realm)) nssdb_dir = config_dirname(self.serverid) db = certs.CertDB(self.realm, nssdir=nssdb_dir, subject_base=subject) db.request_service_cert(self.nickname, self.principal, self.fqdn) diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index aeae6b3dc..7e043746f 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -93,7 +93,7 @@ def install_http_certs(config, fstore, remote_api): # Obtain certificate for the HTTP service nssdir = certs.NSS_DIR - subject = DN(('O', config.realm_name)) + subject = config.subject_base or DN(('O', config.realm_name)) db = certs.CertDB(config.realm_name, nssdir=nssdir, subject_base=subject) db.request_service_cert('Server-Cert', principal, config.host_name, True) |