diff --git a/src/agent_env/agents/agents/gemini/Dockerfile b/src/agent_env/agents/agents/gemini/Dockerfile index c2f7159ef..4a6e9fb4c 100644 --- a/src/agent_env/agents/agents/gemini/Dockerfile +++ b/src/agent_env/agents/agents/gemini/Dockerfile @@ -1,3 +1,17 @@ +# The env's clock: the egress proxy, one static Go binary, and agent-env's libfaketime and its TLS shim, taken from +# agent-env's sources as clock/ and egress/ (shared_sources.toml) and built for this image's libc (Debian bookworm) in +# stages of their own, so no toolchain is left in the image. +FROM public.ecr.aws/docker/library/golang:1.26.11-bookworm@sha256:dc40a13b61304647ed7e5d581d246b86413dfc29d63c6d018310feb93cd98fc0 AS egress +COPY egress/ /egress/ +RUN cd /egress && go vet ./... && go test -count=1 ./... \ + && CGO_ENABLED=0 GOFLAGS=-mod=readonly go build -trimpath -ldflags=-s -o /out/egress . + +FROM public.ecr.aws/docker/library/python:3.11-slim@sha256:c20888b6acdd1e63e1c433a185bf3ad162c0288fe484616ce062e0d28add2900 AS clock +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + build-essential patch curl ca-certificates +COPY clock/ /clock/ +RUN sh /clock/build.sh /out + FROM public.ecr.aws/docker/library/python:3.11-slim@sha256:c20888b6acdd1e63e1c433a185bf3ad162c0288fe484616ce062e0d28add2900 # Node for the Gemini CLI, checked against its published checksum; install.sh brings the same. ARG NODE_VERSION=22.23.3 @@ -21,13 +35,37 @@ COPY requirements.txt model-requirements.txt ./ RUN pip install --no-cache-dir -r requirements.txt -r model-requirements.txt # install.sh and run.sh are install/v1's: in the image, so they stay in its build context. COPY a2a_server.py gemini_bridge.py gemini_changelog.py gemini_config.py gemini_kit.py entrypoint.sh install.sh run.sh ./ -# The CLI's cwd and file-tool boundary, /workspace, and its state, fixed so neither follows the uid: Modal runs the -# image as root. /app is kept, empty and writable, for tasks that name it. +# Every clocked agent's egress rule, which the bridge imports, and the clock page's format it reads (shared_sources.toml). +COPY agent_clock/agent_egress.py clock/clockpage.py ./ +# The CLI's cwd and file-tool boundary, /workspace, and its state, fixed so neither follows the uid. /app is kept, +# empty and writable, for tasks that name it. RUN useradd --create-home --uid 10001 agent && mkdir -p /workspace/inputs /app /home/agent/.gemini \ && chown agent:agent /workspace /workspace/inputs /app /home/agent/.gemini && chmod 0755 entrypoint.sh +# The env's clock: the follower and the egress proxy, each as its own user, under root's supervisord (root.conf), and +# agent-env's libfaketime and its TLS shim preloaded into every process, faking only the agent's (clock.conf). The +# follower's config is the agent's user's to write (agentenv_protocol.a2a_agent.clock) and the follower's to read. +RUN pip install --no-cache-dir supervisor==4.2.5 \ + && useradd --system --no-create-home --home-dir /nonexistent --shell /usr/sbin/nologin agentenv-clock \ + && useradd --system --no-create-home --home-dir /nonexistent --shell /usr/sbin/nologin agentenv-egress \ + && mkdir -p /usr/local/lib/agentenv-clock /usr/local/lib/agentenv-egress /etc/agentenv \ + && install -d -o agent -g agentenv-clock -m 2750 /etc/agentenv/clock \ + && touch /etc/agentenv/ca.pem \ + && cp /etc/ssl/certs/ca-certificates.crt /etc/agentenv/ca-bundle.pem \ + && cp /etc/ssl/certs/ca-certificates.crt /usr/local/lib/agentenv-egress/roots.pem +COPY --from=clock /out/libfaketimeMT.so.1 /out/libtls_realtime.so /usr/local/lib/agentenv-clock/ +COPY --from=egress /out/egress /usr/local/lib/agentenv-egress/egress +COPY clock/clockpage.py clock/clock-follower /usr/local/lib/agentenv-clock/ +COPY clock/clock.conf /etc/agentenv/clock.conf +COPY root.conf /etc/agentenv/root.conf +COPY start-agent /usr/local/bin/start-agent +RUN sed -i -e "s/^AGENTENV_SESSION_UID=.*/AGENTENV_SESSION_UID=$(id -u agent)/" \ + -e "s/^AGENTENV_CLOCK_PAGE_UID=.*/AGENTENV_CLOCK_PAGE_UID=$(id -u agentenv-clock)/" /etc/agentenv/clock.conf \ + && chmod 0755 /usr/local/lib/agentenv-clock/clock-follower /usr/local/bin/start-agent \ + && printf '%s\n' /usr/local/lib/agentenv-clock/libfaketimeMT.so.1 /usr/local/lib/agentenv-clock/libtls_realtime.so \ + > /etc/ld.so.preload ENV A2A_PORT=8000 PYTHONPATH=/opt/agent GEMINI_CLI_HOME=/home/agent GEMINI_CWD=/workspace -USER agent WORKDIR /workspace EXPOSE 8000 -# CMD rather than ENTRYPOINT: Modal passes a sandbox's env to the image's CMD only. -CMD ["/opt/agent/entrypoint.sh"] +# Starts as root, which start-agent needs for the clock; the A2A server and the CLI run as the agent's user. CMD rather +# than ENTRYPOINT: Modal passes a sandbox's env to the image's CMD only. +CMD ["/usr/local/bin/start-agent"] diff --git a/src/agent_env/agents/agents/gemini/a2a_server.py b/src/agent_env/agents/agents/gemini/a2a_server.py index 1021a70c9..8c243e187 100644 --- a/src/agent_env/agents/agents/gemini/a2a_server.py +++ b/src/agent_env/agents/agents/gemini/a2a_server.py @@ -67,6 +67,7 @@ chats_dir_for_cwd, cli_env, cli_model, + clock_armed, detect_format, find_session_file, gemini_request_to_openai, @@ -566,7 +567,9 @@ async def run(self, request: TaskRequest[GeminiConfig]) -> TaskResult: attachment_paths=attachment_paths or None, timeout_s=cfg.timeout_seconds, event_callback=lambda event: self._on_event(event, request), - env=cli_env(os.environ, system_settings=settings, base_url=base_url), + env=cli_env(os.environ, system_settings=settings, base_url=base_url, + clock_armed=clock_armed(), + mcp_urls=[str(info.get("url") or "") for info in (request.mcp_servers or {}).values()]), cwd=GEMINI_CWD, other_sessions=lambda: {*self.bound_session_refs(), *self._claimed_sessions} - {own}, ) diff --git a/src/agent_env/agents/agents/gemini/gemini_bridge.py b/src/agent_env/agents/agents/gemini/gemini_bridge.py index b98ff2059..79e2a29eb 100644 --- a/src/agent_env/agents/agents/gemini/gemini_bridge.py +++ b/src/agent_env/agents/agents/gemini/gemini_bridge.py @@ -17,11 +17,13 @@ import signal import threading import time -from collections.abc import Callable, Collection, Mapping +from collections.abc import Callable, Collection, Iterable, Mapping from dataclasses import dataclass, field from datetime import datetime, timezone from pathlib import Path +# clock_armed is re-exported: a2a_server reads the clock page through this module. +from agent_egress import clock_armed as clock_armed, egress_env from gemini_config import SYSTEM_SETTINGS_ENV, gemini_home logger = logging.getLogger(__name__) @@ -274,16 +276,29 @@ def model_headers(raw: str | None) -> dict[str, str]: return {str(name): str(value) for name, value in headers.items()} -def cli_env(environ: Mapping[str, str], *, system_settings: Path, base_url: str | None) -> dict[str, str]: +#: The proxy variables the CLI itself reads (its config's proxy): it routes every request it makes through that proxy, +#: NO_PROXY or not, so its model calls to the attribution proxy on 127.0.0.1 and its MCP servers would meet a proxy +#: that refuses them. +_CLI_PROXY_VARS = ("HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy") + + +def cli_env(environ: Mapping[str, str], *, system_settings: Path, base_url: str | None, + mcp_urls: Iterable[str] = (), clock_armed: bool = False) -> dict[str, str]: """The CLI's environment for one run: this process's, with the endpoint's key under the name the CLI reads, its model calls sent to ``base_url`` (the attribution proxy, for this run) unless the environment names its own - endpoint, and the run's own system settings.""" + endpoint, and the run's own system settings. On an armed clock (``clock_armed``) the commands the model runs go + out through the egress proxy (``egress_env``, given the model endpoint's URL and the env's MCP servers', ``mcp_urls``), + by ALL_PROXY alone; the CLI itself, which would send everything through a proxy it's handed, NO_PROXY or not, goes + out directly.""" env = dict(environ) if env.get("LITELLM_API_KEY") and not env.get("GEMINI_API_KEY"): env["GEMINI_API_KEY"] = env["LITELLM_API_KEY"] if base_url and not environ.get("GOOGLE_GEMINI_BASE_URL"): env["GOOGLE_GEMINI_BASE_URL"] = base_url env[SYSTEM_SETTINGS_ENV] = str(system_settings) + urls = [env.get("GOOGLE_GEMINI_BASE_URL", ""), env.get("LITELLM_BASE_URL", ""), *mcp_urls] + egress = egress_env(environ, urls, armed=clock_armed) + env.update({name: value for name, value in egress.items() if name not in _CLI_PROXY_VARS}) return env diff --git a/src/agent_env/agents/agents/gemini/install.sh b/src/agent_env/agents/agents/gemini/install.sh index 954472462..9985e557d 100755 --- a/src/agent_env/agents/agents/gemini/install.sh +++ b/src/agent_env/agents/agents/gemini/install.sh @@ -24,7 +24,7 @@ START_TIMEOUT_S=120 STOP_TIMEOUT_S=10 dockerfile_arg() { sed -n "s/^ARG $1=//p" "$here/Dockerfile"; } NODE_VERSION=$(dockerfile_arg NODE_VERSION) -AGENT_FILES="a2a_server.py gemini_bridge.py gemini_changelog.py gemini_config.py gemini_kit.py requirements.txt run.sh" +AGENT_FILES="a2a_server.py gemini_bridge.py gemini_changelog.py gemini_config.py gemini_kit.py requirements.txt run.sh agent_clock/agent_egress.py clock/clockpage.py" # put SRC DEST replaces DEST by a rename, so a binary an earlier install's agent still runs can be replaced; put_dir SRC # DEST copies a folder to DEST, which isn't there. @@ -132,7 +132,7 @@ put "$stage/agent.env" "$root/agent.env" put "$here/package.json" "$root/npm/package.json" put "$here/package-lock.json" "$root/npm/package-lock.json" for file in $AGENT_FILES; do - put "$here/$file" "$root/app/$file" + put "$here/$file" "$root/app/${file##*/}" done on "chmod 0600 $r/agent.env && chmod 0755 $r/bin/uv $r/bin/gemini $r/app/run.sh" diff --git a/src/agent_env/agents/agents/gemini/root.conf b/src/agent_env/agents/agents/gemini/root.conf new file mode 100644 index 000000000..b7dadf787 --- /dev/null +++ b/src/agent_env/agents/agents/gemini/root.conf @@ -0,0 +1,62 @@ +; Root's supervisord (start-agent, FD-5916): the clock follower and the egress proxy, each as its own user, on real +; time, and the A2A server as the agent's user. The server starts with the real-time marker, which agent-env's +; libfaketime takes out of its environment, so the server's own records keep real timestamps and everything it starts, +; the CLI and the model's commands, reads the env's time. Its socket and logs are root's alone, so the agent's user can +; neither stop nor restart any of them. The follower follows nothing until the server writes its config, which +; sync_env_clock has it do, then picks it up within a quarter second. +[supervisord] +nodaemon=true +user=root +logfile=/var/log/agentenv-root/supervisord.log +pidfile=/run/agentenv-root/supervisord.pid +childlogdir=/var/log/agentenv-root + +[unix_http_server] +file=/run/agentenv-root/supervisor.sock +chmod=0700 + +[rpcinterface:supervisor] +supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface + +[supervisorctl] +serverurl=unix:///run/agentenv-root/supervisor.sock + +[program:clock] +command=/usr/local/bin/python3 -I /usr/local/lib/agentenv-clock/clock-follower +user=agentenv-clock +directory=/ +priority=3 +autorestart=true +startsecs=1 +startretries=1000 +redirect_stderr=true +stdout_logfile=/var/log/agentenv-root/clock.log +environment=HOME="/nonexistent",USER="agentenv-clock",LOGNAME="agentenv-clock" + +[program:egress] +command=/usr/local/lib/agentenv-egress/egress serve +user=agentenv-egress +directory=/ +priority=3 +autorestart=true +startsecs=1 +startretries=1000 +redirect_stderr=true +stdout_logfile=/var/log/agentenv-root/egress.log +environment=HOME="/nonexistent",USER="agentenv-egress",LOGNAME="agentenv-egress",AGENTENV_EGRESS_PRIVATE="allow" + +; uvicorn itself, not entrypoint.sh: the marker holds for the process it's given to alone, and a shell that execs +; uvicorn would hand uvicorn an environment without it. +[program:agent] +command=/usr/local/bin/python3 -m uvicorn a2a_server:app --host 0.0.0.0 --port %(ENV_A2A_PORT)s --timeout-graceful-shutdown 5 +user=agent +directory=/workspace +priority=10 +autorestart=true +stopasgroup=true +killasgroup=true +stopwaitsecs=30 +redirect_stderr=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +environment=HOME="/home/agent",USER="agent",LOGNAME="agent",AGENTENV_REAL_TIME="1",AGENTENV_EGRESS_PROXY="http://127.0.0.1:3128",NODE_EXTRA_CA_CERTS="/etc/agentenv/ca.pem",SSL_CERT_FILE="/etc/agentenv/ca-bundle.pem",REQUESTS_CA_BUNDLE="/etc/agentenv/ca-bundle.pem" diff --git a/src/agent_env/agents/agents/gemini/shared_sources.toml b/src/agent_env/agents/agents/gemini/shared_sources.toml new file mode 100644 index 000000000..6076f3540 --- /dev/null +++ b/src/agent_env/agents/agents/gemini/shared_sources.toml @@ -0,0 +1,5 @@ +# What this image's build context takes from agent-env's own sources, at the name its Dockerfile copies it from: one +# copy of each, shared with the other images that take it (utils/docker/context.py). Paths are under src/agent_env. +clock = "utils/faketime_clock" +egress = "utils/egress_proxy" +agent_clock = "utils/agent_clock" diff --git a/src/agent_env/agents/agents/gemini/start-agent b/src/agent_env/agents/agents/gemini/start-agent new file mode 100755 index 000000000..b813e50d9 --- /dev/null +++ b/src/agent_env/agents/agents/gemini/start-agent @@ -0,0 +1,30 @@ +#!/bin/sh +# The image's start (FD-5916). As root, it makes what the agent's user must not touch, the clock page and file (the +# clock user's from their first byte) and the egress proxy's CA (its key the egress user's alone, trusted in the +# system store, agent-env's trust files and every certifi bundle), then starts root's supervisord (root.conf), which +# runs the clock follower and the egress proxy, each as its own user on real time, and the A2A server as the agent's +# user on real time, everything it starts reading the env's time from the page. Until sync_env_clock has the agent +# follow a clock, the page holds real time and the proxy relays TLS untouched. Started as another user, the image runs +# the A2A server alone, as before, on real time. +set -eu +if [ "$(id -u)" != 0 ]; then + exec /opt/agent/entrypoint.sh +fi +install -d -o root -g root -m 0700 /var/log/agentenv-root /run/agentenv-root +install -d -o agentenv-clock -g agentenv-clock -m 0755 /run/agentenv-clock +python3 -I /usr/local/lib/agentenv-clock/clockpage.py create agentenv-clock +AGENTENV_SESSION_USER=agent AGENTENV_EGRESS_NSS=off \ + /usr/local/lib/agentenv-egress/egress boot > /var/log/agentenv-root/egress-boot.log 2>&1 \ + || { cat /var/log/agentenv-root/egress-boot.log >&2; echo "the egress proxy's boot failed" >&2; exit 2; } +# A provider's own CA bundle stays trusted: Sail, for one, points SSL_CERT_FILE and the like at the bundle it signs +# model requests under, and root.conf points the server's trust at agent-env's bundles instead, so the provider's goes +# into them, and into the egress proxy's roots, which carry those requests once the clock is armed. +for bundle in "${SSL_CERT_FILE:-}" "${REQUESTS_CA_BUNDLE:-}" "${NODE_EXTRA_CA_CERTS:-}" "${CURL_CA_BUNDLE:-}"; do + case "$bundle" in ""|/etc/agentenv/*) continue ;; esac + [ -r "$bundle" ] || continue + for target in /etc/agentenv/ca-bundle.pem /etc/agentenv/ca.pem /usr/local/lib/agentenv-egress/roots.pem; do + grep -qxF "# agentenv: $bundle" "$target" 2>/dev/null && continue + { printf '\n# agentenv: %s\n' "$bundle"; cat "$bundle"; } >> "$target" + done +done +exec supervisord -c /etc/agentenv/root.conf diff --git a/tst/integration/task_step/test_agent_env_clock_local.py b/tst/integration/task_step/test_agent_env_clock_local.py index 87468d613..2d51f9195 100644 --- a/tst/integration/task_step/test_agent_env_clock_local.py +++ b/tst/integration/task_step/test_agent_env_clock_local.py @@ -89,6 +89,7 @@ class Agent: AGENTS = { "claude-code": Agent(bridge="claude_bridge", version=("claude", "--version"), shows="(Claude Code)", turn=_claude_turn), + "gemini": Agent(bridge="gemini_bridge", version=("gemini", "--version"), shows="0.38.2"), "opencode": Agent(bridge="opencode_bridge", version=("opencode", "--version"), shows="1.17.18"), } diff --git a/tst/unit/agents/gemini/agent.py b/tst/unit/agents/gemini/agent.py index 583404a5d..9afcd8b55 100644 --- a/tst/unit/agents/gemini/agent.py +++ b/tst/unit/agents/gemini/agent.py @@ -1,19 +1,25 @@ -"""The Gemini agent's modules, imported from its folder as its image runs them: by their own names, from the folder on -the path.""" +"""The Gemini agent's modules, imported as its image runs them: by their own names, from its folder and from the folders +its build context takes as agent_clock/ and clock/, whose modules the image copies beside the bridge.""" import importlib import importlib.util +import os import sys from pathlib import Path import agent_env +from tst.util.build_context import sent AGENT_DIR = Path(agent_env.__file__).parent / "agents" / "agents" / "gemini" -sys.path.insert(0, str(AGENT_DIR)) +IMPORTED = [str(AGENT_DIR), str(sent(AGENT_DIR, "agent_clock/agent_egress.py").parent), + str(sent(AGENT_DIR, "clock/clockpage.py").parent)] +PYTHONPATH = os.pathsep.join(IMPORTED) +sys.path[:0] = IMPORTED gemini_config = importlib.import_module("gemini_config") gemini_kit = importlib.import_module("gemini_kit") gemini_changelog = importlib.import_module("gemini_changelog") gemini_bridge = importlib.import_module("gemini_bridge") +agent_egress = importlib.import_module("agent_egress") # By its path: another agent's a2a_server, imported by the same name, may be loaded already. _spec = importlib.util.spec_from_file_location("gemini_a2a_server", AGENT_DIR / "a2a_server.py") a2a_server = importlib.util.module_from_spec(_spec) diff --git a/tst/unit/agents/gemini/test_card_contract.py b/tst/unit/agents/gemini/test_card_contract.py index 510fcc4b7..18c0cb09a 100644 --- a/tst/unit/agents/gemini/test_card_contract.py +++ b/tst/unit/agents/gemini/test_card_contract.py @@ -8,7 +8,7 @@ import subprocess import sys -from tst.unit.agents.gemini.agent import AGENT_DIR, a2a_server +from tst.unit.agents.gemini.agent import AGENT_DIR, PYTHONPATH, a2a_server from tst.unit.agents.gemini.support import card _GEMINI_SKILL = { @@ -232,7 +232,7 @@ def test_install_mode_reads_the_card_by_importing_agent_card(): "from a2a_server import AGENT_CARD; " "print(json.dumps(AGENT_CARD.model_dump()))" ) - env = {k: v for k, v in os.environ.items() if not k.startswith("LITELLM_")} + env = {**{k: v for k, v in os.environ.items() if not k.startswith("LITELLM_")}, "PYTHONPATH": PYTHONPATH} out = subprocess.run([sys.executable, "-c", script], cwd=AGENT_DIR, env=env, capture_output=True, text=True, check=True) exported = json.loads(out.stdout) diff --git a/tst/unit/agents/gemini/test_env_clock.py b/tst/unit/agents/gemini/test_env_clock.py new file mode 100644 index 000000000..4235262dd --- /dev/null +++ b/tst/unit/agents/gemini/test_env_clock.py @@ -0,0 +1,76 @@ +"""Gemini on the env's clock: its bridge hands the shared egress rule (tst/unit/agents/test_agent_egress.py) the model +endpoint's URL and every MCP server's, so on an armed clock the commands the model runs go out through the image's +egress proxy, by ALL_PROXY, and to loopback, the hosts NO_PROXY names and plain-HTTP hosts directly; the CLI itself, which sends everything through a proxy its HTTP(S)_PROXY names, NO_PROXY or not, is +handed none, so it reaches the attribution proxy and the MCP servers directly. Unarmed, it all goes out as before. What +every clocked image shares is checked in tst/unit/agents/test_agent_clock_images.py.""" + +from __future__ import annotations + +import subprocess +from pathlib import Path + +import pytest + +from tst.unit.agents.gemini.agent import AGENT_DIR, agent_egress, gemini_bridge + +PROXY = "http://127.0.0.1:3128" + +SETTINGS = Path("/tmp/settings.json") +ATTRIBUTION_PROXY = "http://127.0.0.1:8000/litellm-gemini/token" + + +def _env(environ, **kwargs): + return gemini_bridge.cli_env(environ, system_settings=SETTINGS, base_url=ATTRIBUTION_PROXY, **kwargs) + + +def test_on_an_armed_clock_the_models_commands_go_out_through_the_proxy_and_the_cli_directly(): + env = _env({agent_egress.EGRESS_PROXY_ENV: PROXY, "NO_PROXY": "registry.internal"}, clock_armed=True) + + assert env["ALL_PROXY"] == env["all_proxy"] == PROXY + assert not {"HTTPS_PROXY", "https_proxy", "HTTP_PROXY", "http_proxy"} & set(env) + assert {"localhost", "127.0.0.1", "host.docker.internal", "registry.internal"} <= set(env["NO_PROXY"].split(",")) + assert env["GOOGLE_GEMINI_BASE_URL"] == ATTRIBUTION_PROXY + + +@pytest.mark.parametrize("environ, armed", [({}, True), ({agent_egress.EGRESS_PROXY_ENV: PROXY}, False)]) +def test_without_the_proxy_or_an_armed_clock_the_cli_goes_out_directly_as_before(environ, armed): + assert not {"ALL_PROXY", "HTTPS_PROXY", "NO_PROXY"} & set(_env(environ, clock_armed=armed)) + + +@pytest.mark.parametrize("base_url, direct", [("http://10.0.0.5:4000", True), ("https://litellm.example.com", False)]) +def test_a_model_endpoint_over_plain_http_is_reached_directly_on_an_armed_clock(base_url, direct): + for name in ("LITELLM_BASE_URL", "GOOGLE_GEMINI_BASE_URL"): + env = _env({agent_egress.EGRESS_PROXY_ENV: PROXY, name: base_url}, clock_armed=True) + assert (base_url.split("//")[1].split(":")[0] in env["NO_PROXY"].split(",")) is direct + + +def test_the_envs_plain_http_mcp_servers_are_reached_directly_and_https_ones_through_the_proxy_on_an_armed_clock(): + """The CLI's MCP client checks an HTTPS server's certificate against the env's date, which the proxy, on real time, + doesn't.""" + env = _env({agent_egress.EGRESS_PROXY_ENV: PROXY}, clock_armed=True, + mcp_urls=["http://gateway:8080/mcp", "https://abc-123.w.modal.host/mcp", ""]) + + direct = env["NO_PROXY"].split(",") + assert "gateway" in direct and "abc-123.w.modal.host" not in direct and "" not in direct + assert env["ALL_PROXY"] == PROXY + + +def test_start_agent_keeps_a_providers_ca_bundle_trusted_by_the_server_and_the_proxy(tmp_path): + """Sail points SSL_CERT_FILE and the like at the bundle it signs model requests under; root.conf points the server + at agent-env's bundles, so start-agent adds the provider's to them and to the proxy's roots, once each.""" + start = (AGENT_DIR / "start-agent").read_text() + merge = start[start.index('for bundle in "${SSL_CERT_FILE'):start.index("exec supervisord")] + targets = {"/etc/agentenv/ca-bundle.pem": tmp_path / "ca-bundle.pem", "/etc/agentenv/ca.pem": tmp_path / "ca.pem", + "/usr/local/lib/agentenv-egress/roots.pem": tmp_path / "roots.pem"} + for real, fake in targets.items(): + fake.write_text("SYSTEM ROOTS\n") + merge = merge.replace(real, str(fake)) + sail = tmp_path / "sailbox-ca-bundle.crt" + sail.write_text("-----BEGIN CERTIFICATE-----\nSAIL\n-----END CERTIFICATE-----\n") + + subprocess.run(["sh", "-c", merge], check=True, env={"PATH": "/usr/bin:/bin", "SSL_CERT_FILE": str(sail), + "NODE_EXTRA_CA_CERTS": str(sail), "REQUESTS_CA_BUNDLE": "/etc/agentenv/ca-bundle.pem"}) + + for fake in targets.values(): + text = fake.read_text() + assert text.startswith("SYSTEM ROOTS\n") and text.count("SAIL") == 1, (fake.name, text) diff --git a/tst/unit/agents/gemini/test_image_contract.py b/tst/unit/agents/gemini/test_image_contract.py index 021fab736..50aa6a303 100644 --- a/tst/unit/agents/gemini/test_image_contract.py +++ b/tst/unit/agents/gemini/test_image_contract.py @@ -7,10 +7,13 @@ import ast import json import re +import tomllib from tst.unit.agents.gemini.agent import AGENT_DIR DOCKERFILE = (AGENT_DIR / "Dockerfile").read_text() +SOURCES = AGENT_DIR.parents[2] +SHARED = tomllib.loads((AGENT_DIR / "shared_sources.toml").read_text()) INSTALL_SH = (AGENT_DIR / "install.sh").read_text() @@ -23,10 +26,22 @@ def _copied() -> list[str]: for name in line.split()] +def _source(name: str): + """Where the build context's ``name`` comes from: the folder, or a folder shared_sources.toml takes from agent-env's + own sources at that name.""" + first, _, rest = name.partition("/") + return SOURCES / SHARED[first] / rest if first in SHARED else AGENT_DIR / name + + +def _in_context(name: str) -> bool: + path = _source(name) + return path.is_dir() if name.endswith("/") else path.is_file() + + def test_every_file_the_image_copies_is_in_the_folder(): copied = _copied() - assert copied and all((AGENT_DIR / name).is_file() for name in copied), copied + assert copied and all(_in_context(name) for name in copied), copied # install.sh and run.sh are install/v1's; a build context pruned to what the Dockerfile reads keeps them so. assert {"a2a_server.py", "gemini_bridge.py", "gemini_changelog.py", "gemini_config.py", "gemini_kit.py", "entrypoint.sh", "install.sh", "run.sh", "package.json", "package-lock.json"} <= set(copied) @@ -43,10 +58,19 @@ def _imported(path) -> set[str]: def test_the_image_and_an_install_carry_every_module_the_server_imports(): - modules = {path.stem: path for path in AGENT_DIR.glob("*.py")} - needed = {"a2a_server.py"} | {f"{name}.py" for path in modules.values() for name in _imported(path) & set(modules)} + """The folder's own modules and those the build context takes from agent-env's sources, the egress rule and the + clock page's format among them, each by its name in the context.""" + shared = {path.stem: f"{name}/{path.name}" for name, source in SHARED.items() + for path in (SOURCES / source).glob("*.py")} + modules = {**shared, **{path.stem: path.name for path in AGENT_DIR.glob("*.py")}} + needed, pending = set(), ["a2a_server"] + while pending: + if (name := modules[pending.pop()]) not in needed: + needed.add(name) + pending += _imported(_source(name)) & set(modules) installed = set(re.search(r'^AGENT_FILES="([^"]+)"$', INSTALL_SH, re.MULTILINE).group(1).split()) + assert {"agent_clock/agent_egress.py", "clock/clockpage.py"} <= needed assert needed <= set(_copied()) and needed <= installed, (needed, installed) @@ -99,5 +123,5 @@ def test_tls_checks_stay_on(): def test_the_image_starts_through_cmd_which_modal_passes_its_env_to(): - assert 'CMD ["/opt/agent/entrypoint.sh"]' in DOCKERFILE + assert 'CMD ["/usr/local/bin/start-agent"]' in DOCKERFILE assert not re.search(r"^ENTRYPOINT", DOCKERFILE, re.MULTILINE)