Merge pull request #18 from golemfactory/bugfix/JST-387/Manifest-veri…

…fy-fix Bugfix/jst 387/manifest verify fix
golemfactory · Sep 8, 2023 · 9746d0c · 9746d0c
2 parents feadc8d + e4c1528
commit 9746d0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/lib/file.ts b/src/lib/file.ts
@@ -22,12 +22,17 @@ export async function checkFileOverwrite(
   }
 }
 
-export async function assertFileExists(name: string, path: string): Promise<void> {
+export async function assertFileExists(name: string, path: string, extraHelp?: string): Promise<void> {
   try {
     await stat(path);
   } catch (e) {
     // File does not exist, that's fine.
-    console.error(`Error: ${name} "${path}" not found.`);
+    let message = `Error: ${name} "${path}" not found.`;
+    if (extraHelp) {
+      message += ` ${extraHelp}`;
+    }
+
+    console.error(message);
     process.exit(1);
   }
 }
diff --git a/src/manifest/manifest-sign.action.ts b/src/manifest/manifest-sign.action.ts
@@ -7,7 +7,7 @@ import { assertFileExists } from "../lib/file";
 export async function manifestSignAction(options: ManifestSignOptions): Promise<void> {
   // Read and validate the manifest.
   await readManifest(options.manifest);
-  await assertFileExists("Private key file", options.keyFile);
+  await assertFileExists("Private key file", options.keyFile, "Check --key-file option.");
 
   // Read manifest buffer.
   const manifestBuffer = await readFile(options.manifest);

diff --git a/src/manifest/manifest-verify.action.ts b/src/manifest/manifest-verify.action.ts
@@ -4,11 +4,15 @@ import { ManifestVerifyOptions } from "./manifest-verify.options";
 import { X509Certificate } from "node:crypto";
 import { readFile } from "fs/promises";
 import { createVerify } from "crypto";
+import { assertFileExists } from "../lib/file";
 
 export async function manifestVerifyAction(options: ManifestVerifyOptions) {
   // Read and validate the manifest.
   await readManifest(options.manifest);
 
+  await assertFileExists("Certificate file", options.certificateFile, "Check --certificate-file option.");
+  await assertFileExists("Signature file", options.signatureFile, "Check --signature-file option.");
+
   // Read manifest buffer.
   const manifestBuffer = await readFile(options.manifest);
   const manifestBase64 = manifestBuffer.toString("base64");