diff options
| author | Chris Church <chris@ninemoreminutes.com> | 2015-08-22 20:18:44 -0400 |
|---|---|---|
| committer | Chris Church <chris@ninemoreminutes.com> | 2015-09-16 16:30:10 -0400 |
| commit | 1d15e8f37a4407e5d394bbe44f13fbca67fd210c (patch) | |
| tree | 1d589afce8c9bbcdb2c13151d8d6ba40eba22ef5 /lib/ansible/plugins/connection/winrm.py | |
| parent | 87db5119ea9f93243e1bfe5fd8864bb879cd9544 (diff) | |
| download | ansible-1d15e8f37a4407e5d394bbe44f13fbca67fd210c.tar.gz | |
Pass windows command as-is without splitting/rejoining parameters.
* Fixes extra spaces added between parameters from https://github.com/ansible/ansible-modules-core/issues/1929
* Correctly decode PowerShell command encoded as UTF-16-LE so that it displays correctly in debug messages, fixes the other issue from https://github.com/ansible/ansible-modules-core/issues/1929
* Add test to verify that script parameters are passed as-is, so $true is interpreted as a boolean, fixes https://github.com/ansible/ansible/issues/10947
Diffstat (limited to 'lib/ansible/plugins/connection/winrm.py')
| -rw-r--r-- | lib/ansible/plugins/connection/winrm.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ansible/plugins/connection/winrm.py b/lib/ansible/plugins/connection/winrm.py index 4303a3ca2a..2976cb90e6 100644 --- a/lib/ansible/plugins/connection/winrm.py +++ b/lib/ansible/plugins/connection/winrm.py @@ -159,18 +159,18 @@ class Connection(ConnectionBase): cmd_ext = cmd_parts and self._shell._unquote(cmd_parts[0]).lower()[-4:] or '' # Support running .ps1 files (via script/raw). if cmd_ext == '.ps1': - script = ' '.join(['&'] + cmd_parts) + script = '& %s' % cmd # Support running .bat/.cmd files; change back to the default system encoding instead of UTF-8. elif cmd_ext in ('.bat', '.cmd'): - script = ' '.join(['[System.Console]::OutputEncoding = [System.Text.Encoding]::Default;', '&'] + cmd_parts) + script = '[System.Console]::OutputEncoding = [System.Text.Encoding]::Default; & %s' % cmd # Encode the command if not already encoded; supports running simple PowerShell commands via raw. elif '-EncodedCommand' not in cmd_parts: - script = ' '.join(cmd_parts) + script = cmd if script: cmd_parts = self._shell._encode_script(script, as_list=True) if '-EncodedCommand' in cmd_parts: encoded_cmd = cmd_parts[cmd_parts.index('-EncodedCommand') + 1] - decoded_cmd = to_unicode(base64.b64decode(encoded_cmd)) + decoded_cmd = to_unicode(base64.b64decode(encoded_cmd).decode('utf-16-le')) self._display.vvv("EXEC %s" % decoded_cmd, host=self._play_context.remote_addr) else: self._display.vvv("EXEC %s" % cmd, host=self._play_context.remote_addr) |