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

ipauser: Use encode_certificate for certificates in find_user result

Browse Source 
The find_user function was not using encode_certificate for certificates
that are stored in the user record. This could lead to some issues with
older ipa releases and Python 2.
This commit is contained in:
Thomas Woerner
2020-05-06 13:03:47 +02:00
parent 457050c6ac
commit 791c4703b1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/modules/ipauser.py
View File

@@ -467,7 +467,7 @@ from ansible.module_utils._text import to_text
from ansible.module_utils.ansible_freeipa_module import temp_kinit, \ from ansible.module_utils.ansible_freeipa_module import temp_kinit, \
temp_kdestroy, valid_creds, api_connect, api_command, date_format, \ temp_kdestroy, valid_creds, api_connect, api_command, date_format, \
compare_args_ipa, module_params_get, api_check_param, api_get_realm, \ compare_args_ipa, module_params_get, api_check_param, api_get_realm, \
api_command_no_name, gen_add_del_lists api_command_no_name, gen_add_del_lists, encode_certificate
import six import six
@@ -497,6 +497,11 @@ def find_user(module, name, preserved=False):
for x in _result["krbprincipalname"]: for x in _result["krbprincipalname"]:
_list.append(str(x)) _list.append(str(x))
_result["krbprincipalname"] = _list _result["krbprincipalname"] = _list
certs = _result.get("usercertificate")
if certs is not None:
_result["usercertificate"] = [encode_certificate(x)
for x in certs]
return _result return _result
else: else:
return None return None