fix(agent): quote WMIC/netsh args for hyphens and special chars on Windows

Author: misakano7545

agent/network_config.py

@@ -7,6 +7,8 @@
 import sys
 from typing import Dict, List, Optional, Tuple
 
+from common.wincli_escape import netsh_interface_name_arg
+
 
 def _subprocess_flags() -> int:
     return subprocess.CREATE_NO_WINDOW if sys.platform == "win32" else 0
@@ -338,7 +340,7 @@ def get_default_ipv4_interface_name() -> Tuple[Optional[str], str]:
 
 def apply_ipv4_dhcp(interface_name: str) -> Tuple[bool, str]:
     flags = _subprocess_flags()
-    name_arg = "name=%s" % interface_name
+    name_arg = netsh_interface_name_arg(interface_name)
     try:
         p1 = subprocess.run(
             ["netsh", "interface", "ipv4", "set", "address", name_arg, "dhcp"],
@@ -372,7 +374,7 @@ def apply_ipv4_static(
     dns_secondary: Optional[str],
 ) -> Tuple[bool, str]:
     flags = _subprocess_flags()
-    name_arg = "name=%s" % interface_name
+    name_arg = netsh_interface_name_arg(interface_name)
     gw = gateway.strip() if gateway else ""
     gw_arg = gw if gw else "none"
     mask_n = normalize_mask(mask)

agent/rename_host.py

@@ -6,6 +6,8 @@
 import subprocess
 import sys
 
+from common.wincli_escape import wmic_call_arg_eq, wmic_where_eq
+
 
 def rename_computer(new_name: str) -> tuple[bool, str]:
     """
@@ -29,15 +31,16 @@ def rename_computer(new_name: str) -> tuple[bool, str]:
             cur = os.environ.get("COMPUTERNAME", "")
             if not cur:
                 return False, "COMPUTERNAME not set"
-            where = "name='%s'" % cur.replace("'", "''")
+            where = wmic_where_eq("name", cur)
+            name_arg = wmic_call_arg_eq("name", new_name)
             cmd = [
                 "wmic",
                 "computersystem",
                 "where",
                 where,
                 "call",
                 "rename",
-                "name=%s" % new_name,
+                name_arg,
             ]
             p = subprocess.run(
                 cmd,

common/wincli_escape.py

@@ -0,0 +1,33 @@
+"""Windows CLI quoting: WMIC / netsh parse tokens and treat '-' as switches unless quoted."""
+
+from __future__ import annotations
+
+
+def wmic_wql_single_quote_body(s: str) -> str:
+    """WQL string inside single quotes: double any apostrophe."""
+    return s.replace("'", "''")
+
+
+def wmic_where_eq(property_name: str, value: str) -> str:
+    """WMIC argv token for where clause, e.g. name='MY-PC' (hyphen-safe)."""
+    prop = property_name.strip()
+    if not prop:
+        raise ValueError("wmic_where_eq: empty property_name")
+    return "%s='%s'" % (prop, wmic_wql_single_quote_body(value))
+
+
+def wmic_call_arg_eq(arg_name: str, value: str) -> str:
+    """WMIC method argv token after 'call rename', e.g. name='Win7-1' (hyphen-safe)."""
+    name = arg_name.strip()
+    if not name:
+        raise ValueError("wmic_call_arg_eq: empty arg_name")
+    return "%s='%s'" % (name, wmic_wql_single_quote_body(value))
+
+
+def netsh_interface_name_arg(interface_name: str) -> str:
+    """
+    Single argv token for netsh ipv4 commands: name="...".
+    Spaces, hyphens, and '&' in names are safe; embedded " doubled per Windows rules.
+    """
+    inner = (interface_name or "").replace('"', '""')
+    return 'name="%s"' % inner