diff options
| author | Fraser Tweedale <ftweedal@redhat.com> | 2016-11-11 18:54:01 +1000 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-01-11 15:26:20 +0100 |
| commit | 324183cd63aeadbaa9678d610ba59e1295a606fe (patch) | |
| tree | 7794484b9ee24ae75b015d9c326aeb7ab20f96fa | |
| parent | d648c6a6925298a1db0c61381d72b6c4d0500c10 (diff) | |
| download | freeipa-324183cd63aeadbaa9678d610ba59e1295a606fe.tar.gz freeipa-324183cd63aeadbaa9678d610ba59e1295a606fe.tar.xz freeipa-324183cd63aeadbaa9678d610ba59e1295a606fe.zip | |
Refactor and relocate set_subject_base_in_config
Refactor set_subject_base_in_config to use api.Backend.ldap2 instead
of a manually created LDAP connection.
Also rename the function to have a more accurate name, and move it
to 'ipaserver.install.ca' to avoid cyclic import (we will eventually
need to use it from within that module).
Part of: https://fedorahosted.org/freeipa/ticket/2614
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
| -rw-r--r-- | ipaserver/install/ca.py | 9 | ||||
| -rw-r--r-- | ipaserver/install/server/install.py | 24 |
2 files changed, 10 insertions, 23 deletions
diff --git a/ipaserver/install/ca.py b/ipaserver/install/ca.py index 4f64d99db..820c6eebc 100644 --- a/ipaserver/install/ca.py +++ b/ipaserver/install/ca.py @@ -48,6 +48,15 @@ external_cert_file = None external_ca_file = None +def set_subject_base_in_config(subject_base): + entry_attrs = api.Backend.ldap2.get_ipa_config() + entry_attrs['ipacertificatesubjectbase'] = [str(subject_base)] + try: + api.Backend.ldap2.update_entry(entry_attrs) + except errors.EmptyModlist: + pass + + def install_check(standalone, replica_config, options): global external_cert_file global external_ca_file diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index fc319d916..36bbb4b49 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -16,7 +16,6 @@ import six from ipalib.install import certmonger, sysrestore from ipapython import ipautil -from ipapython.dn import DN from ipapython.ipa_log_manager import root_logger from ipapython.ipautil import ( format_netloc, ipa_generate_password, run, user_input) @@ -40,7 +39,6 @@ from ipaserver.install.installutils import ( IPA_MODULES, BadHostError, get_fqdn, get_server_ip_address, is_ipa_configured, load_pkcs12, read_password, verify_fqdn, update_hosts_file) -from ipaserver.plugins.ldap2 import ldap2 if six.PY3: unicode = str @@ -242,25 +240,6 @@ def check_dirsrv(unattended): raise ScriptError(msg) -def set_subject_in_config(realm_name, dm_password, suffix, subject_base): - ldapuri = 'ldapi://%%2fvar%%2frun%%2fslapd-%s.socket' % ( - installutils.realm_to_serverid(realm_name) - ) - try: - conn = ldap2(api, ldap_uri=ldapuri) - conn.connect(bind_dn=DN(('cn', 'directory manager')), - bind_pw=dm_password) - except errors.ExecutionError as e: - root_logger.critical("Could not connect to the Directory Server " - "on %s" % realm_name) - raise e - entry_attrs = conn.get_ipa_config() - if 'ipacertificatesubjectbase' not in entry_attrs: - entry_attrs['ipacertificatesubjectbase'] = [str(subject_base)] - conn.update_entry(entry_attrs) - conn.disconnect() - - def common_cleanup(func): def decorated(installer): success = False @@ -848,8 +827,7 @@ def install(installer): os.chmod(paths.IPA_CA_CRT, 0o644) ca_db.publish_ca_cert(paths.IPA_CA_CRT) - set_subject_in_config(realm_name, dm_password, - ipautil.realm_to_suffix(realm_name), options.subject) + ca.set_subject_base_in_config(options.subject_base) # Apply any LDAP updates. Needs to be done after the configuration file # is created. DS is restarted in the process. |