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

Fix logic of check_client_configuration

Browse Source 
The helper function ipalib.util.check_client_configuration() now
considers a client configured when either:

* confdir is overridden (e.g. with IPA_CONFDIR) and the conf_default
  file exists.
* confdir is /etc/ipa, /etc/ipa/default.conf exists and client
  sysrestore state exists.

The check for sysrestore state is faster than checking for the presence
of the directory and presence of files in the directory. The sysrestore
state is always presence. sysrestore.index may be missing if no files
were backed up.

Fixes: https://pagure.io/freeipa/issue/8133
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Rob Crittenden <rcritten@redhat.com>
This commit is contained in:
Christian Heimes 2019-12-02 09:48:20 +01:00
parent dcb33e44e7
commit cf9f9bb326
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ipalib/util.py
View File

@ -1164,12 +1164,31 @@ def check_client_configuration(env=None):
Hardcode return code to avoid recursive imports
"""
if ((env is not None and not os.path.isfile(env.conf_default)) or
(not os.path.isfile(paths.IPA_DEFAULT_CONF) or
not os.path.isdir(paths.IPA_CLIENT_SYSRESTORE) or
not os.listdir(paths.IPA_CLIENT_SYSRESTORE))):
raise ScriptError('IPA client is not configured on this system',
2) # CLIENT_NOT_CONFIGURED
CLIENT_NOT_CONFIGURED = 2
if env is not None and env.confdir != paths.ETC_IPA:
# custom IPA conf dir, check for custom conf_default
if os.path.isfile(env.conf_default):
return True
else:
raise ScriptError(
f'IPA client is not configured on this system (confdir '
f'{env.confdir} is missing {env.conf_default})',
CLIENT_NOT_CONFIGURED
)
elif (
os.path.isfile(paths.IPA_DEFAULT_CONF) and
os.path.isfile(
os.path.join(paths.IPA_CLIENT_SYSRESTORE, 'sysrestore.state')
)
):
# standard installation, check for config and client sysrestore state
return True
else:
# client not configured
raise ScriptError(
'IPA client is not configured on this system',
CLIENT_NOT_CONFIGURED
)
def check_principal_realm_in_trust_namespace(api_instance, *keys):