From 3c19429ed2ad60e616c9004e3727463cb106999a Mon Sep 17 00:00:00 2001 From: Andrew Tretyakov <42178850+0xAndoroid@users.noreply.github.com> Date: Thu, 5 Nov 2026 22:05:21 -0500 Subject: [PATCH] fix(bench): identify ingest download requests --- scripts/bench/ingest.py | 3 ++- scripts/tests/test_e2e_ingest.py | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/scripts/bench/ingest.py b/scripts/bench/ingest.py index f89651f4be..8e9bc39fc2 100644 --- a/scripts/bench/ingest.py +++ b/scripts/bench/ingest.py @@ -37,7 +37,8 @@ def download(url, limit, *, authenticated=False): parsed = urlsplit(url) if parsed.scheme != 'https' or parsed.username or parsed.password or not parsed.hostname: raise ValueError('download must use credential-free HTTPS') - headers = {'Accept': 'application/vnd.github+json'} + headers = {'Accept': 'application/vnd.github+json', + 'User-Agent': 'jolt-e2e-ingest/1 (+https://github.com/a16z/jolt)'} if authenticated: if parsed.hostname != 'api.github.com': raise ValueError('artifact authentication is limited to GitHub') diff --git a/scripts/tests/test_e2e_ingest.py b/scripts/tests/test_e2e_ingest.py index bf4954481d..315bb4f800 100644 --- a/scripts/tests/test_e2e_ingest.py +++ b/scripts/tests/test_e2e_ingest.py @@ -243,6 +243,21 @@ def test_a_finalized_missing_target_result_is_valid_partial_data_for_each_tier(s self.assertEqual(checked[0]['builds'], []) self.assertEqual(ingest.check_result('123-1', checked, 1, 'failed')['conclusion'], 'failure') + def test_download_sends_descriptive_user_agent(self): + for url, authenticated in [('https://fixture.invalid/result.zip', False), + ('https://api.github.com/repos/a16z/jolt/actions/artifacts/42/zip', True)]: + with self.subTest(url=url), patch.dict(os.environ, GH_TOKEN='fixture-token'), \ + patch.object(ingest.urllib.request, 'build_opener') as opener: + opener.return_value.open.return_value = io.BytesIO(b'owned result') + self.assertEqual(ingest.download(url, 100, authenticated=authenticated), b'owned result') + request = opener.return_value.open.call_args.args[0] + self.assertEqual(request.get_header('User-agent'), + 'jolt-e2e-ingest/1 (+https://github.com/a16z/jolt)') + redirected = ingest.DownloadRedirect().redirect_request(request, None, 302, 'Found', {}, + 'https://storage.invalid/result.zip') + self.assertEqual(redirected.get_header('User-agent'), request.get_header('User-agent')) + self.assertFalse(redirected.has_header('Authorization')) + def test_untrusted_zip_paths_and_download_caps_are_enforced(self): self.assertEqual(ingest.result_files(zipped({'builds/fixture/build.log': b'owned log'})), {'builds/fixture/build.log': b'owned log'})