gowalk-cicd 1.0.83 → 1.0.85

package/README.md

@@ -1052,3 +1052,7 @@ different bytes under the same number. Build numbers come from `/builds`,
 `/preReleaseVersions` **and** `/apps/{id}/buildUploads`, so an unfinished or refused
 reservation is never reused; delete such a reservation only after reading it back.
 All requests and parts still use the Apple proxy.
+
+Flutter SDK setup retries interrupted manifest and archive GETs on the assigned proxy. Archive attempts remain
+bounded, expose only complete bytes to extraction, and never retry authentication or certificate refusals. Cache
+identities remain those of the pinned upstream Flutter action.

package/action/.daemux-version

@@ -1 +1 @@
-1.0.83
+1.0.85

package/android-action/.daemux-version

@@ -1 +1 @@
-1.0.83
+1.0.85

package/android-action/scripts/flutter_manifest.py

@@ -1,10 +1,11 @@
-"""Retry the official Flutter manifest GET without exposing partial JSON or proxy secrets."""
+"""Retry the official Flutter manifest and SDK archive GETs without exposing partial JSON or proxy secrets."""
 from __future__ import annotations
 
 import json
 import os
 from pathlib import Path
 import re
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -16,30 +17,23 @@ RETRY_HTTP = {408, 429, 500, 502, 503, 504}
 
 
 def download(arguments: list[str], directory: Path) -> int:
-    # This is the exact GET made by the pinned upstream setup.sh. Refuse new semantics.
-    if arguments[:-1] != ["--silent", "--connect-timeout", "15", "--retry", "5"]:
-        raise ValueError("flutter_manifest_arguments_unrecognized")
-    url = urlsplit(arguments[-1])
-    if (url.scheme != "https" or not url.hostname or url.username or url.password
-            or url.query or url.fragment or not re.fullmatch(
-                r"/flutter_infra_release/releases/releases_(linux|macos|windows)\.json", url.path)):
-        raise ValueError("flutter_manifest_url_unrecognized")
+    kind = request_kind(arguments)
     if not (os.environ.get("HTTPS_PROXY") or os.environ.get("https_proxy")):
-        raise ValueError("flutter_manifest_proxy_required")
+        raise ValueError("flutter_download_proxy_required")
     child_env = {**os.environ, "NO_PROXY": "", "no_proxy": ""}
-    deadline, code, http, proxy_http = time.monotonic() + 60, 1, 0, 0
+    deadline, code, http, proxy_http = time.monotonic() + (60 if kind == "manifest" else 600), 1, 0, 0
     for attempt in range(1, 5):
         remaining = deadline - time.monotonic()
         if remaining <= 0:
             break
-        destination = directory / f"manifest-{attempt}.json"
+        destination = directory / f"download-{attempt}"
         destination.touch(mode=0o600, exist_ok=False)
         destination.chmod(0o600)
         try:
             result = subprocess.run([
                 "curl", "--disable", "--silent", "--show-error", "--fail", "--retry", "0",
-                "--connect-timeout", "15", "--max-time", str(min(20, remaining)),
-                "--max-filesize", "16777216", "--output", str(destination),
+                "--connect-timeout", "15", "--max-time", str(min(20 if kind == "manifest" else 300, remaining)),
+                "--max-filesize", str(16777216 if kind == "manifest" else 2147483648), "--output", str(destination),
                 "--write-out", "%{http_code} %{http_connect}", arguments[-1],
             ], capture_output=True, timeout=remaining, env=child_env)
             code = result.returncode
@@ -49,20 +43,38 @@ def download(arguments: list[str], directory: Path) -> int:
         except subprocess.TimeoutExpired:
             code, http, proxy_http = 28, 0, 0
         if code == 0 and http == 200:
-            body = destination.read_bytes()
-            json.loads(body)  # A successful transport must deliver complete JSON.
-            sys.stdout.buffer.write(body)
+            if kind == "manifest":
+                json.loads(destination.read_bytes())
+            with destination.open("rb") as source:
+                shutil.copyfileobj(source, sys.stdout.buffer, length=1024 * 1024)
             if attempt > 1:
-                print(f"flutter_manifest_recovered attempts={attempt}", file=sys.stderr)
+                print(f"flutter_{kind}_recovered attempts={attempt}", file=sys.stderr)
             return 0
+        destination.unlink(missing_ok=True)
         if attempt == 4 or proxy_http in {401, 403, 407} or (code not in RETRY_CODES and http not in RETRY_HTTP):
             break
         time.sleep(min(2 ** (attempt - 1), max(0, deadline - time.monotonic())))
-    print(f"flutter_manifest_transport_failed curl_exit={code} http_status={http} "
+    print(f"flutter_{kind}_transport_failed curl_exit={code} http_status={http} "
           f"proxy_status={proxy_http} attempts={attempt}", file=sys.stderr)
     return code or 1
 
 
+def request_kind(arguments):
+    if not arguments:
+        raise ValueError("flutter_download_arguments_missing")
+    url = urlsplit(arguments[-1])
+    if (url.scheme != "https" or not url.hostname or url.username or url.password
+            or url.query or url.fragment or ".." in url.path):
+        raise ValueError("flutter_download_url_unrecognized")
+    if arguments[:-1] == ["--silent", "--connect-timeout", "15", "--retry", "5"] and re.fullmatch(
+            r"/flutter_infra_release/releases/releases_(linux|macos|windows)\.json", url.path):
+        return "manifest"
+    if arguments[:-1] == ["--connect-timeout", "15", "--retry", "5"] and re.fullmatch(
+            r"/flutter_infra_release/releases/[A-Za-z0-9_./+-]+\.(tar\.xz|tar\.gz|zip)", url.path):
+        return "archive"
+    raise ValueError("flutter_download_arguments_unrecognized")
+
+
 def main() -> int:
     try:
         with tempfile.TemporaryDirectory(prefix="flutter-manifest-", dir=os.environ["RUNNER_TEMP"]) as scratch:

package/android-action/scripts/flutter_manifest_env.sh

@@ -1,7 +1,8 @@
 # Loaded only by the two pinned Flutter setup invocations, never the whole job.
 curl() {
   case "${!#}" in
-    */flutter_infra_release/releases/releases_*.json)
+    */flutter_infra_release/releases/releases_*.json|*/flutter_infra_release/releases/*.tar.xz|\
+    */flutter_infra_release/releases/*.tar.gz|*/flutter_infra_release/releases/*.zip)
       python3 "${GOWALK_FLUTTER_MANIFEST_HELPER:?}" "$@"
       ;;
     *) command curl "$@" ;;

package/android-action/scripts/flutter_manifest_fixture.py

@@ -57,15 +57,16 @@ class Proxy(socketserver.StreamRequestHandler):
                         pass
                     self.server.requests.append(request[1].decode())
                     status = b"401 Unauthorized" if mode == "origin_auth" else b"200 OK"
-                    body = MANIFEST[:31] if mode == "partial" else MANIFEST
+                    complete = self.server.body
+                    body = complete[:31] if mode == "partial" else complete
                     stream.sendall(b"HTTP/1.1 " + status + b"\r\nContent-Length: "
-                                   + str(len(MANIFEST)).encode() + b"\r\nConnection: close\r\n\r\n" + body)
+                                   + str(len(complete)).encode() + b"\r\nConnection: close\r\n\r\n" + body)
         except (OSError, ssl.SSLError):
             pass  # An untrusted fixture certificate must be rejected by the real client.
 
 
 @contextmanager
-def tls_proxy(root: Path, modes: list[str]):
+def tls_proxy(root: Path, modes: list[str], body: bytes = MANIFEST):
     cert, key = root / "cert.pem", root / "key.pem"
     command = ["openssl", "req", "-x509", "-newkey", "rsa:2048", "-nodes", "-days", "1",
                "-keyout", str(key), "-out", str(cert), "-subj", "/CN=" + HOST,
@@ -75,7 +76,7 @@ def tls_proxy(root: Path, modes: list[str]):
     context.load_cert_chain(cert, key)
     server = socketserver.ThreadingTCPServer(("127.0.0.1", 0), Proxy)
     server.daemon_threads = True
-    server.context, server.modes = context, list(modes)
+    server.context, server.modes, server.body = context, list(modes), body
     server.connects, server.requests, server.lock = 0, [], threading.Lock()
     thread = threading.Thread(target=server.serve_forever, daemon=True)
     thread.start()

package/android-action/scripts/jvm_proxy_relay.py

@@ -39,11 +39,14 @@ class Relay:
             self.ready.set()
             if self.server:
                 self.server.close()
-                self.loop.run_until_complete(self.server.wait_closed())
+            # Python 3.12+ waits for active clients in Server.wait_closed().
+            # Their handlers own the connections, so cancel and drain them first.
             tasks = asyncio.all_tasks(self.loop)
             for task in tasks:
                 task.cancel()
             self.loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
+            if self.server:
+                self.loop.run_until_complete(self.server.wait_closed())
             self.loop.close()
 
     async def _upstream(self, request: bytes):

package/android-action/scripts/test_flutter_archive.py

@@ -0,0 +1,64 @@
+"""Real proxy/TLS transfers discard interrupted SDK bytes and preserve terminal refusals."""
+import os
+from pathlib import Path
+import subprocess
+import tempfile
+import unittest
+
+from flutter_manifest_fixture import HOST, tls_proxy
+
+ROOT = Path(__file__).parent
+ARCHIVE = bytes(range(256)) * 512
+
+
+class ArchiveRecoveryTests(unittest.TestCase):
+    def invoke(self, root, server, cert, hooked=True, trusted=True):
+        proxy = f"http://fixture-user:fixture-secret@127.0.0.1:{server.server_address[1]}"
+        env = {**os.environ, "HOME": str(root), "RUNNER_TEMP": str(root),
+               "HTTPS_PROXY": proxy, "https_proxy": proxy, "NO_PROXY": "", "no_proxy": ""}
+        for key in ("BASH_ENV", "CURL_CA_BUNDLE", "SSL_CERT_FILE", "SSL_CERT_DIR"):
+            env.pop(key, None)
+        if trusted:
+            env["CURL_CA_BUNDLE"] = str(cert)
+        if hooked:
+            env.update(BASH_ENV=str(ROOT / "flutter_manifest_env.sh"), NO_PROXY="*", no_proxy="*",
+                       GOWALK_FLUTTER_MANIFEST_HELPER=str(ROOT / "flutter_manifest.py"))
+            (root / ".curlrc").write_text('noproxy = "*"\ninsecure\n')
+        url = f"https://{HOST}/flutter_infra_release/releases/stable/linux/flutter_linux_3.44.0-stable.tar.xz"
+        result = subprocess.run(["bash", "-c", 'curl --connect-timeout 15 --retry 5 "$1"', "bash", url],
+                                env=env, capture_output=True, timeout=20)
+        self.assertNotIn(b"fixture-secret", result.stdout + result.stderr)
+        self.assertFalse(list(root.glob("flutter-manifest-*")))
+        return result
+
+    def test_original_partial_exit18_recovers_to_only_the_complete_archive(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            with tls_proxy(root, ["partial"], ARCHIVE) as (server, cert):
+                original = self.invoke(root, server, cert, hooked=False)
+                self.assertEqual(original.returncode, 18)
+            with tls_proxy(root, ["partial", "ok"], ARCHIVE) as (server, cert):
+                result = self.invoke(root, server, cert)
+                self.assertEqual((result.returncode, result.stdout), (0, ARCHIVE))
+                self.assertEqual(server.connects, 2)
+                self.assertIn(b"flutter_archive_recovered attempts=2", result.stderr)
+
+    def test_archive_transport_never_retries_auth_or_untrusted_certificate(self):
+        for mode, trusted in [("proxy_auth", True), ("origin_auth", True), ("ok", False)]:
+            with self.subTest(mode=mode), tempfile.TemporaryDirectory() as directory:
+                root = Path(directory)
+                with tls_proxy(root, [mode], ARCHIVE) as (server, cert):
+                    result = self.invoke(root, server, cert, trusted=trusted)
+                    self.assertNotEqual(result.returncode, 0)
+                    self.assertEqual((result.stdout, server.connects), (b"", 1))
+
+    def test_exhausted_archive_retry_never_emits_partial_bytes(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            with tls_proxy(root, ["partial"] * 4, ARCHIVE) as (server, cert):
+                result = self.invoke(root, server, cert)
+                self.assertEqual((result.returncode, result.stdout, server.connects), (18, b"", 4))
+
+
+if __name__ == "__main__":
+    unittest.main()

package/android-action/scripts/test_jvm_proxy_cleanup.py

@@ -0,0 +1,44 @@
+"""Open client sockets must not keep the command's owned relay alive on Python 3.12+."""
+import asyncio
+import socket
+import unittest
+
+import jvm_proxy_relay as relay
+from test_jvm_proxy_relay import upstream
+
+
+async def accepted():
+    while not any(task.get_coro().__name__ == "_handle" for task in asyncio.all_tasks()):
+        await asyncio.sleep(0.001)
+
+
+class RelayCleanupTests(unittest.TestCase):
+    def test_shutdown_cancels_open_clients_before_waiting_for_server_connections(self):
+        with upstream() as (proxy, _seen):
+            for connected in (False, True):
+                with self.subTest(established_tunnel=connected):
+                    owned = relay.Relay(proxy)
+                    owned.thread.start()
+                    self.assertTrue(owned.ready.wait(5))
+                    client = socket.create_connection(("127.0.0.1", owned.port), timeout=5)
+                    try:
+                        if connected:
+                            client.sendall(b"CONNECT unresolvable.invalid:443 HTTP/1.1\r\nHost: ignored\r\n\r\n")
+                            self.assertIn(b"200", client.recv(4096))
+                        else:
+                            # Synchronize on acceptance while deliberately leaving the request unfinished.
+                            asyncio.run_coroutine_threadsafe(accepted(), owned.loop).result(timeout=5)
+                        owned.loop.call_soon_threadsafe(owned.loop.stop)
+                        owned.thread.join(timeout=2)
+                        self.assertFalse(owned.thread.is_alive(), "relay cleanup waits on a client it must close")
+                        self.assertTrue(owned.loop.is_closed())
+                        self.assertEqual(client.recv(4096), b"")
+                        with self.assertRaises(OSError):
+                            socket.create_connection(("127.0.0.1", owned.port), timeout=0.2)
+                    finally:
+                        client.close()
+                        owned.thread.join(timeout=5)
+
+
+if __name__ == "__main__":
+    unittest.main()

package/backend-action/.daemux-version

@@ -1 +1 @@
-1.0.83
+1.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gowalk-cicd",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "Zero-config GitHub Actions delivery for iOS TestFlight and Android Google Play.",
   "type": "module",
   "bin": {