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

Extract function for computing default subject base

Browse Source 
Part of: https://fedorahosted.org/freeipa/ticket/2614

Reviewed-By: Jan Cholasta <jcholast@redhat.com>
This commit is contained in:
Fraser Tweedale
2016-11-16 20:39:23 +10:00
committed by Jan Cholasta
parent c6db493b06
commit 6f3eb85c30
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/cainstance.py
View File

@@ -352,10 +352,10 @@ class CAInstance(DogtagInstance):
self.clone = True self.clone = True
self.master_host = master_host self.master_host = master_host
self.master_replication_port = master_replication_port self.master_replication_port = master_replication_port
if subject_base is None:
self.subject_base = DN(('O', self.realm)) self.subject_base = \
else: subject_base or installutils.default_subject_base(self.realm)
self.subject_base = subject_base
if ca_signing_algorithm is None: if ca_signing_algorithm is None:
self.ca_signing_algorithm = 'SHA256withRSA' self.ca_signing_algorithm = 'SHA256withRSA'
else: else:

3
ipaserver/install/dsinstance.py
View File

@@ -1251,7 +1251,8 @@ class DsInstance(service.Service):
replacevars=vardict) replacevars=vardict)
def __get_ds_cert(self): def __get_ds_cert(self):
subject = self.subject_base or DN(('O', self.realm)) subject = self.subject_base \
or installutils.default_subject_base(self.realm)
nssdb_dir = config_dirname(self.serverid) nssdb_dir = config_dirname(self.serverid)
db = certs.CertDB(self.realm, nssdir=nssdb_dir, subject_base=subject) db = certs.CertDB(self.realm, nssdir=nssdb_dir, subject_base=subject)
db.create_from_cacert(paths.IPA_CA_CRT) db.create_from_cacert(paths.IPA_CA_CRT)

4
ipaserver/install/installutils.py
View File

@@ -1476,3 +1476,7 @@ def restart_dirsrv(instance_name="", capture_output=True):
capture_output=capture_output, capture_output=capture_output,
wait=True, ldapi=True) wait=True, ldapi=True)
api.Backend.ldap2.connect() api.Backend.ldap2.connect()
def default_subject_base(realm_name):
return DN(('O', realm_name))

8
ipaserver/install/krainstance.py
View File

@@ -90,10 +90,10 @@ class KRAInstance(DogtagInstance):
if self.pkcs12_info is not None or promote: if self.pkcs12_info is not None or promote:
self.clone = True self.clone = True
self.master_host = master_host self.master_host = master_host
if subject_base is None:
self.subject_base = DN(('O', self.realm)) self.subject_base = \
else: subject_base or installutils.default_subject_base(realm_name)
self.subject_base = subject_base
self.realm = realm_name self.realm = realm_name
self.suffix = ipautil.realm_to_suffix(realm_name) self.suffix = ipautil.realm_to_suffix(realm_name)

2
ipaserver/install/server/install.py
View File

@@ -465,7 +465,7 @@ def install_check(installer):
realm_name = options.realm_name.upper() realm_name = options.realm_name.upper()
if not options.subject_base: if not options.subject_base:
options.subject_base = DN(('O', realm_name)) options.subject_base = installutils.default_subject_base(realm_name)
if options.http_cert_files: if options.http_cert_files:
if options.http_pin is None: if options.http_pin is None:

2
ipaserver/install/server/replicainstall.py
View File

@@ -78,7 +78,7 @@ def install_http_certs(host_name, realm_name, subject_base):
principal = 'HTTP/%s@%s' % (host_name, realm_name) principal = 'HTTP/%s@%s' % (host_name, realm_name)
# Obtain certificate for the HTTP service # Obtain certificate for the HTTP service
nssdir = certs.NSS_DIR nssdir = certs.NSS_DIR
subject = subject_base or DN(('O', realm_name)) subject = subject_base or installutils.default_subject_base(realm_name)
db = certs.CertDB(realm_name, nssdir=nssdir, subject_base=subject) db = certs.CertDB(realm_name, nssdir=nssdir, subject_base=subject)
db.request_service_cert('Server-Cert', principal, host_name, True) db.request_service_cert('Server-Cert', principal, host_name, True)