explicitly reject on wrong password

q2s2t · Apr 6, 2017 · 1fe5755 · 1fe5755
1 parent d36e4d0
commit 1fe5755
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/lib/extract.js b/lib/extract.js
@@ -38,6 +38,12 @@ module.exports = function (archive, dest, options) {
       if (isUnsupportedMethod) {
         return reject(new Error('Unsupported Method'))
       }
+      let isWrongPassword = (data.search('Data Error in encrypted file. Wrong password?') != -1)
+        ? true
+        : false;
+      if (isWrongPassword) {
+        return reject(new Error('Data Error in encrypted file. Wrong password?'));
+      }
 
       data.split('\n').forEach(function (line) {
         if (line.substr(0, 12) === 'Extracting  ') {

diff --git a/lib/extractFull.js b/lib/extractFull.js
@@ -36,10 +36,15 @@ module.exports = function (archive, dest, options) {
         ? true
         : false;
       if (isUnsupportedMethod) {
-        return reject(new Error('Unsupported Method'))
+        return reject(new Error('Unsupported Method'));
+      }
+      let isWrongPassword = (data.search('Data Error in encrypted file. Wrong password?') != -1)
+        ? true
+        : false;
+      if (isWrongPassword) {
+        return reject(new Error('Data Error in encrypted file. Wrong password?'));
       }
 
-      var entries = [];
       data.split('\n').forEach(function (line) {
         if (line.substr(0, 12) === 'Extracting  ') {
           entries.push(line.substr(12, line.length).replace(path.sep, '/'));