Python
fix(codex-auth): let the sign-in callback bind somewhere a container can reach
Darryl Pentze71b84b5c863
diff --git a/coworker/providers/codex_auth.py b/coworker/providers/codex_auth.pyindex 681a6d9f..c2906396 100644--- a/coworker/providers/codex_auth.py+++ b/coworker/providers/codex_auth.py@@ -27,6 +27,7 @@ import base64import hashlibimport jsonimport logging+import osimport secrets as pysecretsimport timeimport uuid@@ -42,6 +43,13 @@ TOKEN_URL = AUTH_ISSUER + "/oauth/token"CLIENT_ID = "app_EMoamEEZ73f0CkXaXp7hrann"CALLBACK_PORT = 1455CALLBACK_PATH = "/auth/callback"+# Where the callback server listens. Loopback is right for a desktop install — the+# browser completing the flow is on the same machine. It is wrong for a server one:+# a container publishes a port to its external interface, and a listener bound to+# the container's own loopback never sees that traffic, so the redirect lands on a+# closed port and the sign-in can never finish. Overridable for exactly that case;+# the redirect below is unaffected, since it describes where the BROWSER goes.+CALLBACK_HOST_ENV = "COWORKER_OAUTH_CALLBACK_HOST"# Registered redirect for CLIENT_ID, verbatim — host and port are not ours to choose.REDIRECT_URI = f"http://localhost:{CALLBACK_PORT}{CALLBACK_PATH}"SCOPE = "openid profile email offline_access"@@ -65,6 +73,15 @@ PLAN_LIMIT_ERROR = ("5 hours) is used up. Wait for it to reset, upgrade the plan, or switch to an ""API-key provider.")+def callback_host() -> str:+ """Bind address for the loopback callback server (see CALLBACK_HOST_ENV).++ Read per flow, not at import, so a deployment can set it without re-importing —+ and so tests can exercise both without module surgery.+ """+ return os.environ.get(CALLBACK_HOST_ENV) or "127.0.0.1"++PORT_BUSY_ERROR = (f"Port {CALLBACK_PORT} is already in use — the OpenAI Codex CLI is the usual ""holder. Quit it and start the sign-in again."@@ -361,7 +378,7 @@ async def _start_callback_server(passtry:- server = await asyncio.start_server(handle, "127.0.0.1", CALLBACK_PORT)+ server = await asyncio.start_server(handle, callback_host(), CALLBACK_PORT)except OSError as exc:raise CodexAuthError(PORT_BUSY_ERROR) from excreturn server, futurediff --git a/tests/test_codex_provider.py b/tests/test_codex_provider.pyindex 3c0e0e3f..71b0e0f9 100644--- a/tests/test_codex_provider.py+++ b/tests/test_codex_provider.py@@ -120,6 +120,59 @@ async def _hit_callback(query: str) -> str:return data.decode()+def test_callback_host_defaults_to_loopback(monkeypatch):+ monkeypatch.delenv(codex_auth.CALLBACK_HOST_ENV, raising=False)+ assert codex_auth.callback_host() == "127.0.0.1"+ # Empty is not a bind address — a blank env var must not become "listen+ # everywhere", which is the one mistake here that widens exposure silently.+ monkeypatch.setenv(codex_auth.CALLBACK_HOST_ENV, "")+ assert codex_auth.callback_host() == "127.0.0.1"+++class _FakeServer:+ sockets: tuple = ()++ def close(self):+ pass++ async def wait_closed(self):+ pass+++async def _bind_host_used(monkeypatch) -> str:+ """The address `_start_callback_server` actually asks asyncio to listen on.++ Asserted through the call rather than by binding for real: the port is fixed at+ 1455, so a machine running the Codex CLI (its usual holder) or a container+ publishing that port would otherwise fail this test for unrelated reasons.+ """+ seen: dict = {}++ async def fake_start_server(handler, host, port):+ seen.update(host=host, port=port)+ return _FakeServer()++ monkeypatch.setattr(codex_auth.asyncio, "start_server", fake_start_server)+ server, future = await codex_auth._start_callback_server("state-1")+ future.cancel()+ assert seen["port"] == codex_auth.CALLBACK_PORT+ return seen["host"]+++async def test_callback_server_binds_loopback_by_default(monkeypatch):+ monkeypatch.delenv(codex_auth.CALLBACK_HOST_ENV, raising=False)+ assert await _bind_host_used(monkeypatch) == "127.0.0.1"+++async def test_callback_server_honours_the_bind_override(monkeypatch):+ """A container publishes a port to its external interface; a server bound to the+ container's own loopback never sees that traffic, so the redirect lands on a closed+ port. The registered redirect URI is unaffected — it says where the BROWSER goes."""+ monkeypatch.setenv(codex_auth.CALLBACK_HOST_ENV, "0.0.0.0")+ assert await _bind_host_used(monkeypatch) == "0.0.0.0"+ assert codex_auth.REDIRECT_URI == "http://localhost:1455/auth/callback"++async def test_sign_in_full_flow(tmp_path, monkeypatch):secrets = SecretStore(tmp_path / "s.json")opened: dict = {}