Mirror/CyberChef
1
0
Fork 0
mirror of https://github.com/gchq/CyberChef.git synced 2024-11-02 14:11:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

ESM: Changed thrown errors to OperationErrors

Browse Source
This commit is contained in:
n1474335 2018-05-21 18:34:52 +00:00
parent cefe3fc542
commit 0d1e5311dc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/lib/PGP.mjs
View File

@ -10,6 +10,7 @@
*
*/
import OperationError from "../errors/OperationError";
import kbpgp from "kbpgp";
import promisifyDefault from "es6-promisify";
const promisify = promisifyDefault.promisify;
@ -86,12 +87,12 @@ export async function importPrivateKey(privateKey, passphrase) {
passphrase
});
} else {
throw "Did not provide passphrase with locked private key.";
throw new OperationError("Did not provide passphrase with locked private key.");
}
}
return key;
} catch (err) {
throw `Could not import private key: ${err}`;
throw new OperationError(`Could not import private key: ${err}`);
}
}
@ -111,6 +112,6 @@ export async function importPublicKey (publicKey) {
});
return key;
} catch (err) {
throw `Could not import public key: ${err}`;
throw new OperationError(`Could not import public key: ${err}`);
}
}

3
src/core/operations/BcryptParse.mjs
View File

@ -5,6 +5,7 @@
*/
import Operation from "../Operation";
import OperationError from "../errors/OperationError";
import bcrypt from "bcryptjs";
/**
@ -38,7 +39,7 @@ Salt: ${bcrypt.getSalt(input)}
Password hash: ${input.split(bcrypt.getSalt(input))[1]}
Full hash: ${input}`;
} catch (err) {
return "Error: " + err.toString();
throw new OperationError("Error: " + err.toString());
}
}