fix(agent): resolve default IPv4 adapter on Win7 without Get-NetRoute

Author: misakano7545

README.md

@@ -159,8 +159,8 @@ python -m agent.main --config configs\agent.json
 先定位默认出口网卡，依次尝试：
 
 1. WMI `DefaultIPGateway`
-2. PowerShell `Get-NetRoute`
-3. PowerShell `Get-NetIPConfiguration`
+2. 若本机存在 `Get-NetRoute` cmdlet：PowerShell 默认路由，再 `Get-NetIPConfiguration`（避免仅按系统版本误判，Win7 兼容模式误报为 6.2+ 时不会误调）
+3. WMI `Win32_IP4RouteTable`（默认路由的 `InterfaceIndex` → 网卡名，Win7 不依赖 `IPAddress` 字符串反查）
 4. `route print -4` + WMI 反查
 
 再用 `netsh interface ipv4` 应用配置：

agent/network_config.py

@@ -58,7 +58,16 @@ def _parse_wmic_list(text: str) -> List[Dict[str, str]]:
             if not line or "=" not in line:
                 continue
             k, v = line.split("=", 1)
-            item[k.strip().lower()] = v.strip()
+            key = k.strip().lower()
+            val = v.strip()
+            # 同一记录里可能出现多行 IPAddress=（数组）；后者会覆盖前者导致 Win7 上漏配
+            if key in item:
+                if val:
+                    prev_parts = [x.strip() for x in item[key].split(",") if x.strip()]
+                    if val not in prev_parts:
+                        item[key] = item[key] + "," + val
+            else:
+                item[key] = val
         if item:
             rows.append(item)
     return rows
@@ -78,6 +87,22 @@ def _clean_wmic_value(s: str) -> str:
     return s
 
 
+def _wmic_multivalue_tokens(s: str) -> List[str]:
+    """展开 WMIC 里逗号/花括号数组字段（如 IPAddress），保留全部原子值供匹配。"""
+    s = (s or "").strip()
+    if not s:
+        return []
+    inner = s[1:-1].strip() if s.startswith("{") and s.endswith("}") else s
+    out: List[str] = []
+    for part in re.split(r"\s*,\s*", inner):
+        p = part.strip()
+        if p.startswith('"') and p.endswith('"'):
+            p = p[1:-1]
+        if p:
+            out.append(p)
+    return out
+
+
 def _wmic_nic_name_for_index(idx: int) -> Tuple[Optional[str], str]:
     try:
         p2 = subprocess.run(
@@ -159,6 +184,93 @@ def _interface_from_wmi_default_gateway() -> Tuple[Optional[str], str]:
     return None, msg
 
 
+def _windows_has_net_tcpip_ps_cmdlets() -> bool:
+    """Get-NetRoute / Get-NetIPConfiguration 需 Win8+（6.2）或 Win10+ 且带 NetTCPIP；Win7 无此 cmdlet。"""
+    if sys.platform != "win32":
+        return False
+    v = sys.getwindowsversion()
+    if v.major > 6:
+        return True
+    if v.major == 6 and v.minor >= 2:
+        return True
+    return False
+
+
+def _powershell_has_get_net_route_cmdlet() -> bool:
+    """
+    是否实际存在 Get-NetRoute（NetTCPIP 模块）。
+    仅用 getwindowsversion 不可靠：兼容模式/部分环境会误报为 6.2+，Win7 仍会执行失败。
+    """
+    if sys.platform != "win32":
+        return False
+    ps = "if (Get-Command Get-NetRoute -ErrorAction SilentlyContinue) { exit 0 } else { exit 1 }"
+    try:
+        p = subprocess.run(
+            [
+                "powershell",
+                "-NoProfile",
+                "-NonInteractive",
+                "-Command",
+                ps,
+            ],
+            capture_output=True,
+            text=True,
+            creationflags=_subprocess_flags(),
+            timeout=20,
+        )
+        return p.returncode == 0
+    except (OSError, subprocess.TimeoutExpired, ValueError):
+        return False
+
+
+def _interface_from_wmi_ip4_route_table() -> Tuple[Optional[str], str]:
+    """
+    Win7+：WMI Win32_IP4RouteTable 取默认路由 (0.0.0.0/0.0.0.0) 的 InterfaceIndex，
+    不依赖 Win32_NetworkAdapterConfiguration.DefaultIPGateway 或 IPAddress 字符串反查。
+    """
+    try:
+        p = subprocess.run(
+            [
+                "wmic",
+                "path",
+                "Win32_IP4RouteTable",
+                "where",
+                "Destination='0.0.0.0' and Mask='0.0.0.0'",
+                "get",
+                "InterfaceIndex,Metric1",
+                "/format:list",
+            ],
+            capture_output=True,
+            text=True,
+            creationflags=_subprocess_flags(),
+            timeout=30,
+        )
+    except OSError as e:
+        return None, "wmic Win32_IP4RouteTable unavailable: %s" % e
+    if p.returncode != 0:
+        return None, (p.stderr or p.stdout or "wmic Win32_IP4RouteTable failed").strip()[:500]
+    candidates: List[Tuple[int, int]] = []  # (metric, interface_index)
+    for row in _parse_wmic_list(p.stdout or ""):
+        m = re.search(r"\d+", row.get("interfaceindex", ""))
+        if not m:
+            continue
+        idx = int(m.group())
+        met_s = row.get("metric1", "").strip()
+        try:
+            metric = int(met_s) if met_s.isdigit() else 9999
+        except ValueError:
+            metric = 9999
+        candidates.append((metric, idx))
+    if not candidates:
+        return None, "wmi Win32_IP4RouteTable no default row"
+    candidates.sort(key=lambda x: x[0])
+    idx = candidates[0][1]
+    name, msg = _wmic_nic_name_for_index(idx)
+    if name:
+        return name, "wmi Win32_IP4RouteTable (%s)" % msg
+    return None, msg
+
+
 def _interface_from_powershell_net_route() -> Tuple[Optional[str], str]:
     """
     Win8+：用默认路由所在接口（不依赖 WMI 的 DefaultIPGateway 字段，避免静态/特殊驱动下为空）。
@@ -248,10 +360,10 @@ def _interface_from_route_print(interface_ip: str) -> Tuple[Optional[str], str]:
     target = interface_ip.strip().lower()
     for row in _parse_wmic_list(p.stdout or ""):
         raw_ip = row.get("ipaddress", "")
-        cleaned = _clean_wmic_value(raw_ip).lower()
-        # 可能为 "a.b.c.d" 或逗号分隔多个
-        parts = re.split(r"[\s,;]+", cleaned)
-        if target not in parts and target not in cleaned.replace("{", "").replace("}", ""):
+        tokens = [t.lower() for t in _wmic_multivalue_tokens(raw_ip)]
+        if not tokens:
+            tokens = [_clean_wmic_value(raw_ip).lower()]
+        if target not in tokens:
             continue
         m = re.search(r"\d+", row.get("interfaceindex", ""))
         if not m:
@@ -308,7 +420,8 @@ def _interface_from_route_print_only() -> Tuple[Optional[str], str]:
 def get_default_ipv4_interface_name() -> Tuple[Optional[str], str]:
     """
     返回 (供 netsh 使用的接口名, 诊断说明)。
-    依次尝试：WMI DefaultIPGateway → PowerShell 默认路由 → PowerShell NetIPConfiguration → route print。
+    依次尝试：WMI DefaultIPGateway →（若存在 cmdlet）PowerShell 默认路由 / NetIPConfiguration
+    → WMI Win32_IP4RouteTable → route print + WMI 反查。
     """
     if sys.platform != "win32":
         return None, "not windows"
@@ -320,13 +433,25 @@ def get_default_ipv4_interface_name() -> Tuple[Optional[str], str]:
     if name:
         return name, why
 
-    name, why = _interface_from_powershell_net_route()
-    tried.append("ps-route:%s" % why)
-    if name:
-        return name, why
+    if _powershell_has_get_net_route_cmdlet():
+        name, why = _interface_from_powershell_net_route()
+        tried.append("ps-route:%s" % why)
+        if name:
+            return name, why
+
+        name, why = _interface_from_powershell_net_ip_configuration()
+        tried.append("ps-ipcfg:%s" % why)
+        if name:
+            return name, why
+    else:
+        tried.append(
+            "ps-route:skipped (no Get-NetRoute cmdlet; os claims net_tcpip=%s)"
+            % _windows_has_net_tcpip_ps_cmdlets()
+        )
+        tried.append("ps-ipcfg:skipped (same)")
 
-    name, why = _interface_from_powershell_net_ip_configuration()
-    tried.append("ps-ipcfg:%s" % why)
+    name, why = _interface_from_wmi_ip4_route_table()
+    tried.append("ip4route:%s" % why)
     if name:
         return name, why