vm-repair: do not quote the az token when invoking nested commands on…

src/vm-repair/HISTORY.rst

@@ -2,6 +2,11 @@
 Release History
 ===============
 
+2.2.5
+++++++
+Fixing a regression introduced in 2.2.1 that could break every ``vm repair`` command on Windows when ``az`` resolves to the ``az.cmd`` launcher (the default for MSI installations). The command-injection hardening quoted every token of the nested ``az`` call, including the ``az`` program name itself. cmd.exe then treated it as a literal path instead of a PATH search, so ``%~dp0`` inside ``az.cmd`` no longer pointed at the launcher directory, the bundled Python interpreter was not found, and the call failed with ``Failed to load python executable.`` and exit code 1. The ``az`` token is no longer quoted; all arguments are still individually quoted, so the injection protection added in 2.2.1 (MSRC 115198) is unchanged.
+Also fixing failed ``az`` calls that surfaced an empty error message. Because the launcher reports on standard output and leaves standard error empty, the failure previously produced a blank error and empty telemetry. The error now falls back to the command's standard output, reports the exit code when there is no output at all, and masks credentials passed as secure parameters.
+
 2.2.4
 ++++++
 Replacing deprecated ``datetime.utcnow()`` with timezone-aware ``datetime.now(timezone.utc)`` for Python 3.12+ forward compatibility. ``datetime.utcnow()`` is deprecated as of Python 3.12 and scheduled for removal in a future release. The generated timestamps (used for repair VM, copied disk, and repair resource group names) are unchanged. Also replacing ``pkgutil.get_loader()``/``loader.load_module()`` (deprecated in Python 3.12, removed in Python 3.14) with ``importlib.util.find_spec()`` when locating the bundled driver scripts, and extending the static Python 3.12+ compatibility guard to cover these APIs.

src/vm-repair/azext_vm_repair/repair_utils.py

@@ -140,9 +140,16 @@ def _call_az_command(command_string, run_async=False, secure_params=None):
     # contain whitespace, so a token such as 'env=ok&echo' would reach cmd.exe unquoted
     # and the '&' would be parsed as a command separator. To prevent command injection
     # from untrusted interpolated values (for example source VM tags), build the command
-    # line explicitly and wrap every token in double quotes so cmd.exe treats
+    # line explicitly and wrap every argument in double quotes so cmd.exe treats
     # metacharacters as literal text.
     #
+    # The 'az' token itself must stay unquoted. Quoting it makes cmd.exe treat it as a
+    # literal path instead of a PATH search, so '%~dp0' inside az.cmd no longer expands to
+    # the launcher directory, the bundled python.exe is not found, and every nested call
+    # fails with 'Failed to load python executable.' on stdout and an empty stderr. The
+    # first token is validated to be exactly 'az' above, so it never carries untrusted
+    # input and does not need quoting.
+    #
     # The whole command is additionally wrapped in one outer pair of quotes and invoked
     # with 'cmd /s /c "..."'. Without '/s', cmd.exe strips the first and last quote on the
     # line (its documented /c behavior), which would unbalance the quoting around the final
@@ -151,7 +158,8 @@ def _call_az_command(command_string, run_async=False, secure_params=None):
     # per-token quote balanced. See MSRC 115198 / VULN-185362.
     windows_os_name = 'nt'
     if os.name == windows_os_name:
-        quoted_command = ' '.join(_quote_cmd_arg(token) for token in tokenized_command)
+        quoted_arguments = ' '.join(_quote_cmd_arg(token) for token in tokenized_command[1:])
+        quoted_command = ' '.join(part for part in (tokenized_command[0], quoted_arguments) if part)
         command_to_run = 'cmd /s /c "' + quoted_command + '"'
     else:
         command_to_run = tokenized_command
@@ -162,7 +170,17 @@ def _call_az_command(command_string, run_async=False, secure_params=None):
     if not run_async:
         stdout, stderr = process.communicate()
         if process.returncode != 0:
-            raise AzCommandError(stderr)
+            # A failing launcher (for example a broken CLI install) reports on stdout and
+            # leaves stderr empty, which used to surface an error with no message at all.
+            error_message = (stderr or '').strip() or (stdout or '').strip()
+            if not error_message:
+                error_message = 'The az command failed with exit code {code} and produced no output.' \
+                    .format(code=process.returncode)
+            if secure_params:
+                for param in secure_params:
+                    if param:
+                        error_message = error_message.replace(param, '********')
+            raise AzCommandError(error_message)
 
         logger.debug('Success.\n')
 

src/vm-repair/azext_vm_repair/tests/latest/test_nested_az_invocation.py

@@ -0,0 +1,233 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# Regression tests for nested 'az' invocation from the vm-repair extension.
+#
+# Two defects are covered:
+#
+# 1. Command construction. The Windows path wraps the call in 'cmd /s /c "..."'. Quoting the
+#    'az' token itself makes cmd.exe treat it as a literal path instead of a PATH search, so
+#    '%~dp0' inside az.cmd stops resolving to the launcher directory. az.cmd then cannot find
+#    its bundled python.exe, prints 'Failed to load python executable.' to stdout and exits 1,
+#    which broke every nested az call (create / run / restore) on Windows MSI installs.
+#
+# 2. Error surfacing. The failure above writes its diagnostic to stdout and leaves stderr
+#    empty, and AzCommandError was raised with that empty stderr. Users saw a blank error and
+#    telemetry recorded an empty error_message, making the failure undiagnosable.
+
+import json
+import os
+import shutil
+import subprocess
+import sys
+from unittest import mock
+
+import pytest
+
+from azext_vm_repair.exceptions import AzCommandError
+from azext_vm_repair.repair_utils import _call_az_command
+
+
+class _FakeProcess:
+    """Minimal stand-in for a subprocess.Popen object."""
+
+    def __init__(self, returncode=0, stdout='', stderr=''):
+        self.returncode = returncode
+        self._stdout = stdout
+        self._stderr = stderr
+
+    def communicate(self):
+        return self._stdout, self._stderr
+
+
+def _windows_command_line(mock_popen, command):
+    with mock.patch('azext_vm_repair.repair_utils.os.name', 'nt'):
+        _call_az_command(command)
+    return mock_popen.call_args[0][0]
+
+
+# ---------------------------------------------------------------------------
+# 1. Command construction
+# ---------------------------------------------------------------------------
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_windows_executable_token_is_not_quoted(mock_popen):
+    # Core regression: 'az' must reach cmd.exe unquoted so the PATH search finds az.cmd and
+    # '%~dp0' resolves to the launcher directory.
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='ok')
+    command_line = _windows_command_line(mock_popen, 'az vm show -g rg -n vm')
+
+    assert command_line.startswith('cmd /s /c "az ')
+    assert '"az"' not in command_line
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_windows_arguments_remain_quoted(mock_popen):
+    # The injection protection must be preserved: every argument stays individually quoted.
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='ok')
+    command_line = _windows_command_line(mock_popen, 'az vm show -g rg -n vm')
+
+    for argument in ('vm', 'show', '-g', 'rg', '-n'):
+        assert '"{0}"'.format(argument) in command_line
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_windows_command_line_stays_balanced_for_cmd_s(mock_popen):
+    # 'cmd /s /c' strips exactly the first and last quote, so the line must start and end
+    # with one, leaving every per-argument quote balanced.
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='ok')
+    command_line = _windows_command_line(mock_popen, 'az vm show -g rg -n vm')
+
+    assert command_line.startswith('cmd /s /c "')
+    assert command_line.endswith('"')
+    assert command_line.count('"') % 2 == 0
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_windows_command_without_arguments_has_no_trailing_space(mock_popen):
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='ok')
+    command_line = _windows_command_line(mock_popen, 'az')
+
+    assert command_line == 'cmd /s /c "az"'
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_windows_metacharacters_in_arguments_are_still_neutralized(mock_popen):
+    # Leaving 'az' unquoted must not weaken MSRC 115198 hardening for untrusted values.
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='ok')
+    command_line = _windows_command_line(
+        mock_popen, 'az vm create --tags "env=ok&echo pwned>file.txt&rem"')
+
+    assert '"env=ok&echo pwned>file.txt&rem"' in command_line
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_posix_still_uses_argument_list(mock_popen):
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='ok')
+    with mock.patch('azext_vm_repair.repair_utils.os.name', 'posix'):
+        _call_az_command('az vm create --tags env=ok&echo')
+
+    command_args = mock_popen.call_args[0][0]
+    assert isinstance(command_args, list)
+    assert command_args[0] == 'az'
+
+
+# ---------------------------------------------------------------------------
+# 2. Error surfacing
+# ---------------------------------------------------------------------------
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_failure_with_empty_stderr_reports_stdout(mock_popen):
+    # Exact production signature: az.cmd reports on stdout and leaves stderr empty.
+    mock_popen.return_value = _FakeProcess(
+        returncode=1, stdout='Failed to load python executable.', stderr='')
+
+    with pytest.raises(AzCommandError) as raised:
+        _call_az_command('az vm show -g rg -n vm')
+
+    assert 'Failed to load python executable.' in str(raised.value)
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_failure_with_no_output_reports_exit_code(mock_popen):
+    mock_popen.return_value = _FakeProcess(returncode=3, stdout='   ', stderr='  ')
+
+    with pytest.raises(AzCommandError) as raised:
+        _call_az_command('az vm show -g rg -n vm')
+
+    message = str(raised.value)
+    assert message.strip(), 'AzCommandError must never be raised with an empty message'
+    assert '3' in message
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_failure_prefers_stderr_when_present(mock_popen):
+    mock_popen.return_value = _FakeProcess(
+        returncode=1, stdout='noise on stdout', stderr='ERROR: (AuthorizationFailed) denied')
+
+    with pytest.raises(AzCommandError) as raised:
+        _call_az_command('az vm show -g rg -n vm')
+
+    assert 'AuthorizationFailed' in str(raised.value)
+    assert 'noise on stdout' not in str(raised.value)
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_secure_params_are_masked_in_error_message(mock_popen):
+    # The error text is emitted to the user and to telemetry, so credentials must not leak.
+    secret = 'Sup3rSecretP@ss'
+    mock_popen.return_value = _FakeProcess(
+        returncode=1, stdout='', stderr='failed for password {0}'.format(secret))
+
+    with pytest.raises(AzCommandError) as raised:
+        _call_az_command('az vm create -g rg -n vm', secure_params=[secret])
+
+    assert secret not in str(raised.value)
+    assert '********' in str(raised.value)
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_successful_command_returns_stdout(mock_popen):
+    mock_popen.return_value = _FakeProcess(returncode=0, stdout='{"id": "abc"}', stderr='')
+
+    assert _call_az_command('az vm show -g rg -n vm') == '{"id": "abc"}'
+
+
+@mock.patch('azext_vm_repair.repair_utils.subprocess.Popen')
+def test_non_az_command_is_still_rejected(mock_popen):
+    with pytest.raises(AzCommandError):
+        _call_az_command('notaz vm create')
+    mock_popen.assert_not_called()
+
+
+# ---------------------------------------------------------------------------
+# 3. Real execution proofs (Windows only)
+# ---------------------------------------------------------------------------
+
+@pytest.mark.skipif(os.name != 'nt', reason='cmd.exe launcher behavior is Windows-specific')
+def test_real_cmd_resolves_unquoted_program_but_not_quoted_program():
+    # Demonstrates the mechanism against a real cmd.exe using a batch file that mirrors how
+    # az.cmd locates its interpreter through '%~dp0'. Quoting the program name breaks that
+    # resolution; leaving it unquoted keeps it working.
+    import tempfile
+
+    directory = tempfile.mkdtemp()
+    batch_path = os.path.join(directory, 'fakeaz.cmd')
+    with open(batch_path, 'w', encoding='utf-8') as batch_file:
+        batch_file.write('@echo off\r\n')
+        batch_file.write('IF EXIST "%~dp0\\marker.txt" (echo RESOLVED) ELSE (echo NOT_RESOLVED)\r\n')
+    with open(os.path.join(directory, 'marker.txt'), 'w', encoding='utf-8') as marker:
+        marker.write('present')
+
+    environment = dict(os.environ)
+    environment['PATH'] = directory + os.pathsep + environment.get('PATH', '')
+
+    unquoted = subprocess.run('cmd /s /c "fakeaz"', capture_output=True, text=True,
+                              env=environment, cwd=os.path.expanduser('~'))
+    assert 'RESOLVED' in unquoted.stdout
+
+    quoted = subprocess.run('cmd /s /c ""fakeaz""', capture_output=True, text=True,
+                            env=environment, cwd=os.path.expanduser('~'))
+    assert 'NOT_RESOLVED' in quoted.stdout, 'quoting the program name must break %~dp0 resolution'
+
+
+@pytest.mark.skipif(os.name != 'nt' or shutil.which('az') is None,
+                    reason='requires the Azure CLI on PATH on Windows')
+def test_real_nested_az_call_succeeds():
+    # End-to-end proof through the production code path: a real nested az call must succeed
+    # and return parsable JSON. This fails on the unpatched code with an empty AzCommandError.
+    output = _call_az_command('az version -o json')
+
+    assert json.loads(output).get('azure-cli')
+
+
+@pytest.mark.skipif(os.name != 'nt' or shutil.which('az') is None,
+                    reason='requires the Azure CLI on PATH on Windows')
+def test_real_failing_az_call_reports_a_message():
+    # A genuinely failing az command must produce a non-empty, actionable error.
+    with pytest.raises(AzCommandError) as raised:
+        _call_az_command('az vm show -g {0} -n {0}'.format('vmrepair-nonexistent-rg-000'))
+
+    assert str(raised.value).strip()

src/vm-repair/setup.py

@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = "2.2.4"
+VERSION = "2.2.5"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',