wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert some more base64 strings to text for winrm, to support async and become (#24796)

Browse source 
(cherry picked from commit 1eed6c5b3d)
This commit is contained in:
Matt Martz 2017-05-18 18:06:51 -05:00 committed by Matt Davis
parent c7b3e420b7
commit 4542e83fa0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/executor/module_common.py
View file

@ -834,9 +834,9 @@ def build_windows_module_payload(module_name, module_path, b_module_data, module
if task.async > 0:
exec_manifest["actions"].insert(0, 'async_watchdog')
exec_manifest["async_watchdog"] = base64.b64encode(to_bytes(async_watchdog))
exec_manifest["async_watchdog"] = to_text(base64.b64encode(to_bytes(async_watchdog)))
exec_manifest["actions"].insert(0, 'async_wrapper')
exec_manifest["async_wrapper"] = base64.b64encode(to_bytes(async_wrapper))
exec_manifest["async_wrapper"] = to_text(base64.b64encode(to_bytes(async_wrapper)))
exec_manifest["async_jid"] = str(random.randint(0, 999999999999))
exec_manifest["async_timeout_sec"] = task.async
@ -844,7 +844,7 @@ def build_windows_module_payload(module_name, module_path, b_module_data, module
exec_manifest["actions"].insert(0, 'become')
exec_manifest["become_user"] = play_context.become_user
exec_manifest["become_password"] = play_context.become_pass
exec_manifest["become"] = base64.b64encode(to_bytes(become_wrapper))
exec_manifest["become"] = to_text(base64.b64encode(to_bytes(become_wrapper)))
lines = b_module_data.split(b'\n')
module_names = set()

4
lib/ansible/plugins/connection/winrm.py
View file

@ -309,10 +309,10 @@ class Connection(ConnectionBase):
def _create_raw_wrapper_payload(self, cmd, environment=dict()):
payload = {
'module_entry': base64.b64encode(to_bytes(cmd)),
'module_entry': to_text(base64.b64encode(to_bytes(cmd))),
'powershell_modules': {},
'actions': ['exec'],
'exec': base64.b64encode(to_bytes(leaf_exec)),
'exec': to_text(base64.b64encode(to_bytes(leaf_exec))),
'environment': environment
}