Updated dependencies

master
n1474335 2019-01-01 19:19:07 +00:00
parent 0cea56dc62
commit d469fb9c58
6 changed files with 913 additions and 695 deletions

1550
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -30,18 +30,18 @@
"main": "build/node/CyberChef.js", "main": "build/node/CyberChef.js",
"bugs": "https://github.com/gchq/CyberChef/issues", "bugs": "https://github.com/gchq/CyberChef/issues",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.1.5", "@babel/core": "^7.2.2",
"@babel/preset-env": "^7.1.5", "@babel/preset-env": "^7.2.3",
"autoprefixer": "^9.3.1", "autoprefixer": "^9.4.3",
"babel-loader": "^8.0.4", "babel-loader": "^8.0.4",
"bootstrap": "^4.1.3", "bootstrap": "^4.2.1",
"chromedriver": "^2.45.0", "chromedriver": "^2.45.0",
"colors": "^1.3.2", "colors": "^1.3.3",
"css-loader": "^1.0.1", "css-loader": "^2.1.0",
"eslint": "^5.8.0", "eslint": "^5.11.1",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"extract-text-webpack-plugin": "^4.0.0-alpha0", "extract-text-webpack-plugin": "^4.0.0-alpha0",
"file-loader": "^2.0.0", "file-loader": "^3.0.1",
"grunt": "^1.0.3", "grunt": "^1.0.3",
"grunt-accessibility": "~6.0.0", "grunt-accessibility": "~6.0.0",
"grunt-chmod": "~1.1.1", "grunt-chmod": "~1.1.1",
@ -58,8 +58,8 @@
"imports-loader": "^0.8.0", "imports-loader": "^0.8.0",
"ink-docstrap": "^1.3.2", "ink-docstrap": "^1.3.2",
"jsdoc-babel": "^0.5.0", "jsdoc-babel": "^0.5.0",
"nightwatch": "^1.0.17", "nightwatch": "^1.0.18",
"node-sass": "^4.10.0", "node-sass": "^4.11.0",
"postcss-css-variables": "^0.11.0", "postcss-css-variables": "^0.11.0",
"postcss-import": "^12.0.1", "postcss-import": "^12.0.1",
"postcss-loader": "^3.0.0", "postcss-loader": "^3.0.0",
@ -69,9 +69,9 @@
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"url-loader": "^1.1.2", "url-loader": "^1.1.2",
"web-resource-inliner": "^4.2.1", "web-resource-inliner": "^4.2.1",
"webpack": "^4.25.1", "webpack": "^4.28.3",
"webpack-bundle-analyzer": "^3.0.3", "webpack-bundle-analyzer": "^3.0.3",
"webpack-dev-server": "^3.1.10", "webpack-dev-server": "^3.1.14",
"webpack-node-externals": "^1.7.2", "webpack-node-externals": "^1.7.2",
"worker-loader": "^2.0.0" "worker-loader": "^2.0.0"
}, },
@ -83,7 +83,7 @@
"bignumber.js": "^8.0.1", "bignumber.js": "^8.0.1",
"bootstrap-colorpicker": "^2.5.3", "bootstrap-colorpicker": "^2.5.3",
"bootstrap-material-design": "^4.1.1", "bootstrap-material-design": "^4.1.1",
"bson": "^3.0.2", "bson": "^4.0.1",
"chi-squared": "^1.1.0", "chi-squared": "^1.1.0",
"crypto-api": "^0.8.3", "crypto-api": "^0.8.3",
"crypto-js": "^3.1.9-1", "crypto-js": "^3.1.9-1",
@ -94,35 +94,35 @@
"esmangle": "^1.0.1", "esmangle": "^1.0.1",
"esprima": "^4.0.1", "esprima": "^4.0.1",
"exif-parser": "^0.1.12", "exif-parser": "^0.1.12",
"file-saver": "^2.0.0-rc.4", "file-saver": "^2.0.0",
"highlight.js": "^9.13.1", "highlight.js": "^9.13.1",
"jimp": "^0.6.0", "jimp": "^0.6.0",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"js-crc": "^0.2.0", "js-crc": "^0.2.0",
"js-sha3": "^0.8.0", "js-sha3": "^0.8.0",
"jsesc": "^2.5.1", "jsesc": "^2.5.2",
"jsonpath": "^1.0.0", "jsonpath": "^1.0.0",
"jsonwebtoken": "^8.3.0", "jsonwebtoken": "^8.4.0",
"jsqr": "^1.1.1", "jsqr": "^1.1.1",
"jsrsasign": "8.0.12", "jsrsasign": "8.0.12",
"kbpgp": "^2.0.82", "kbpgp": "^2.0.82",
"lodash": "^4.17.11", "lodash": "^4.17.11",
"loglevel": "^1.6.1", "loglevel": "^1.6.1",
"loglevel-message-prefix": "^3.0.0", "loglevel-message-prefix": "^3.0.0",
"moment": "^2.22.2", "moment": "^2.23.0",
"moment-timezone": "^0.5.23", "moment-timezone": "^0.5.23",
"ngeohash": "^0.6.0", "ngeohash": "^0.6.3",
"node-forge": "^0.7.6", "node-forge": "^0.7.6",
"node-md6": "^0.1.0", "node-md6": "^0.1.0",
"notepack.io": "^2.1.3", "notepack.io": "^2.2.0",
"nwmatcher": "^1.4.4", "nwmatcher": "^1.4.4",
"otp": "^0.1.3", "otp": "^0.1.3",
"popper.js": "^1.14.4", "popper.js": "^1.14.6",
"qr-image": "^3.2.0", "qr-image": "^3.2.0",
"scryptsy": "^2.0.0", "scryptsy": "^2.0.0",
"snackbarjs": "^1.1.0", "snackbarjs": "^1.1.0",
"sortablejs": "^1.7.0", "sortablejs": "^1.8.0-rc1",
"split.js": "^1.5.9", "split.js": "^1.5.10",
"ssdeep.js": "0.0.2", "ssdeep.js": "0.0.2",
"ua-parser-js": "^0.7.19", "ua-parser-js": "^0.7.19",
"utf8": "^3.0.0", "utf8": "^3.0.0",

View File

@ -5,7 +5,7 @@
*/ */
import Operation from "../Operation"; import Operation from "../Operation";
import bsonjs from "bson"; import bson from "bson";
import OperationError from "../errors/OperationError"; import OperationError from "../errors/OperationError";
/** /**
@ -36,8 +36,6 @@ class BSONDeserialise extends Operation {
run(input, args) { run(input, args) {
if (!input.byteLength) return ""; if (!input.byteLength) return "";
const bson = new bsonjs();
try { try {
const data = bson.deserialize(new Buffer(input)); const data = bson.deserialize(new Buffer(input));
return JSON.stringify(data, null, 2); return JSON.stringify(data, null, 2);

View File

@ -5,7 +5,7 @@
*/ */
import Operation from "../Operation"; import Operation from "../Operation";
import bsonjs from "bson"; import bson from "bson";
import OperationError from "../errors/OperationError"; import OperationError from "../errors/OperationError";
/** /**
@ -36,8 +36,6 @@ class BSONSerialise extends Operation {
run(input, args) { run(input, args) {
if (!input) return new ArrayBuffer(); if (!input) return new ArrayBuffer();
const bson = new bsonjs();
try { try {
const data = JSON.parse(input); const data = JSON.parse(input);
return bson.serialize(data).buffer; return bson.serialize(data).buffer;

View File

@ -38,7 +38,9 @@ class ToMessagePack extends Operation {
if (ENVIRONMENT_IS_WORKER()) { if (ENVIRONMENT_IS_WORKER()) {
return notepack.encode(input); return notepack.encode(input);
} else { } else {
return notepack.encode(input).buffer; const res = notepack.encode(input);
// Safely convert from Node Buffer to ArrayBuffer using the correct view of the data
return (new Uint8Array(res)).buffer;
} }
} catch (err) { } catch (err) {
throw new OperationError(`Could not encode JSON to MessagePack: ${err}`); throw new OperationError(`Could not encode JSON to MessagePack: ${err}`);

View File

@ -15,7 +15,7 @@
width: 100%; width: 100%;
height: var(--controls-height); height: var(--controls-height);
bottom: 0; bottom: 0;
padding: 10px; padding: 0;
padding-top: 12px; padding-top: 12px;
border-top: 1px solid var(--primary-border-colour); border-top: 1px solid var(--primary-border-colour);
background-color: var(--secondary-background-colour); background-color: var(--secondary-background-colour);