mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-10-24 14:17:41 -05:00
Get correct CA cert nickname in CA-less
During CA-less installation, we initialize the HTTPD alias database from a pkcs12 file. This means there's going to be different nicknames to the added certificates. Store the CA certificate nickname in HTTPInstance__setup_ssl() to be able to correctly export it later. https://pagure.io/freeipa/issue/6806 Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
1 parent
720034f1b4
commit
8c87014e19
1 file changed
+6
-1
@@ -118,6 +118,7 @@ class WebGuiInstance(service.SimpleServiceInstance):
|
||||
def __init__(self):
|
||||
service.SimpleServiceInstance.__init__(self, "ipa_webgui")
|
||||
|
||||
|
||||
class HTTPInstance(service.Service):
|
||||
def __init__(self, fstore=None, cert_nickname='Server-Cert',
|
||||
api=api):
|
||||
@@ -130,6 +131,7 @@ class HTTPInstance(service.Service):
|
||||
service_user=HTTPD_USER,
|
||||
keytab=paths.HTTP_KEYTAB)
|
||||
|
||||
self.cacert_nickname = None
|
||||
self.cert_nickname = cert_nickname
|
||||
self.ca_is_configured = True
|
||||
self.keytab_user = constants.GSSPROXY_USER
|
||||
@@ -441,6 +443,9 @@ class HTTPInstance(service.Service):
|
||||
if not server_certs:
|
||||
raise RuntimeError("Could not find a suitable server cert.")
|
||||
|
||||
# store the CA cert nickname so that we can publish it later on
|
||||
self.cacert_nickname = db.cacert_name
|
||||
|
||||
def __import_ca_certs(self):
|
||||
db = certs.CertDB(self.realm, nssdir=paths.HTTPD_ALIAS_DIR,
|
||||
subject_base=self.subject_base)
|
||||
@@ -449,7 +454,7 @@ class HTTPInstance(service.Service):
|
||||
def __publish_ca_cert(self):
|
||||
ca_db = certs.CertDB(self.realm, nssdir=paths.HTTPD_ALIAS_DIR,
|
||||
subject_base=self.subject_base)
|
||||
ca_db.publish_ca_cert(paths.CA_CRT)
|
||||
ca_db.export_pem_cert(self.cacert_nickname, paths.CA_CRT)
|
||||
|
||||
def is_kdcproxy_configured(self):
|
||||
"""Check if KDC proxy has already been configured in the past"""
|
||||
|
||||
Reference in new issue
Block a user