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

ipauser: 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 ef94b703
No related branches found
No related tags found
No related merge requests found
...@@ -741,7 +741,8 @@ user: ...@@ -741,7 +741,8 @@ user:
from ansible.module_utils.ansible_freeipa_module import \ from ansible.module_utils.ansible_freeipa_module import \
IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, date_format, \ IPAAnsibleModule, compare_args_ipa, gen_add_del_lists, date_format, \
encode_certificate, load_cert_from_str, DN_x500_text, to_text, \ encode_certificate, load_cert_from_str, DN_x500_text, to_text, \
ipalib_errors, gen_add_list, gen_intersection_list ipalib_errors, gen_add_list, gen_intersection_list, \
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
...@@ -961,13 +962,6 @@ def extend_emails(email, default_email_domain): ...@@ -961,13 +962,6 @@ def extend_emails(email, default_email_domain):
return email return email
def convert_certificate(certificate):
if certificate is None:
return None
return [cert.strip() for cert in certificate]
def convert_certmapdata(certmapdata): def convert_certmapdata(certmapdata):
if certmapdata is None: if certmapdata is None:
return None return None
...@@ -1260,7 +1254,8 @@ def main(): ...@@ -1260,7 +1254,8 @@ def main():
preserve, update_password, smb_logon_script, smb_profile_path, preserve, update_password, smb_logon_script, smb_profile_path,
smb_home_dir, smb_home_drive, idp, idp_user_id, rename, smb_home_dir, smb_home_drive, idp, idp_user_id, rename,
) )
certificate = convert_certificate(certificate) certificate = convert_input_certificates(ansible_module, certificate,
state)
certmapdata = convert_certmapdata(certmapdata) certmapdata = convert_certmapdata(certmapdata)
# Init # Init
...@@ -1371,7 +1366,8 @@ def main(): ...@@ -1371,7 +1366,8 @@ def main():
update_password, smb_logon_script, smb_profile_path, update_password, smb_logon_script, smb_profile_path,
smb_home_dir, smb_home_drive, idp, idp_user_id, rename, smb_home_dir, smb_home_drive, idp, idp_user_id, rename,
) )
certificate = convert_certificate(certificate) certificate = convert_input_certificates(ansible_module,
certificate, state)
certmapdata = convert_certmapdata(certmapdata) certmapdata = convert_certmapdata(certmapdata)
# Check API specific parameters # Check API specific parameters
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment