Compress tool outputs, logs, files, and RAG chunks before they reach the LLM. 20% fewer tokens for coding agents, 60-95% fewer tokens for JSON, same answers. Library, proxy, MCP server.
Python agentaianthropicclaude-codecompressioncontext-engineeringcontext-windowcursorfastapilangchainllmmcpopenaiprompt-engineeringproxypythonragtoken-optimizationtokenstypescript
fix(proxy): build SSL contexts for custom CA bundles (#1134)
Mark Phelps561ba17ec2e0
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 5b60e3d97..228e12dcd 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Bug Fixes+* **proxy:** build SSL contexts for custom CA bundles so enterprise/private PKI roots work with Python/OpenSSL strict verification.* **proxy:** route Codex OAuth image generation and edit requests through the ChatGPT Codex image backend, while preserving OpenAI API-key image passthrough ([#1215](https://github.com/chopratejas/headroom/pull/1215)).* **wrap (codex):** keep RTK guidance in the global Codex `AGENTS.md` instead of modifying the shared project `AGENTS.md` ([#1235](https://github.com/chopratejas/headroom/issues/1235)).* **proxy:** enable SSO credential resolution in the native Bedrock route via the `aws-config` `sso` feature flag, making the credential chain match what `docs/bedrock.md` already documented ([#999](https://github.com/chopratejas/headroom/pull/999)).diff --git a/headroom/proxy/ssl_context.py b/headroom/proxy/ssl_context.pyindex 55215932b..551013b05 100644--- a/headroom/proxy/ssl_context.py+++ b/headroom/proxy/ssl_context.py@@ -27,16 +27,47 @@ _REPLACEMENT_CA_VARS = ()-def find_ca_bundle() -> str | ssl.SSLContext | None:+def _relax_x509_strict_for_custom_ca(ctx: ssl.SSLContext, *, path: str) -> ssl.SSLContext:+ """Relax OpenSSL strict-mode checks for an operator-provided CA bundle.++ Python 3.13 / newer OpenSSL can reject some enterprise or private PKI+ roots that platform TLS stacks accept, for example roots without a+ keyUsage extension. Clearing only ``VERIFY_X509_STRICT`` keeps certificate+ verification, hostname verification, expiry checks, and chain validation+ enabled while making custom CA bundles usable in those environments.+ """+ strict_flag = getattr(ssl, "VERIFY_X509_STRICT", 0)+ if strict_flag and ctx.verify_flags & strict_flag:+ ctx.verify_flags &= ~strict_flag+ logger.info("event=ssl_x509_strict_disabled_for_custom_ca path=%s", path)+ return ctx+++def _replacement_ca_context(path: str) -> ssl.SSLContext:+ """Build a replacement trust-store context from a CA bundle path."""+ ctx = ssl.create_default_context(cafile=path)+ ctx.set_alpn_protocols(["h2", "http/1.1"])+ return _relax_x509_strict_for_custom_ca(ctx, path=path)+++def _additive_ca_context(path: str) -> ssl.SSLContext:+ """Build an additive trust-store context from a CA bundle path."""+ ctx = ssl.create_default_context()+ ctx.load_verify_locations(cafile=path)+ ctx.set_alpn_protocols(["h2", "http/1.1"])+ return _relax_x509_strict_for_custom_ca(ctx, path=path)+++def find_ca_bundle() -> ssl.SSLContext | None:"""Return a CA verification target for httpx's ``verify=`` parameter.``SSL_CERT_FILE`` and ``REQUESTS_CA_BUNDLE`` use **replacement**- semantics: the returned path becomes the *only* trust store.+ semantics: the returned context trusts that bundle as its trust store.``NODE_EXTRA_CA_CERTS`` uses **additive** semantics (matching Node.js):- an ``ssl.SSLContext`` is returned that contains the default/system- roots *plus* the extra certificate, so public upstreams stay reachable- when the extra bundle contains only a private/internal root.+ the returned context contains the default/system roots *plus* the extra+ certificate, so public upstreams stay reachable when the extra bundle+ contains only a private/internal root.Returns ``None`` when no env var is set (or all paths are missing),which signals to the caller to use httpx's default TLS verification.@@ -49,7 +80,7 @@ def find_ca_bundle() -> str | ssl.SSLContext | None:var,path,)- return path+ return _replacement_ca_context(path)if path and not os.path.isfile(path):logger.warning("event=ssl_ca_bundle_missing env_var=%s path=%r (skipped)",@@ -59,14 +90,11 @@ def find_ca_bundle() -> str | ssl.SSLContext | None:node_path = os.environ.get("NODE_EXTRA_CA_CERTS")if node_path and os.path.isfile(node_path):- ctx = ssl.create_default_context()- ctx.load_verify_locations(cafile=node_path)- ctx.set_alpn_protocols(["h2", "http/1.1"])logger.info("event=ssl_ca_bundle_loaded env_var=NODE_EXTRA_CA_CERTS path=%s additive=true",node_path,)- return ctx+ return _additive_ca_context(node_path)if node_path and not os.path.isfile(node_path):logger.warning("event=ssl_ca_bundle_missing env_var=NODE_EXTRA_CA_CERTS path=%r (skipped)",diff --git a/tests/test_ssl_context.py b/tests/test_ssl_context.pyindex 619827697..80bed9556 100644--- a/tests/test_ssl_context.py+++ b/tests/test_ssl_context.py@@ -2,21 +2,22 @@Covers:- Returns None when no env var is set-- Returns a path string when SSL_CERT_FILE points to a valid PEM file-- Returns a path string when REQUESTS_CA_BUNDLE points to a valid PEM file+- Returns an ssl.SSLContext when SSL_CERT_FILE points to a valid PEM file+- Returns an ssl.SSLContext when REQUESTS_CA_BUNDLE points to a valid PEM file+- Replacement contexts relax OpenSSL VERIFY_X509_STRICT for custom CA bundles- Returns an ssl.SSLContext when NODE_EXTRA_CA_CERTS points to a valid PEM file-- The SSLContext is additive: default/system roots are preserved (#998)+- The NODE_EXTRA_CA_CERTS SSLContext is additive: default/system roots are preserved (#998)- Priority order: SSL_CERT_FILE beats REQUESTS_CA_BUNDLE beats NODE_EXTRA_CA_CERTS- Nonexistent paths are skipped (returns None if all paths are missing)"""from __future__ import annotations-import osimport sslimport pytest+from headroom.proxy import ssl_contextfrom headroom.proxy.ssl_context import find_ca_bundle# Minimal self-signed CA certificate (PEM) used only to verify that@@ -59,6 +60,19 @@ def _clean_env(monkeypatch):monkeypatch.delenv(var, raising=False)+class FakeSSLContext:+ def __init__(self, verify_flags: int = 0) -> None:+ self.verify_flags = verify_flags+ self.loaded_cafile: str | None = None+ self.alpn_protocols: list[str] | None = None++ def load_verify_locations(self, *, cafile: str) -> None:+ self.loaded_cafile = cafile++ def set_alpn_protocols(self, protocols: list[str]) -> None:+ self.alpn_protocols = protocols++class TestFindCaBundleNoEnvVars:def test_returns_none_when_no_env_var_set(self, monkeypatch):_clean_env(monkeypatch)@@ -66,19 +80,37 @@ class TestFindCaBundleNoEnvVars:class TestFindCaBundleWithValidPem:- def test_ssl_cert_file_returns_path(self, monkeypatch, ca_pem_file):+ def test_ssl_cert_file_returns_ssl_context(self, monkeypatch, ca_pem_file):_clean_env(monkeypatch)monkeypatch.setenv("SSL_CERT_FILE", ca_pem_file)ctx = find_ca_bundle()- assert isinstance(ctx, str)- assert os.path.isfile(ctx)+ assert isinstance(ctx, ssl.SSLContext)- def test_requests_ca_bundle_returns_path(self, monkeypatch, ca_pem_file):+ def test_requests_ca_bundle_returns_ssl_context(self, monkeypatch, ca_pem_file):_clean_env(monkeypatch)monkeypatch.setenv("REQUESTS_CA_BUNDLE", ca_pem_file)ctx = find_ca_bundle()- assert isinstance(ctx, str)- assert os.path.isfile(ctx)+ assert isinstance(ctx, ssl.SSLContext)++ def test_replacement_ca_context_relaxes_x509_strict(self, monkeypatch, ca_pem_file):+ _clean_env(monkeypatch)+ monkeypatch.setenv("SSL_CERT_FILE", ca_pem_file)+ strict_flag = 0x20+ created_context = FakeSSLContext(verify_flags=strict_flag | 0x100)++ def fake_create_default_context(*, cafile: str | None = None):+ assert cafile == ca_pem_file+ return created_context++ monkeypatch.setattr(ssl_context.ssl, "VERIFY_X509_STRICT", strict_flag, raising=False)+ monkeypatch.setattr(ssl_context.ssl, "create_default_context", fake_create_default_context)++ ctx = find_ca_bundle()++ assert ctx is created_context+ assert created_context.verify_flags & strict_flag == 0+ assert created_context.verify_flags & 0x100+ assert created_context.alpn_protocols == ["h2", "http/1.1"]def test_node_extra_ca_certs_returns_ssl_context(self, monkeypatch, ca_pem_file):"""NODE_EXTRA_CA_CERTS returns an SSLContext, not a bare path (#998)."""@@ -103,51 +135,56 @@ class TestFindCaBundlePriority:def test_ssl_cert_file_beats_requests_ca_bundle(self, monkeypatch, tmp_path):"""SSL_CERT_FILE is used first even when REQUESTS_CA_BUNDLE is also set."""_clean_env(monkeypatch)- # Two distinct files so we can identify which was loaded.pem1 = tmp_path / "first.pem"pem2 = tmp_path / "second.pem"pem1.write_bytes(_SELF_SIGNED_CA_PEM)pem2.write_bytes(_SELF_SIGNED_CA_PEM)-monkeypatch.setenv("SSL_CERT_FILE", str(pem1))monkeypatch.setenv("REQUESTS_CA_BUNDLE", str(pem2))+ created_context = FakeSSLContext()- # Both files are valid; we cannot easily inspect which CA was loaded- # into the context, but we can verify the function returns a path- # (not None) and that it is tied to SSL_CERT_FILE by temporarily- # making REQUESTS_CA_BUNDLE point to a nonexistent path.- monkeypatch.setenv("REQUESTS_CA_BUNDLE", "/nonexistent/path.pem")- ctx = find_ca_bundle()- # SSL_CERT_FILE still valid → should return a path- assert isinstance(ctx, str)- assert os.path.isfile(ctx)+ def fake_create_default_context(*, cafile: str | None = None):+ assert cafile == str(pem1)+ return created_context++ monkeypatch.setattr(ssl_context.ssl, "create_default_context", fake_create_default_context)++ assert find_ca_bundle() is created_contextdef test_ssl_cert_file_beats_node_extra_ca_certs(self, monkeypatch, tmp_path):"""SSL_CERT_FILE takes precedence over NODE_EXTRA_CA_CERTS."""_clean_env(monkeypatch)pem = tmp_path / "ca.pem"pem.write_bytes(_SELF_SIGNED_CA_PEM)-monkeypatch.setenv("SSL_CERT_FILE", str(pem))monkeypatch.setenv("NODE_EXTRA_CA_CERTS", "/nonexistent/node.pem")+ created_context = FakeSSLContext()- ctx = find_ca_bundle()- assert isinstance(ctx, str)- assert os.path.isfile(ctx)+ def fake_create_default_context(*, cafile: str | None = None):+ assert cafile == str(pem)+ return created_context++ monkeypatch.setattr(ssl_context.ssl, "create_default_context", fake_create_default_context)++ assert find_ca_bundle() is created_contextdef test_requests_ca_bundle_beats_node_extra_ca_certs(self, monkeypatch, tmp_path):"""REQUESTS_CA_BUNDLE is used before NODE_EXTRA_CA_CERTS."""_clean_env(monkeypatch)pem = tmp_path / "ca.pem"pem.write_bytes(_SELF_SIGNED_CA_PEM)-monkeypatch.setenv("SSL_CERT_FILE", "/nonexistent/ssl.pem")monkeypatch.setenv("REQUESTS_CA_BUNDLE", str(pem))monkeypatch.setenv("NODE_EXTRA_CA_CERTS", "/nonexistent/node.pem")+ created_context = FakeSSLContext()- ctx = find_ca_bundle()- assert isinstance(ctx, str)- assert os.path.isfile(ctx)+ def fake_create_default_context(*, cafile: str | None = None):+ assert cafile == str(pem)+ return created_context++ monkeypatch.setattr(ssl_context.ssl, "create_default_context", fake_create_default_context)++ assert find_ca_bundle() is created_contextclass TestFindCaBundleNonexistentPaths:@@ -170,4 +207,5 @@ class TestFindCaBundleNonexistentPaths:monkeypatch.setenv("REQUESTS_CA_BUNDLE", ca_pem_file)ctx = find_ca_bundle()- assert ctx == ca_pem_file++ assert isinstance(ctx, ssl.SSLContext)