bump to mitmproxy_wireguard v0.1.5 and fix launching wg-test-client

mitmproxy · mhils · Sep 18, 2022 · Sep 4, 2022 · Sep 6, 2022 · Sep 11, 2022
commit a857f1ad3c173ba405a39aeb76522069dec898ce
diff --git a/setup.py b/setup.py
@@ -82,7 +82,7 @@
         "hyperframe>=6.0,<7",
         "kaitaistruct>=0.10,<0.11",
         "ldap3>=2.8,<2.10",
-        "mitmproxy_wireguard>=0.1.2,<0.2",
+        "mitmproxy_wireguard>=0.1.5,<0.2",
         "msgpack>=1.0.0, <1.1.0",
         "passlib>=1.6.5, <1.8",
         "protobuf>=3.14,<5",

diff --git a/test/mitmproxy/proxy/test_mode_servers.py b/test/mitmproxy/proxy/test_mode_servers.py
@@ -115,12 +115,12 @@ async def test_wireguard(monkeypatch):
 
     async def echo_tcp(stream: wg.TcpStream):
         data = await stream.read(1000)
-        stream.write(data)
+        stream.write(data.upper())
         await stream.drain()
         stream.close()
 
     def echo_udp(self: WireGuardServerInstance, data: bytes, src_addr: Address, dst_addr: Address):
-        self._server.send_datagram(data, dst_addr, src_addr)
+        self._server.send_datagram(data.upper(), dst_addr, src_addr)
 
     monkeypatch.setattr(WireGuardServerInstance, "handle_tcp_connection", echo_tcp)
     monkeypatch.setattr(WireGuardServerInstance, "handle_udp_datagram", echo_udp)
@@ -145,12 +145,26 @@ def echo_udp(self: WireGuardServerInstance, data: bytes, src_addr: Address, dst_
         await tctx.master.await_log("WireGuard server listening")
 
         _, port = inst.listen_addrs[0]
-        ret = subprocess.run([test_client_path, str(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        proc = await asyncio.create_subprocess_exec(
+            test_client_path,
+            str(port),
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        stdout, stderr = await proc.communicate()
 
         try:
-            ret.check_returncode()
-        except subprocess.CalledProcessError:
-            raise
+            assert proc.returncode == 0
+        except AssertionError:
+            print(stdout)
+            print(stderr)
+
+            raise subprocess.CalledProcessError(
+                proc.returncode,
+                [test_client_path, str(port)],
+                output=stdout,
+                stderr=stderr,
+            )
         finally:
             await inst.stop()
             assert await tctx.master.await_log("Stopped WireGuard server")

diff --git a/test/wg-test-client/LICENSE b/test/wg-test-client/LICENSE
@@ -43,7 +43,7 @@ cipher v0.4.3: MIT OR Apache-2.0
 cpufeatures v0.2.5: MIT OR Apache-2.0
 crypto-common v0.1.6: MIT OR Apache-2.0
 curve25519-dalek v3.2.0: BSD-3-Clause
-digest v0.10.3: MIT OR Apache-2.0
+digest v0.10.5: MIT OR Apache-2.0
 digest v0.9.0: MIT OR Apache-2.0
 generic-array v0.14.6: MIT
 getrandom v0.1.16: MIT OR Apache-2.0
@@ -65,7 +65,7 @@ parking_lot v0.12.1: MIT OR Apache-2.0
 pin-project-lite v0.2.9: Apache-2.0 OR MIT
 poly1305 v0.8.0: Apache-2.0 OR MIT
 rand_core v0.5.1: MIT OR Apache-2.0
-rand_core v0.6.3: MIT OR Apache-2.0
+rand_core v0.6.4: MIT OR Apache-2.0
 ring v0.16.20:
 scopeguard v1.1.0: MIT/Apache-2.0
 smallvec v1.9.0: MIT OR Apache-2.0
@@ -83,7 +83,7 @@ zeroize v1.5.7: Apache-2.0 OR MIT
 
 --------------------------------------------------------------------------------
 
-This list of third-party crates and their licenses was collected for v0.1.4 of
+This list of third-party crates and their licenses was collected for v0.1.5 of
 the test client by running this command:
 
 $ cargo tree --prefix none --edges no-build,no-dev,no-proc-macro --format "{p}: {l}" --no-dedupe  | sort -u
diff --git a/test/wg-test-client/linux-x86_64 b/test/wg-test-client/linux-x86_64
diff --git a/test/wg-test-client/macos-aarch64 b/test/wg-test-client/macos-aarch64
diff --git a/test/wg-test-client/macos-x86_64 b/test/wg-test-client/macos-x86_64
diff --git a/test/wg-test-client/windows-x86_64.exe b/test/wg-test-client/windows-x86_64.exe