From 85503a352b26d3132a50e0da103eb0e546754082 Mon Sep 17 00:00:00 2001 From: jf-hgeng Date: Fri, 13 Nov 2026 19:37:56 +0000 Subject: [PATCH] test(cli): remove committed TLS private key and generate test certificates (#7644) * test(cli): generate TLS fixtures instead of committing private keys * test(ci): allow the intentional removal of plaintext TLS fixtures --- bun.lock | 45 +++++++++++++++++++ packages/cli/package.json | 1 + .../fixtures/capture-fixture-certificate.pem | 20 --------- .../capture/fixtures/capture-fixture-key.pem | 28 ------------ .../cli/src/capture/fixtures/captureTls.ts | 9 ++++ .../capture/publicNetwork.integration.test.ts | 13 ++---- .../capture/upstreamProxy.integration.test.ts | 14 +++--- scripts/check-no-main-deletions.mjs | 8 ++++ 8 files changed, 72 insertions(+), 66 deletions(-) delete mode 100644 packages/cli/src/capture/fixtures/capture-fixture-certificate.pem delete mode 100644 packages/cli/src/capture/fixtures/capture-fixture-key.pem create mode 100644 packages/cli/src/capture/fixtures/captureTls.ts diff --git a/bun.lock b/bun.lock index d06d119271..e405d8af89 100644 --- a/bun.lock +++ b/bun.lock @@ -109,6 +109,7 @@ "linkedom": "^0.18.12", "onnxruntime-node": "1.21.1", "picocolors": "^1.1.1", + "selfsigned": "5.5.0", "tsup": "^8.0.0", "tsx": "^4.0.0", "typescript": "^5.0.0", @@ -906,6 +907,8 @@ "@napi-rs/wasm-runtime": ["@napi-rs/wasm-runtime@1.1.4", "", { "dependencies": { "@tybys/wasm-util": "^0.10.1" }, "peerDependencies": { "@emnapi/core": "^1.7.1", "@emnapi/runtime": "^1.7.1" } }, "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow=="], + "@noble/hashes": ["@noble/hashes@1.8.0", "", {}, "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A=="], + "@nodable/entities": ["@nodable/entities@2.1.0", "", {}, "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA=="], "@oxc-parser/binding-android-arm-eabi": ["@oxc-parser/binding-android-arm-eabi@0.128.0", "", { "os": "android", "cpu": "arm" }, "sha512-aca6ZvzmCBUGOANQRiRQRZuRKYI3ENhcit6GisnknOOmcezfQc7xJ4dxlPU7MV7mOvrC7RNR1u3LAD7xyaiCxA=="], @@ -1066,6 +1069,30 @@ "@oxlint/binding-win32-x64-msvc": ["@oxlint/binding-win32-x64-msvc@1.64.0", "", { "os": "win32", "cpu": "x64" }, "sha512-9CBR+LO0JVST87fNTzzNxS5I29jIUO5gxT9i9+M3SDHHALElj9sY1Prf12tad3vIRC6OD7Ehtvvh+sn13vSwHw=="], + "@peculiar/asn1-cms": ["@peculiar/asn1-cms@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "@peculiar/asn1-x509-attr": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-Bk+oatE62dW0Tzzpfk6vdQxfGGEfvuGdWgmijnKjcv7HqZCJISs85z4zw2uDArrk+R1Oel1wts/BBl7HHrtAcA=="], + + "@peculiar/asn1-csr": ["@peculiar/asn1-csr@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-KVfbXaKng8886/tOPG55t5K1XkTkGbR4amjIJzytXWobFU5nZgw/sKnSpa1hxP17nUSsrOF/7Mt9WUYeyLsi6Q=="], + + "@peculiar/asn1-ecc": ["@peculiar/asn1-ecc@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-7MSNji77fQa/oN3WAfwagMy8EoJFg50sW4hZ1dtr0zU1BSugit0I2DGpIdPhvkNplopQhz5bogxpn1077eaamA=="], + + "@peculiar/asn1-pfx": ["@peculiar/asn1-pfx@2.11.1", "", { "dependencies": { "@peculiar/asn1-cms": "^2.11.1", "@peculiar/asn1-pkcs8": "^2.11.1", "@peculiar/asn1-rsa": "^2.11.1", "@peculiar/asn1-schema": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-2SN2z8qkc2hk/GgTYA8RN54wtsCDZShg9gI2Mq1vLhdj1adcv5fhTbiEmExZUaAMqlizxiEpULQDfHM5iYtn1g=="], + + "@peculiar/asn1-pkcs8": ["@peculiar/asn1-pkcs8@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-HqsSrnpQghRp9SM9QSmR6fa4z/BNktnKq7928+oq4qF0VAnuHZ4cyePKvcxh9fP4taBCP/WHNItlVNsYaQm2qw=="], + + "@peculiar/asn1-pkcs9": ["@peculiar/asn1-pkcs9@2.11.1", "", { "dependencies": { "@peculiar/asn1-cms": "^2.11.1", "@peculiar/asn1-pfx": "^2.11.1", "@peculiar/asn1-pkcs8": "^2.11.1", "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "@peculiar/asn1-x509-attr": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-OHFkTg8D2zYafILqFE4KPbqX8srpvd3diGDc2h2cduumawc765mOHGcuFMGvLWlL2bbCMWMmMSCtlXptsOuiPA=="], + + "@peculiar/asn1-rsa": ["@peculiar/asn1-rsa@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-6KwKGjulF489CpidZqkogNgLj6oGzgC4BL2FClM8PuJQ4t5NqT4q4a6A4vrSxBIBhMnL8hGYkLOpbVw0Vq38Tw=="], + + "@peculiar/asn1-schema": ["@peculiar/asn1-schema@2.11.1", "", { "dependencies": { "@peculiar/utils": "^2.0.2", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-jaU9OaCcbZUdyXx9hMETZB9xoNmxTGjOGFqd3cOwKFkpKnyKd9WxF3uqj4PvX4cyOMP9bSdHg5YyML2qtx/d/g=="], + + "@peculiar/asn1-x509": ["@peculiar/asn1-x509@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/utils": "^2.0.2", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-SXU4/X6B3FquqQAN6ARI0bFDUV7+L1WlvPEPMKzEMkstd2D7UyM0r93fv241+OjdhqAKYGx5MvV3gzZMAp0APA=="], + + "@peculiar/asn1-x509-attr": ["@peculiar/asn1-x509-attr@2.11.1", "", { "dependencies": { "@peculiar/asn1-schema": "^2.11.1", "@peculiar/asn1-x509": "^2.11.1", "asn1js": "^3.0.10", "tslib": "^2.8.1" } }, "sha512-n7RKFrbTzt8pGBlZ90kmKEn1qsLTTyw7lrvHMK0xsA42kQugPk/GXYpNbEcl7DkkdVsU/one5UX7KQPfxLj8vQ=="], + + "@peculiar/utils": ["@peculiar/utils@2.0.3", "", { "dependencies": { "tslib": "^2.8.1" } }, "sha512-+oL3HPFRIZ1St2K50lWCXiioIgSoxzz7R1J3uF6neO2yl1sgmpgY6XXJH4BdpoDkMWznQTeYF6oWNDZLCdQ4eQ=="], + + "@peculiar/x509": ["@peculiar/x509@1.14.3", "", { "dependencies": { "@peculiar/asn1-cms": "^2.6.0", "@peculiar/asn1-csr": "^2.6.0", "@peculiar/asn1-ecc": "^2.6.0", "@peculiar/asn1-pkcs9": "^2.6.0", "@peculiar/asn1-rsa": "^2.6.0", "@peculiar/asn1-schema": "^2.6.0", "@peculiar/asn1-x509": "^2.6.0", "pvtsutils": "^1.3.6", "reflect-metadata": "^0.2.2", "tslib": "^2.8.1", "tsyringe": "^4.10.0" } }, "sha512-C2Xj8FZ0uHWeCXXqX5B4/gVFQmtSkiuOolzAgutjTfseNOHT3pUjljDZsTSxXFGgio54bCzVFqmEOUrIVk8RDA=="], + "@phosphor-icons/react": ["@phosphor-icons/react@2.1.10", "", { "peerDependencies": { "react": ">= 16.8", "react-dom": ">= 16.8" } }, "sha512-vt8Tvq8GLjheAZZYa+YG/pW7HDbov8El/MANW8pOAz4eGxrwhnbfrQZq0Cp4q8zBEu8NIhHdnr+r8thnfRSNYA=="], "@pkgjs/parseargs": ["@pkgjs/parseargs@0.11.0", "", {}, "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg=="], @@ -1344,6 +1371,8 @@ "arrify": ["arrify@2.0.1", "", {}, "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug=="], + "asn1js": ["asn1js@3.1.0", "", { "dependencies": { "pvtsutils": "^1.3.6", "pvutils": "^1.2.0", "tslib": "^2.8.1" } }, "sha512-HWYi1THkOqguCiO+vwj09ZkQFD2kKEsejYHAYCtX0D80WVdoDnvRc9IukXX/jeb0T9NRWJnRtqwdbHltnFjwXA=="], + "assertion-error": ["assertion-error@2.0.1", "", {}, "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="], "ast-types": ["ast-types@0.16.1", "", { "dependencies": { "tslib": "^2.0.1" } }, "sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg=="], @@ -1408,6 +1437,8 @@ "bundle-require": ["bundle-require@5.1.0", "", { "dependencies": { "load-tsconfig": "^0.2.3" }, "peerDependencies": { "esbuild": ">=0.18" } }, "sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA=="], + "bytestreamjs": ["bytestreamjs@2.0.1", "", {}, "sha512-U1Z/ob71V/bXfVABvNr/Kumf5VyeQRBEm6Txb0PQ6S7V5GpBM3w4Cbqz/xPDicR5tN0uvDifng8C+5qECeGwyQ=="], + "cac": ["cac@6.7.14", "", {}, "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ=="], "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="], @@ -1954,6 +1985,8 @@ "pkg-types": ["pkg-types@1.3.1", "", { "dependencies": { "confbox": "^0.1.8", "mlly": "^1.7.4", "pathe": "^2.0.1" } }, "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ=="], + "pkijs": ["pkijs@3.4.3", "", { "dependencies": { "@noble/hashes": "1.8.0", "asn1js": "^3.0.6", "bytestreamjs": "^2.0.1", "pvtsutils": "^1.3.6", "pvutils": "^1.1.3", "tslib": "^2.8.1" } }, "sha512-V9kOzaItwDgqlryhXysQsAXUEKi5O7kqWUaP3dXI7MLvkPqWWMb4wVb1QAtmEDCKI+XIAINsZoNKMFF7sZb1eg=="], + "postcss": ["postcss@8.5.28", "", { "dependencies": { "nanoid": "^3.3.18", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" } }, "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A=="], "postcss-load-config": ["postcss-load-config@6.0.1", "", { "dependencies": { "lilconfig": "^3.1.1" }, "peerDependencies": { "jiti": ">=1.21.0", "postcss": ">=8.0.9", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["jiti", "postcss", "tsx", "yaml"] }, "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g=="], @@ -1974,6 +2007,10 @@ "puppeteer-core": ["puppeteer-core@25.13.0", "", { "dependencies": { "@puppeteer/browsers": "3.2.4", "chromium-bidi": "157.0.8090-0", "devtools-protocol": "0.0.1696802", "typed-query-selector": "^2.12.3", "webdriver-bidi-protocol": "1.0.1", "ws": "^8.21.3" } }, "sha512-cyBS0OEx3e9NS53B5F6+UazXtR7f9Tw0cR1/FbPW59/hV6JPZbkIiMnxK2543IkFp3rsGlLn1iPDLF77TJsJsA=="], + "pvtsutils": ["pvtsutils@1.3.6", "", { "dependencies": { "tslib": "^2.8.1" } }, "sha512-PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg=="], + + "pvutils": ["pvutils@1.2.0", "", {}, "sha512-BbubeCEyTuQjVMakvJQ/Sxbc93F2pwmbsxONT/ZRrwU7Ua38d8unYTwXpTVLAKJ4BDuH9IGztCjQcd/N/39Dvg=="], + "react": ["react@19.2.6", "", {}, "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q=="], "react-dom": ["react-dom@19.2.6", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.6" } }, "sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g=="], @@ -1986,6 +2023,8 @@ "recast": ["recast@0.23.11", "", { "dependencies": { "ast-types": "^0.16.1", "esprima": "~4.0.0", "source-map": "~0.6.1", "tiny-invariant": "^1.3.3", "tslib": "^2.0.1" } }, "sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA=="], + "reflect-metadata": ["reflect-metadata@0.2.2", "", {}, "sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q=="], + "require-directory": ["require-directory@2.1.1", "", {}, "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="], "require-from-string": ["require-from-string@2.0.2", "", {}, "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="], @@ -2016,6 +2055,8 @@ "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="], + "selfsigned": ["selfsigned@5.5.0", "", { "dependencies": { "@peculiar/x509": "^1.14.2", "pkijs": "^3.3.3" } }, "sha512-ftnu3TW4+3eBfLRFnDEkzGxSF/10BJBkaLJuBHZX0kiPS7bRdlpZGu6YGt4KngMkdTwJE6MbjavFpqHvqVt+Ew=="], + "semver": ["semver@7.8.0", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-AcM7dV/5ul4EekoQ29Agm5vri8JNqRyj39o0qpX6vDF2GZrtutZl5RwgD1XnZjiTAfncsJhMI48QQH3sN87YNA=="], "semver-compare": ["semver-compare@1.0.0", "", {}, "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="], @@ -2134,6 +2175,8 @@ "tsx": ["tsx@4.21.0", "", { "dependencies": { "esbuild": "~0.27.0", "get-tsconfig": "^4.7.5" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "bin": { "tsx": "dist/cli.mjs" } }, "sha512-5C1sg4USs1lfG0GFb2RLXsdpXqBSEhAaA/0kPL01wxzpMqLILNxIxIOKiILz+cdg/pLnOUxFYOR5yhHU666wbw=="], + "tsyringe": ["tsyringe@4.10.0", "", { "dependencies": { "tslib": "^1.9.3" } }, "sha512-axr3IdNuVIxnaK5XGEUFTu3YmAQ6lllgrvqfEoR16g/HGnYY/6We4oWENtAnzK6/LpJ2ur9PAb80RBt7/U4ugw=="], + "type-fest": ["type-fest@0.13.1", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="], "typed-query-selector": ["typed-query-selector@2.12.3", "", {}, "sha512-/dtuMZyutHLlrxWhhC1uib00ELUr2dZ8C9B8YzZYsJmeE3V56OxRblrSM2UaF142pcMtak7ehZ6+poWGeehNIg=="], @@ -2372,6 +2415,8 @@ "tsx/esbuild": ["esbuild@0.27.7", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.27.7", "@esbuild/android-arm": "0.27.7", "@esbuild/android-arm64": "0.27.7", "@esbuild/android-x64": "0.27.7", "@esbuild/darwin-arm64": "0.27.7", "@esbuild/darwin-x64": "0.27.7", "@esbuild/freebsd-arm64": "0.27.7", "@esbuild/freebsd-x64": "0.27.7", "@esbuild/linux-arm": "0.27.7", "@esbuild/linux-arm64": "0.27.7", "@esbuild/linux-ia32": "0.27.7", "@esbuild/linux-loong64": "0.27.7", "@esbuild/linux-mips64el": "0.27.7", "@esbuild/linux-ppc64": "0.27.7", "@esbuild/linux-riscv64": "0.27.7", "@esbuild/linux-s390x": "0.27.7", "@esbuild/linux-x64": "0.27.7", "@esbuild/netbsd-arm64": "0.27.7", "@esbuild/netbsd-x64": "0.27.7", "@esbuild/openbsd-arm64": "0.27.7", "@esbuild/openbsd-x64": "0.27.7", "@esbuild/openharmony-arm64": "0.27.7", "@esbuild/sunos-x64": "0.27.7", "@esbuild/win32-arm64": "0.27.7", "@esbuild/win32-ia32": "0.27.7", "@esbuild/win32-x64": "0.27.7" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-IxpibTjyVnmrIQo5aqNpCgoACA/dTKLTlhMHihVHhdkxKyPO1uBBthumT0rdHmcsk9uMonIWS0m4FljWzILh3w=="], + "tsyringe/tslib": ["tslib@1.14.1", "", {}, "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="], + "vite/esbuild": ["esbuild@0.25.12", "", { "optionalDependencies": { "@esbuild/aix-ppc64": "0.25.12", "@esbuild/android-arm": "0.25.12", "@esbuild/android-arm64": "0.25.12", "@esbuild/android-x64": "0.25.12", "@esbuild/darwin-arm64": "0.25.12", "@esbuild/darwin-x64": "0.25.12", "@esbuild/freebsd-arm64": "0.25.12", "@esbuild/freebsd-x64": "0.25.12", "@esbuild/linux-arm": "0.25.12", "@esbuild/linux-arm64": "0.25.12", "@esbuild/linux-ia32": "0.25.12", "@esbuild/linux-loong64": "0.25.12", "@esbuild/linux-mips64el": "0.25.12", "@esbuild/linux-ppc64": "0.25.12", "@esbuild/linux-riscv64": "0.25.12", "@esbuild/linux-s390x": "0.25.12", "@esbuild/linux-x64": "0.25.12", "@esbuild/netbsd-arm64": "0.25.12", "@esbuild/netbsd-x64": "0.25.12", "@esbuild/openbsd-arm64": "0.25.12", "@esbuild/openbsd-x64": "0.25.12", "@esbuild/openharmony-arm64": "0.25.12", "@esbuild/sunos-x64": "0.25.12", "@esbuild/win32-arm64": "0.25.12", "@esbuild/win32-ia32": "0.25.12", "@esbuild/win32-x64": "0.25.12" }, "bin": { "esbuild": "bin/esbuild" } }, "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg=="], "@babel/core/@babel/types/@babel/helper-string-parser": ["@babel/helper-string-parser@7.27.1", "", {}, "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA=="], diff --git a/packages/cli/package.json b/packages/cli/package.json index 1991055341..11de5c2d2b 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -94,6 +94,7 @@ "linkedom": "^0.18.12", "onnxruntime-node": "1.21.1", "picocolors": "^1.1.1", + "selfsigned": "5.5.0", "tsup": "^8.0.0", "tsx": "^4.0.0", "typescript": "^5.0.0", diff --git a/packages/cli/src/capture/fixtures/capture-fixture-certificate.pem b/packages/cli/src/capture/fixtures/capture-fixture-certificate.pem deleted file mode 100644 index 7c67ef7d8b..0000000000 --- a/packages/cli/src/capture/fixtures/capture-fixture-certificate.pem +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDVDCCAjygAwIBAgIUDioF2H4Bafsk/bUE0j/foJiauV0wDQYJKoZIhvcNAQEL -BQAwJTEjMCEGA1UEAwwaYXNzZXRzLmNhcHR1cmUtZml4dHVyZS5jb20wIBcNMjYx -MDIxMTIyMDE2WhgPMjEyNjA5MjcxMjIwMTZaMCUxIzAhBgNVBAMMGmFzc2V0cy5j -YXB0dXJlLWZpeHR1cmUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAkLsrtFZHoDBdF+mUIBSNQmFyZsC0NE6SrGrqWJDL/2xK6OmXZapMWPCggjYI -awm9AiTChIWYmGjGYLYSqlLCuBgmViRGwDoB9XpP6jhhHRAyor6z0lskHVDqf4OI -/gDpZYhiNcusSkXz8/uh492eBoO/RfFERv1rx+b1shx0b9S6wRDaD+W2OzGIHQQp -EwN84wOtc9d0gRSD+X5QHAV785eeX42lR8hgu8tq8zQSt3iivgsg/EvpLvwvgvP0 -vX/cdEpfDtwGSzF/ELrvnHGhBlBemh81KkFmMZ6bNXHgMOkRdrEaC+Buii81Si56 -Kzqkh5l7oZqgISf49mySCgwPbQIDAQABo3oweDAdBgNVHQ4EFgQU6JGqZ9HkLtYG -A9cDhbMdlUhndP4wHwYDVR0jBBgwFoAU6JGqZ9HkLtYGA9cDhbMdlUhndP4wDwYD -VR0TAQH/BAUwAwEB/zAlBgNVHREEHjAcghphc3NldHMuY2FwdHVyZS1maXh0dXJl -LmNvbTANBgkqhkiG9w0BAQsFAAOCAQEADGlVVOdB3k1ttErEGMNExXxitBl14dp/ -rWknedjIoD4G87ohAeXLOhbbwDv7J29bCoeJDknf0tH2LzlAWgwTSevnxgEuai+c -GuaP9tu1uaIROMa/eFzgP3ekm2OW4ggc10f4cjWTiQ+JFZqCuAkandguvhGwJmGo -T4pdodmWvdbbz0ECPCaS4HeG6UD1pNtE8/uenW0rpNNK8KE9o8TaXBHcFhuoWs6i -WfggFumbJCr2L1K7LgJ345tbVHK5ATu5T56K40Zc30F3swLv8+6rbxPJRZvDTs2k -lBmPcQDXktxvlDwpLWB/y9BRlQFtO0MCIxRKGz6054u4kqS43XR+kw== ------END CERTIFICATE----- diff --git a/packages/cli/src/capture/fixtures/capture-fixture-key.pem b/packages/cli/src/capture/fixtures/capture-fixture-key.pem deleted file mode 100644 index 29dd552049..0000000000 --- a/packages/cli/src/capture/fixtures/capture-fixture-key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQuyu0VkegMF0X -6ZQgFI1CYXJmwLQ0TpKsaupYkMv/bEro6ZdlqkxY8KCCNghrCb0CJMKEhZiYaMZg -thKqUsK4GCZWJEbAOgH1ek/qOGEdEDKivrPSWyQdUOp/g4j+AOlliGI1y6xKRfPz -+6Hj3Z4Gg79F8URG/WvH5vWyHHRv1LrBENoP5bY7MYgdBCkTA3zjA61z13SBFIP5 -flAcBXvzl55fjaVHyGC7y2rzNBK3eKK+CyD8S+ku/C+C8/S9f9x0Sl8O3AZLMX8Q -uu+ccaEGUF6aHzUqQWYxnps1ceAw6RF2sRoL4G6KLzVKLnorOqSHmXuhmqAhJ/j2 -bJIKDA9tAgMBAAECggEAEwQ0yt4nTRntsW2kY86vfNBW+r9JLjJAvVzS684ir63n -7dB7bwVAQNNlE5bL5lyCNBzmXgk7spLZte1WaIC1SwEJUHo1vZ4hkcJ/a5P61pnB -PXb3I6WMCjoOhbCfuFggUpHn7Y+UVLH6Ss1+SPVehRacdDEuOnGjzsE++ScZ+XN0 -eioTopbiht9ThVkjeTqYdjB4qjo5aZ8junkn8MIeSjiSj3YLNYU5JuBr3jkm/ZEB -zMrf1Y25ifqik+d+FjmiujeYESfP2SD0zH2kSMg6S10G/yNu62GmyVXr5SdujBcU -ZilclRZidUCPbRnljY5UOK7KmaLol5+jZdDbF0UbNQKBgQDEn9ygNbjNQK+Wvo6t -Xuk07OMeasWNU4768SkGG+FHgxAp9ZmSVYedTuSQsV7fZvZOAaFM+E85vZvjOjsh -INy2Anbze1Dx++xmFLXCmDaPkHXlcukaF3njPu0y7Az9XVCR9xaRYuof3vVQyJwv -E9AWLru0VtvUioFzFvIp09vV2wKBgQC8b6xWurxpFv4kAgK0B6PoY0QPW0Zqd64b -A/dkKjyNQs8yxTRrE8ZgitobMl93MfKE2BnlmkhI02ONOhAzndWxDCvi8ohI3349 -XCbs6EUVsbBs1xuGo8/rgbraviG8dcffR4qEbNINCX9hOymgV4vM1og9ETQpAyBS -356H9X3GVwKBgERsNQRzbWnPtsrIaTIfsxu9y5NMKI7zou/keBguH4kZLMjNNLHd -naG6UIOhlZg8Zj3jB1SXnEpFlzfNjcILg4K6/NXh9dsfhbZIQrAC9AmlhcFg6Ykw -3jOcNELiLesFTAJfb7UMLNkGZ2vDQ8aGKIVvodYx27HsuPtp4r93gCq9AoGAKgfW -rvmz8NTaFvoD1Fgn7TvHAI3hZPoQ8aGu2r65BuEyCicGjCO7CemuwIY52QJhD9SL -4jTJjsTn3aZn2ruH4JfQaiyizW5cYB9f51PfpPkfWweX8i4zwFoNbaEfMUQsMtdo -RCVprNLDgNKLdGJSonvvo39k3Qj/ery6RaUySr0CgYEAwDN930UWX2kxWsBZ0ba2 -4tD9kmUfM4ePhcOWm70XwwS+JGhDP9Q4PRRqIr+zEhH3KyZbkz7LZWdAE9sRR7LK -HA4KEBvRmaL3oPdqWuPgBdPKWL2J+yTv2otqYgSNrbVq+uK0LHTD10YMQkNsJNKe -3LxT+F6ZKfINCS+AQ/VNIX4= ------END PRIVATE KEY----- diff --git a/packages/cli/src/capture/fixtures/captureTls.ts b/packages/cli/src/capture/fixtures/captureTls.ts new file mode 100644 index 0000000000..798cb27525 --- /dev/null +++ b/packages/cli/src/capture/fixtures/captureTls.ts @@ -0,0 +1,9 @@ +import { generate } from "selfsigned"; + +export async function createCaptureTlsFixture() { + const { private: key, cert } = await generate( + [{ name: "commonName", value: "assets.capture-fixture.com" }], + { keyType: "ec", algorithm: "sha256" }, + ); + return { key, cert }; +} diff --git a/packages/cli/src/capture/publicNetwork.integration.test.ts b/packages/cli/src/capture/publicNetwork.integration.test.ts index e11f3ffd06..8f9ad3a42a 100644 --- a/packages/cli/src/capture/publicNetwork.integration.test.ts +++ b/packages/cli/src/capture/publicNetwork.integration.test.ts @@ -1,4 +1,3 @@ -import { readFile } from "node:fs/promises"; import { createServer, type IncomingMessage, @@ -65,6 +64,7 @@ vi.mock("node:https", async (importOriginal) => { }); import { publicRequest } from "./publicNetwork.js"; +import { createCaptureTlsFixture } from "./fixtures/captureTls.js"; type RequestReceipt = { host: string | undefined; @@ -136,14 +136,9 @@ async function waitForStreamClose() { describe("publicRequest controlled socket integration", () => { beforeAll(async () => { - // A committed self-signed pair (valid to 2126), so this 30 s hook starts no openssl child. - const fixture = (name: string) => - new URL(`./fixtures/capture-fixture-${name}`, import.meta.url); - transport.certificate = await readFile(fixture("certificate.pem"), "utf8"); - httpsServer.setSecureContext({ - key: await readFile(fixture("key.pem")), - cert: transport.certificate, - }); + const fixture = await createCaptureTlsFixture(); + transport.certificate = fixture.cert; + httpsServer.setSecureContext(fixture); httpsServer.on("tlsClientError", () => {}); for (const server of servers) { server.on("connection", (socket) => { diff --git a/packages/cli/src/capture/upstreamProxy.integration.test.ts b/packages/cli/src/capture/upstreamProxy.integration.test.ts index 9a7566dd97..010f1b5be5 100644 --- a/packages/cli/src/capture/upstreamProxy.integration.test.ts +++ b/packages/cli/src/capture/upstreamProxy.integration.test.ts @@ -1,4 +1,3 @@ -import { readFile } from "node:fs/promises"; import { createServer, request, type IncomingMessage, type Server } from "node:http"; import { createServer as createHttpsServer } from "node:https"; import { Socket } from "node:net"; @@ -21,7 +20,7 @@ vi.mock("node:dns", async (importOriginal) => { }; }); -// Trust the committed fixture certificate; verification itself stays on. +// Trust only this test's generated certificate; verification itself stays on. vi.mock("node:tls", async (importOriginal) => { const real = await importOriginal(); return { @@ -34,6 +33,7 @@ vi.mock("node:tls", async (importOriginal) => { import { safeFetch } from "./assetDownloader.js"; import { publicRequest } from "./publicNetwork.js"; import { startCaptureProxy } from "./captureProxy.js"; +import { createCaptureTlsFixture } from "./fixtures/captureTls.js"; const DESTINATION = "assets.capture-fixture.com"; @@ -104,13 +104,9 @@ function dialTarget(args: unknown[]): string { describe("capture with the opt-in upstream proxy", () => { beforeAll(async () => { - const fixture = (name: string) => - new URL(`./fixtures/capture-fixture-${name}`, import.meta.url); - transport.certificate = await readFile(fixture("certificate.pem"), "utf8"); - destination.setSecureContext({ - key: await readFile(fixture("key.pem")), - cert: transport.certificate, - }); + const fixture = await createCaptureTlsFixture(); + transport.certificate = fixture.cert; + destination.setSecureContext(fixture); await new Promise((resolve) => upstream.listen(0, "127.0.0.1", resolve)); const address = upstream.address(); if (!address || typeof address === "string") throw new Error("Missing upstream port"); diff --git a/scripts/check-no-main-deletions.mjs b/scripts/check-no-main-deletions.mjs index ba5d8c9d66..d3162067ab 100644 --- a/scripts/check-no-main-deletions.mjs +++ b/scripts/check-no-main-deletions.mjs @@ -774,6 +774,14 @@ const PLAN_PARITY_HARNESS_FILES = [ ]; export const ALLOWED_DELETIONS = new Map([ + [ + "packages/cli/src/capture/fixtures/capture-fixture-key.pem", + "owner-directed removal of committed plaintext key material; capture integration tests generate ephemeral TLS fixtures in memory", + ], + [ + "packages/cli/src/capture/fixtures/capture-fixture-certificate.pem", + "paired with the removed plaintext key; capture integration tests generate an ephemeral certificate in memory", + ], // Prompt Guide as six topic pages [ "docs/prompting/anatomy.mdx",