internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-08-01 12:24:43 +00:00
Code Issues Projects Releases Wiki Activity

ipaclient_test: Use validate_hostname with constants.MAXHOSTNAMELEN

Browse Source 
Run validate_hostname to check for valid host name if constants.MAXHOSTNAMELEN
is defined. The call has not been used in older FreeIPA versions.
This commit is contained in:
Thomas Woerner
2019-06-07 17:25:12 +02:00
parent c82867585b
commit 9a53e71de8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/ipaclient/library/ipaclient_test.py
View File

@@ -529,6 +529,14 @@ def main():
"Invalid hostname, '{}' must not be used.".format(hostname), "Invalid hostname, '{}' must not be used.".format(hostname),
rval=CLIENT_INSTALL_ERROR) rval=CLIENT_INSTALL_ERROR)
if hasattr(constants, "MAXHOSTNAMELEN"):
try:
validate_hostname(hostname, maxlen=constants.MAXHOSTNAMELEN)
except ValueError as e:
raise ScriptError(
'invalid hostname: {}'.format(e),
rval=CLIENT_INSTALL_ERROR)
if hasattr(tasks, "is_nosssd_supported"): if hasattr(tasks, "is_nosssd_supported"):
# --no-sssd is not supported any more for rhel-based distros # --no-sssd is not supported any more for rhel-based distros
if not tasks.is_nosssd_supported() and not options.sssd: if not tasks.is_nosssd_supported() and not options.sssd:

4
roles/ipaclient/module_utils/ansible_ipa_client.py
View File

@@ -81,6 +81,7 @@ if NUM_VERSION >= 40400:
except ImportError: except ImportError:
from ipaclient import ipadiscovery from ipaclient import ipadiscovery
from ipalib import api, errors, x509 from ipalib import api, errors, x509
from ipalib import constants
try: try:
from ipalib.install import sysrestore from ipalib.install import sysrestore
except ImportError: except ImportError:
@@ -97,7 +98,8 @@ if NUM_VERSION >= 40400:
from ipapython import certdb, ipautil from ipapython import certdb, ipautil
from ipapython.admintool import ScriptError from ipapython.admintool import ScriptError
from ipapython.ipautil import CheckedIPAddress from ipapython.ipautil import CheckedIPAddress
from ipalib.util import validate_domain_name, normalize_hostname from ipalib.util import validate_domain_name, normalize_hostname, \
validate_hostname
from ipaplatform import services from ipaplatform import services
from ipaplatform.paths import paths from ipaplatform.paths import paths
from ipaplatform.tasks import tasks from ipaplatform.tasks import tasks