Merge branch 'master' of github.com:gchq/CyberChef into node-lib

tests/lib/TestRegister.mjs

@@ -48,7 +48,6 @@ class TestRegister {
      * Runs all the tests in the register.
      */
     runTests () {
-        console.log("run tests");
         return Promise.all(
             this.tests.map(function(test, i) {
                 const chef = new Chef();

tests/node/tests/File.mjs

@@ -2,7 +2,8 @@ import assert from "assert";
 import it from "../assertionHandler";
 import TestRegister from "../../lib/TestRegister";
 import File from "../../../src/node/File";
-import {zip} from "../../../src/node/index";
+import {zip, Dish} from "../../../src/node/index";
+import { DishBigNumber } from "../../../src/core/dishTranslationTypes/index.mjs";
 
 TestRegister.addApiTests([
     it("File: should exist", () => {
@@ -31,4 +32,52 @@ TestRegister.addApiTests([
         const file =  new File([uint8Array], "sample.txt");
         assert.strictEqual(file.type, "application/unknown");
     }),
+
+    it("File: should be able to make a dish from it", () => {
+        const uint8Array = new Uint8Array(Buffer.from("hello"));
+        const file =  new File([uint8Array], "sample.txt");
+        try {
+            const dish = new Dish(file, 7);
+            assert.ok(dish.valid());
+        } catch (e) {
+            assert.fail(e.message);
+        }
+    }),
+
+    it("File: should allow dish to translate to ArrayBuffer", () => {
+        const uint8Array = new Uint8Array(Buffer.from("hello"));
+        const file =  new File([uint8Array], "sample.txt");
+        try {
+            const dish = new Dish(file, 7);
+            assert.ok(dish.value);
+
+            dish.get(4);
+            assert.strictEqual(dish.type, 4);
+            assert.ok(dish.valid());
+
+        } catch (e) {
+            assert.fail(e.message);
+        }
+    }),
+
+    it("File: should allow dish to translate from ArrayBuffer to File", () => {
+        const uint8Array = new Uint8Array(Buffer.from("hello"));
+        const file =  new File([uint8Array], "sample.txt");
+        try {
+            const dish = new Dish(file, 7);
+            assert.ok(dish.value);
+
+            // translate to ArrayBuffer
+            dish.get(4);
+            assert.ok(dish.valid());
+
+            // translate back to File
+            dish.get(7);
+            assert.ok(dish.valid());
+
+        } catch (e) {
+            assert.fail(e.message);
+        }
+    })
+
 ]);

tests/node/tests/nodeApi.mjs

@@ -400,8 +400,8 @@ TestRegister.addApiTests([
     }),
 
     it("Operation arguments: should be accessible from operation object if op has array arg", () => {
-        assert.ok(chef.toCharcode.argOptions);
-        assert.deepEqual(chef.unzip.argOptions, {
+        assert.ok(chef.toCharcode.args);
+        assert.deepEqual(chef.unzip.args, {
             password: {
                 type: "binaryString",
                 value: "",
@@ -414,20 +414,20 @@ TestRegister.addApiTests([
     }),
 
     it("Operation arguments: should have key for each argument in operation", () => {
-        assert.ok(chef.convertDistance.argOptions.inputUnits);
-        assert.ok(chef.convertDistance.argOptions.outputUnits);
+        assert.ok(chef.convertDistance.args.inputUnits);
+        assert.ok(chef.convertDistance.args.outputUnits);
 
-        assert.strictEqual(chef.bitShiftRight.argOptions.amount.type, "number");
-        assert.strictEqual(chef.bitShiftRight.argOptions.amount.value, 1);
-        assert.strictEqual(chef.bitShiftRight.argOptions.type.type, "option");
-        assert.ok(Array.isArray(chef.bitShiftRight.argOptions.type.options));
+        assert.strictEqual(chef.bitShiftRight.args.amount.type, "number");
+        assert.strictEqual(chef.bitShiftRight.args.amount.value, 1);
+        assert.strictEqual(chef.bitShiftRight.args.type.type, "option");
+        assert.ok(Array.isArray(chef.bitShiftRight.args.type.options));
 
     }),
 
     it("Operation arguments: should list all options excluding subheadings", () => {
         // First element (subheading) removed
-        assert.equal(chef.convertDistance.argOptions.inputUnits.options[0], "Nanometres (nm)");
-        assert.equal(chef.defangURL.argOptions.process.options[1], "Only full URLs");
+        assert.equal(chef.convertDistance.args.inputUnits.options[0], "Nanometres (nm)");
+        assert.equal(chef.defangURL.args.process.options[1], "Only full URLs");
     })
 
 ]);

tests/operations/index.mjs

@@ -10,7 +10,6 @@
  * @copyright Crown Copyright 2017
  * @license Apache-2.0
  */
-import "babel-polyfill";
 
 import {
     setLongTestFailure,
@@ -38,6 +37,7 @@ import "./tests/BitwiseOp";
 import "./tests/ByteRepr";
 import "./tests/CartesianProduct";
 import "./tests/CharEnc";
+import "./tests/Charts";
 import "./tests/Checksum";
 import "./tests/Ciphers";
 import "./tests/Code";
@@ -92,6 +92,8 @@ import "./tests/Enigma";
 import "./tests/Bombe";
 import "./tests/MultipleBombe";
 import "./tests/Typex";
+import "./tests/BLAKE2b";
+import "./tests/BLAKE2s";
 
 // Cannot test operations that use the File type yet
 //import "./tests/SplitColourChannels";

tests/operations/tests/BLAKE2b.mjs

@@ -0,0 +1,56 @@
+/**
+ * BitwiseOp tests
+ *
+ * @author h345983745
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+import TestRegister from "../TestRegister";
+
+TestRegister.addTests([
+    {
+        name: "BLAKE2b: 512 - Hello World",
+        input: "Hello World",
+        expectedOutput: "4386a08a265111c9896f56456e2cb61a64239115c4784cf438e36cc851221972da3fb0115f73cd02486254001f878ab1fd126aac69844ef1c1ca152379d0a9bd",
+        recipeConfig: [
+            { "op": "BLAKE2b",
+                "args": ["512", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2b: 384 - Hello World",
+        input: "Hello World",
+        expectedOutput: "4d388e82ca8f866e606b6f6f0be910abd62ad6e98c0adfc27cf35acf948986d5c5b9c18b6f47261e1e679eb98edf8e2d",
+        recipeConfig: [
+            { "op": "BLAKE2b",
+                "args": ["384", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2b: 256 - Hello World",
+        input: "Hello World",
+        expectedOutput: "1dc01772ee0171f5f614c673e3c7fa1107a8cf727bdf5a6dadb379e93c0d1d00",
+        recipeConfig: [
+            { "op": "BLAKE2b",
+                "args": ["256", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2b: 160 - Hello World",
+        input: "Hello World",
+        expectedOutput: "6a8489e6fd6e51fae12ab271ec7fc8134dd5d737",
+        recipeConfig: [
+            { "op": "BLAKE2b",
+                "args": ["160", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2b: Key Test",
+        input: "message data",
+        expectedOutput: "3d363ff7401e02026f4a4687d4863ced",
+        recipeConfig: [
+            { "op": "BLAKE2b",
+                "args": ["128", "Hex", {string: "pseudorandom key", option: "UTF8"}] }
+        ]
+    }
+]);

tests/operations/tests/BLAKE2s.mjs

@@ -0,0 +1,47 @@
+/**
+ * BitwiseOp tests
+ *
+ * @author h345983745
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+import TestRegister from "../TestRegister";
+
+TestRegister.addTests([
+    {
+        name: "BLAKE2s: 256 - Hello World",
+        input: "Hello World",
+        expectedOutput: "7706af019148849e516f95ba630307a2018bb7bf03803eca5ed7ed2c3c013513",
+        recipeConfig: [
+            { "op": "BLAKE2s",
+                "args": ["256", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2s: 160 - Hello World",
+        input: "Hello World",
+        expectedOutput: "0e4fcfc2ee0097ac1d72d70b595a39e09a3c7c7e",
+        recipeConfig: [
+            { "op": "BLAKE2s",
+                "args": ["160", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2s: 128 - Hello World",
+        input: "Hello World",
+        expectedOutput: "9964ee6f36126626bf864363edfa96f6",
+        recipeConfig: [
+            { "op": "BLAKE2s",
+                "args": ["128", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    },
+    {
+        name: "BLAKE2s: Key Test",
+        input: "Hello World",
+        expectedOutput: "9964ee6f36126626bf864363edfa96f6",
+        recipeConfig: [
+            { "op": "BLAKE2s",
+                "args": ["128", "Hex", {string: "", option: "UTF8"}] }
+        ]
+    }
+]);

tests/operations/tests/Charts.mjs

@@ -0,0 +1,55 @@
+/**
+ * Chart tests.
+ *
+ * @author Matt C [me@mitt.dev]
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+import TestRegister from "../TestRegister";
+
+TestRegister.addTests([
+    {
+        name: "Scatter chart",
+        input: "100 100\n200 200\n300 300\n400 400\n500 500",
+        expectedMatch: /^<svg width/,
+        recipeConfig: [
+            {
+                "op": "Scatter chart",
+                "args": ["Line feed", "Space", false, "time", "stress", "black", 5, false]
+            }
+        ],
+    },
+    {
+        name: "Hex density chart",
+        input: "100 100\n200 200\n300 300\n400 400\n500 500",
+        expectedMatch: /^<svg width/,
+        recipeConfig: [
+            {
+                "op": "Hex Density chart",
+                "args": ["Line feed", "Space", 25, 15, true, "", "", true, "white", "black", true]
+            }
+        ],
+    },
+    {
+        name: "Series chart",
+        input: "100 100 100\n200 200 200\n300 300 300\n400 400 400\n500 500 500",
+        expectedMatch: /^<svg width/,
+        recipeConfig: [
+            {
+                "op": "Series chart",
+                "args": ["Line feed", "Space", "", 1, "mediumseagreen, dodgerblue, tomato"]
+            }
+        ],
+    },
+    {
+        name: "Heatmap chart",
+        input: "100 100\n200 200\n300 300\n400 400\n500 500",
+        expectedMatch: /^<svg width/,
+        recipeConfig: [
+            {
+                "op": "Heatmap chart",
+                "args": ["Line feed", "Space", 25, 25, true, "", "", false, "white", "black"]
+            }
+        ],
+    },
+]);