more cleanup

elastic · Apr 29, 2021 · 222cb22 · 222cb22
1 parent 78a0642
commit 222cb22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/x-pack/plugins/reporting/server/browsers/download/ensure_downloaded.ts b/x-pack/plugins/reporting/server/browsers/download/ensure_downloaded.ts
@@ -49,9 +49,7 @@ async function ensureDownloaded(browsers: BrowserDownload[], logger: GenericLeve
             try {
               const downloadedChecksum = await download(url, path, logger);
               if (downloadedChecksum !== archiveChecksum) {
-                invalidChecksums.push(
-                  `${url} => ${path} [${downloadedChecksum} vs ${archiveChecksum}]`
-                );
+                invalidChecksums.push(`${url} => ${path}`);
               }
             } catch (err) {
               const message = new Error(`Failed to download ${url}`);
@@ -69,6 +67,7 @@ async function ensureDownloaded(browsers: BrowserDownload[], logger: GenericLeve
           )}`
         );
         logger.error(err);
+        throw err;
       }
     })
   );

diff --git a/x-pack/plugins/reporting/server/browsers/install.ts b/x-pack/plugins/reporting/server/browsers/install.ts
@@ -46,6 +46,11 @@ export function installBrowser(
 
       await del(chromiumPath);
       await extract(archive, chromiumPath);
+
+      const reCheck = await md5(binaryChecksum);
+      if (reCheck !== pkg.binaryChecksum) {
+        throw new Error(`Extracted browser checksum is incorrect!`);
+      }
     }
 
     logger.debug(`Browser executable: ${binaryPath}`);