Handle key decryption errors

openpgpjs · Jul 5, 2024 · 3f196f9 · 3f196f9
1 parent aad40cd
commit 3f196f9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/commands/decrypt.js b/src/commands/decrypt.js
@@ -2,7 +2,7 @@ const openpgp = require('../initOpenpgp');
 const fs = require('fs');
 const process = require('process');
 const utils = require('../utils');
-const { CANNOT_DECRYPT, BAD_DATA } = require('../errorCodes');
+const { CANNOT_DECRYPT, BAD_DATA, KEY_IS_PROTECTED } = require('../errorCodes');
 
 const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith, verificationsOut, keyfiles, withKeyPassword) => {
   const encrypted = await utils.read_stdin();
@@ -63,7 +63,12 @@ const decrypt = async (withPassword, sessionKeyOut, withSessionKey, verifyWith,
     decryptionKeys = await Promise.all(decryptionKeys.map(privateKey => openpgp.decryptKey({
       privateKey,
       passphrase: [keyPassword, keyPassword.trimEnd()]
-    })));
+    }))).catch((e) => {
+      // TODO: Only error on key decryption failure if we can't decrypt
+      // the message with another key (or password or session key).
+      console.error(e.message);
+      process.exit(KEY_IS_PROTECTED);
+    });
   }
 
   const decryptedSessionKeys = await openpgp.decryptSessionKeys({

diff --git a/src/errorCodes.js b/src/errorCodes.js
@@ -3,6 +3,7 @@ module.exports = {
   CERT_CANNOT_ENCRYPT: 17,
   CANNOT_DECRYPT: 29,
   BAD_DATA: 41,
+  KEY_IS_PROTECTED: 67,
   KEY_CANNOT_SIGN: 79,
   UNSUPPORTED_PROFILE: 89
 };