cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix authorized_key crash in Python3 with remote key file (#20037)

Browse source 
* Decode downloaded keys bytes if Python3
* Fixes #20007
* Thanks @georgepsarakis
This commit is contained in:
James Cooke 2017-01-09 20:21:51 +00:00 committed by Toshio Kuratomi
parent b8ee80ac4e
commit fafe5bba59
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/system/authorized_key.py
View file

@ -227,6 +227,7 @@ import re
import shlex
from operator import itemgetter
from ansible.module_utils._text import to_native
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.pycompat24 import get_exception
from ansible.module_utils.urls import fetch_url
@ -537,6 +538,9 @@ def enforce_state(module, params):
except Exception:
module.fail_json(msg=error_msg % key)
# resp.read gives bytes on python3, convert to native string type
key = to_native(key, errors='surrogate_or_strict')
# extract individual keys into an array, skipping blank lines and comments
new_keys = [s for s in key.splitlines() if s and not s.startswith('#')]