use browser_download_url

loilo-inc · Jun 18, 2024 · 2e1bde2 · 2e1bde2
1 parent 28eb436
commit 2e1bde2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -35831,14 +35831,16 @@ async function downloadCage({ version, token, }) {
         throw new Error(`Checksums not found for ${version}`);
     if (!asset)
         throw new Error(`Asset not found for ${platformArch}`);
-    console.assert(asset.url.startsWith("https://"), "asset.url is not secure: %s", asset.url);
-    console.assert(checksums.url.startsWith("https://"), "checksums.url is not secure: %s", checksums.url);
-    const checksumsContent = await tc.downloadTool(checksums.url);
+    const assetUrl = asset.browser_download_url;
+    const checksumsUrl = checksums.browser_download_url;
+    console.assert(assetUrl.startsWith("https://"), "asset.url is not secure: %s", assetUrl);
+    console.assert(checksumsUrl.startsWith("https://"), "checksumsUrl is not secure: %s", checksumsUrl);
+    const checksumsContent = await tc.downloadTool(checksumsUrl);
     const checksumEntries = await parseChecksum(checksumsContent);
     const hash = checksumEntries.get(asset.name);
     if (!hash)
         throw new Error(`Checksum not found for ${asset.name}`);
-    const zip = await tc.downloadTool(asset.url);
+    const zip = await tc.downloadTool(assetUrl);
     const zipFile = await promises_1.default.open(zip, "r");
     const zipHash = await sha256hashAsync(zipFile.createReadStream());
     if (zipHash !== hash) {

diff --git a/src/setup.test.ts b/src/setup.test.ts
@@ -34,7 +34,7 @@ describe("downloadCage", () => {
   beforeEach(() => {
     const makeAsset = (version: string, name: string) => ({
       name,
-      url: `https://github.com/loilo-inc/canarycage/releases/download/${version}/${name}`,
+      browser_download_url: `https://github.com/loilo-inc/canarycage/releases/download/${version}/${name}`,
     });
     const makeRelease = (tag_name: string) => ({
       tag_name,

diff --git a/src/setup.ts b/src/setup.ts
@@ -47,21 +47,23 @@ export async function downloadCage({
   );
   if (!checksums) throw new Error(`Checksums not found for ${version}`);
   if (!asset) throw new Error(`Asset not found for ${platformArch}`);
+  const assetUrl = asset.browser_download_url;
+  const checksumsUrl = checksums.browser_download_url;
   console.assert(
-    asset.url.startsWith("https://"),
+    assetUrl.startsWith("https://"),
     "asset.url is not secure: %s",
-    asset.url,
+    assetUrl,
   );
   console.assert(
-    checksums.url.startsWith("https://"),
-    "checksums.url is not secure: %s",
-    checksums.url,
+    checksumsUrl.startsWith("https://"),
+    "checksumsUrl is not secure: %s",
+    checksumsUrl,
   );
-  const checksumsContent = await tc.downloadTool(checksums.url);
+  const checksumsContent = await tc.downloadTool(checksumsUrl);
   const checksumEntries = await parseChecksum(checksumsContent);
   const hash = checksumEntries.get(asset.name);
   if (!hash) throw new Error(`Checksum not found for ${asset.name}`);
-  const zip = await tc.downloadTool(asset.url);
+  const zip = await tc.downloadTool(assetUrl);
   const zipFile = await fs.open(zip, "r");
   const zipHash = await sha256hashAsync(zipFile.createReadStream());
   if (zipHash !== hash) {