修复：审计未保持 WebSocket 的 101 升级

Author: 1625567290

packages/eval/harbor/egress_filter.py

@@ -154,14 +154,11 @@ def response(flow: object) -> None:
     response = getattr(flow, "response", None)
     if getattr(response, "status_code", None) != 101:
         return
-    headers = getattr(response, "headers", None)
-    upgrade = ""
-    if headers is not None:
-        try:
-            upgrade = str(headers.get("upgrade", "") or "")
-        except Exception:
-            upgrade = ""
-    if upgrade.lower() == "websocket":
+    # mitmproxy 12.2.3 sets flow.websocket before HttpResponseHook only when
+    # the 101 is a real WebSocket upgrade (Upgrade + version 13 + option on).
+    # A websocket Upgrade header alone still falls through to CloseConnection
+    # under rawtcp=false and must be audited.
+    if getattr(flow, "websocket", None) is not None:
         return
     record_raw_tunnel(flow)
 

packages/eval/harbor/test_egress_filter.py

@@ -308,12 +308,30 @@ def test_response_audits_a_non_websocket_101_upgrade(self) -> None:
                     "response": SimpleNamespace(
                         status_code=101, headers={"upgrade": "websocket"}
                     ),
+                    "websocket": object(),
                     "server_conn": SimpleNamespace(address=("origin", 19082)),
                 },
             )()
             MODULE.response(websocket)
             self.assertEqual(len(MODULE.AUDIT_PATH.read_text().splitlines()), 1)
 
+            invalid = type(
+                "Flow",
+                (),
+                {
+                    "response": SimpleNamespace(
+                        status_code=101, headers={"upgrade": "websocket"}
+                    ),
+                    "server_conn": SimpleNamespace(address=("origin", 19082)),
+                },
+            )()
+            MODULE.response(invalid)
+            self.assertEqual(len(MODULE.AUDIT_PATH.read_text().splitlines()), 2)
+            self.assertEqual(
+                json.loads(MODULE.AUDIT_PATH.read_text().splitlines()[1])["ruleId"],
+                "raw_tunnel",
+            )
+
     def test_next_layer_replaces_raw_tcp_with_a_closer(self) -> None:
         class FakeTCPLayer:
             def __init__(self, context: object) -> None:

packages/eval/harbor/test_egress_filter_live.py

@@ -323,7 +323,14 @@ def connect_via_proxy(cls, host: str, port: int, payload: bytes = b"CLIENT\n") -
     @classmethod
     def audit_records(cls) -> list[dict[str, object]]:
         listed = subprocess.run(
-            ["docker", "exec", cls.proxy, "cat", "/opt/maka-egress-state/hits.jsonl"],
+            [
+                "docker",
+                "exec",
+                cls.proxy,
+                "sh",
+                "-c",
+                "if [ -f /opt/maka-egress-state/hits.jsonl ]; then cat /opt/maka-egress-state/hits.jsonl; fi",
+            ],
             capture_output=True,
             text=True,
             timeout=COMMAND_TIMEOUT_S,