Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions tests/test_ingest.py
Original file line number Diff line number Diff line change
Expand Up @@ -371,10 +371,29 @@ def do_POST(self): # reads the request first: Windows resets a connection clos
self.send_header("Content-Length", "0")
self.end_headers()
src = self.serve(Redirect)
resp = client._http_rpc(src, {"socket_token": "secret"}, {"op": "status"}, 5)
self.assertFalse(resp.get("ok"))
for _ in range(2): # the second through the shared opener the first built (#722)
resp = client._http_rpc(src, {"socket_token": "secret"}, {"op": "status"}, 5)
self.assertFalse(resp.get("ok"))
self.assertEqual(seen, [], "the redirect target must never be contacted")

def test_calls_without_a_context_share_one_opener_and_its_ssl_context(self):
"""#722: a new opener per call made a new SSL context per call (Python 3.12 on), loading Windows' certificates
each time. A caller's own context still gets an opener of its own."""
import ssl
client._shared_opener.cache_clear()
made = []
real = ssl._create_default_https_context

def counted(*a, **kw):
made.append(1)
return real(*a, **kw)
with unittest.mock.patch.object(ssl, "_create_default_https_context", counted):
first, second = client.no_redirect_opener(), client.no_redirect_opener()
self.assertIs(first, second)
self.assertLessEqual(len(made), 1) # one on 3.12 on; none before, where a connection makes its own
own = ssl.create_default_context()
self.assertIsNot(client.no_redirect_opener(own), first)

def test_empty_reply_is_unavailable(self):
from http.server import BaseHTTPRequestHandler

Expand Down
17 changes: 16 additions & 1 deletion tracekit/client.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Client side: send events to tracekitd over its local transport. Runs as the agent's user and
never writes the ledger. Its own small state (per-run counters, pending gaps) is agent-writable
by design: tampering with it only produces capture.gap events on the signer side."""
import functools
import hashlib
import json
import os
Expand Down Expand Up @@ -141,7 +142,21 @@ def remote_url_error(url):

def no_redirect_opener(context=None):
"""A urllib opener that bypasses proxies and returns any 3xx as an HTTPError instead of following it,
so credential headers are never re-sent to a redirect target. `context`: an ssl.SSLContext for HTTPS."""
so credential headers are never re-sent to a redirect target. `context`: an ssl.SSLContext for HTTPS; without
one, every call gets the same opener (_shared_opener)."""
return _no_redirect_opener(context) if context is not None else _shared_opener()


@functools.lru_cache(maxsize=1)
def _shared_opener():
"""The opener for calls without a context, built once: building one makes an SSL context (Python 3.12 on), which on
Windows loads the system's certificates each time, ~40 ms a call (#722). It is shared across threads: neither the
OpenerDirector nor its handlers keep per-request state (a redirect's state is on the request, and each request
opens its own connection)."""
return _no_redirect_opener(None)


def _no_redirect_opener(context):
import urllib.request

class _NoRedirect(urllib.request.HTTPRedirectHandler):
Expand Down
Loading