Skip to content
Snippets Groups Projects
Commit 0dc58be3 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

ipahost: Use new convert_input_certificates

Certificates given by ansible could have leading and trailing white
space, but also multi line input is possible that also could have
leading and training white space and newlines.
parent b64da1db
No related branches found
No related tags found
No related merge requests found
...@@ -510,7 +510,8 @@ host: ...@@ -510,7 +510,8 @@ host:
from ansible.module_utils.ansible_freeipa_module import \ from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \ IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, \
encode_certificate, is_ipv4_addr, is_ipv6_addr, ipalib_errors, \ encode_certificate, is_ipv4_addr, is_ipv6_addr, ipalib_errors, \
gen_add_list, gen_intersection_list, normalize_sshpubkey gen_add_list, gen_intersection_list, normalize_sshpubkey, \
convert_input_certificates
from ansible.module_utils import six from ansible.module_utils import six
if six.PY3: if six.PY3:
unicode = str unicode = str
...@@ -682,13 +683,6 @@ def check_authind(module, auth_ind): ...@@ -682,13 +683,6 @@ def check_authind(module, auth_ind):
"by your IPA version" % "','".join(_invalid)) "by your IPA version" % "','".join(_invalid))
def convert_certificate(certificate):
if certificate is None:
return None
return [cert.strip() for cert in certificate]
# pylint: disable=unused-argument # pylint: disable=unused-argument
def result_handler(module, result, command, name, args, exit_args, def result_handler(module, result, command, name, args, exit_args,
single_host): single_host):
...@@ -894,7 +888,8 @@ def main(): ...@@ -894,7 +888,8 @@ def main():
auth_ind, requires_pre_auth, ok_as_delegate, ok_to_auth_as_delegate, auth_ind, requires_pre_auth, ok_as_delegate, ok_to_auth_as_delegate,
force, reverse, ip_address, update_dns, update_password) force, reverse, ip_address, update_dns, update_password)
certificate = convert_certificate(certificate) certificate = convert_input_certificates(ansible_module, certificate,
state)
if sshpubkey is not None: if sshpubkey is not None:
sshpubkey = [str(normalize_sshpubkey(key)) for key in sshpubkey] sshpubkey = [str(normalize_sshpubkey(key)) for key in sshpubkey]
...@@ -982,7 +977,8 @@ def main(): ...@@ -982,7 +977,8 @@ def main():
ok_to_auth_as_delegate, force, reverse, ip_address, ok_to_auth_as_delegate, force, reverse, ip_address,
update_dns, update_password) update_dns, update_password)
certificate = convert_certificate(certificate) certificate = convert_input_certificates(ansible_module,
certificate, state)
if sshpubkey is not None: if sshpubkey is not None:
sshpubkey = [str(normalize_sshpubkey(key)) for sshpubkey = [str(normalize_sshpubkey(key)) for
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment