cyberchef 9.34.2 → 9.36.1

package/src/core/operations/FromBase45.mjs

@@ -0,0 +1,89 @@
+/**
+ * @author Thomas Weißschuh [thomas@t-8ch.de]
+ * @copyright Crown Copyright 2021
+ * @license Apache-2.0
+ */
+
+import {ALPHABET, highlightToBase45, highlightFromBase45} from "../lib/Base45.mjs";
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+import Utils from "../Utils.mjs";
+
+
+/**
+ * From Base45 operation
+ */
+class FromBase45 extends Operation {
+
+    /**
+     * FromBase45 constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "From Base45";
+        this.module = "Default";
+        this.description = "Base45 is a notation for encoding arbitrary byte data using a restricted set of symbols that can be conveniently used by humans and processed by computers. The high number base results in shorter strings than with the decimal or hexadecimal system. Base45 is optimized for usage with QR codes.";
+        this.infoURL = "https://wikipedia.org/wiki/List_of_numeral_systems";
+        this.inputType = "string";
+        this.outputType = "byteArray";
+        this.args = [
+            {
+                name: "Alphabet",
+                type: "string",
+                value: ALPHABET
+            }
+        ];
+
+        this.highlight = highlightFromBase45;
+        this.highlightReverse = highlightToBase45;
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {byteArray}
+     */
+    run(input, args) {
+        if (!input) return [];
+        const alphabet = Utils.expandAlphRange(args[0]);
+
+        const res = [];
+
+        for (const triple of Utils.chunked(input, 3)) {
+            triple.reverse();
+            let b = 0;
+            for (const c of triple) {
+                const idx = alphabet.indexOf(c);
+                if (idx === -1) {
+                    throw new OperationError(`Character not in alphabet: '${c}'`);
+                }
+                b *= 45;
+                b += idx;
+            }
+
+            if (b > 65535) {
+                throw new OperationError(`Triplet too large: '${triple.join("")}'`);
+            }
+
+            if (triple.length > 2) {
+                /**
+                 * The last triple may only have 2 bytes so we push the MSB when we got 3 bytes
+                 * Pushing MSB
+                 */
+                res.push(b >> 8);
+            }
+
+            /**
+             * Pushing LSB
+             */
+            res.push(b & 0xff);
+
+        }
+
+        return res;
+    }
+
+}
+
+export default FromBase45;

package/src/core/operations/GetAllCasings.mjs

@@ -46,7 +46,7 @@ class GetAllCasings extends Operation {
             }
             result += temp.join("") + "\n";
         }
-        return result;
+        return result.slice(0, -1);
     }
 }
 

package/src/core/operations/Lorenz.mjs

@@ -1,6 +1,9 @@
 /**
  * Emulation of the Lorenz SZ40/42a/42b cipher attachment.
  *
+ * Tested against the Colossus Rebuild at Bletchley Park's TNMOC
+ * using a variety of inputs and settings to confirm correctness.
+ *
  * @author VirtualColossus [martin@virtualcolossus.co.uk]
  * @copyright Crown Copyright 2019
  * @license Apache-2.0

package/src/core/operations/SIGABA.mjs

@@ -0,0 +1,287 @@
+/**
+ * Emulation of the SIGABA machine.
+ *
+ * @author hettysymes
+ * @copyright hettysymes 2020
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import {LETTERS} from "../lib/Enigma.mjs";
+import {NUMBERS, CR_ROTORS, I_ROTORS, SigabaMachine, CRRotor, IRotor} from "../lib/SIGABA.mjs";
+
+/**
+ * Sigaba operation
+ */
+class Sigaba extends Operation {
+
+    /**
+     * Sigaba constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "SIGABA";
+        this.module = "Bletchley";
+        this.description = "Encipher/decipher with the WW2 SIGABA machine. <br><br>SIGABA, otherwise known as ECM Mark II, was used by the United States for message encryption during WW2 up to the 1950s. It was developed in the 1930s by the US Army and Navy, and has up to this day never been broken. Consisting of 15 rotors: 5 cipher rotors and 10 rotors (5 control rotors and 5 index rotors) controlling the stepping of the cipher rotors, the rotor stepping for SIGABA is much more complex than other rotor machines of its time, such as Enigma. All example rotor wirings are random example sets.<br><br>To configure rotor wirings, for the cipher and control rotors enter a string of letters which map from A to Z, and for the index rotors enter a sequence of numbers which map from 0 to 9. Note that encryption is not the same as decryption, so first choose the desired mode. <br><br> Note: Whilst this has been tested against other software emulators, it has not been tested against hardware.";
+        this.infoURL = "https://wikipedia.org/wiki/SIGABA";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [
+            {
+                name: "1st (left-hand) cipher rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "1st cipher rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "1st cipher rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "2nd cipher rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "2nd cipher rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "2nd cipher rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "3rd (middle) cipher rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "3rd cipher rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "3rd cipher rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "4th cipher rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "4th cipher rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "4th cipher rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "5th (right-hand) cipher rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "5th cipher rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "5th cipher rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "1st (left-hand) control rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "1st control rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "1st control rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "2nd control rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "2nd control rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "2nd control rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "3rd (middle) control rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "3rd control rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "3rd control rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "4th control rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "4th control rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "4th control rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "5th (right-hand) control rotor",
+                type: "editableOption",
+                value: CR_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "5th control rotor reversed",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "5th control rotor intial value",
+                type: "option",
+                value: LETTERS
+            },
+            {
+                name: "1st (left-hand) index rotor",
+                type: "editableOption",
+                value: I_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "1st index rotor intial value",
+                type: "option",
+                value: NUMBERS
+            },
+            {
+                name: "2nd index rotor",
+                type: "editableOption",
+                value: I_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "2nd index rotor intial value",
+                type: "option",
+                value: NUMBERS
+            },
+            {
+                name: "3rd (middle) index rotor",
+                type: "editableOption",
+                value: I_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "3rd index rotor intial value",
+                type: "option",
+                value: NUMBERS
+            },
+            {
+                name: "4th index rotor",
+                type: "editableOption",
+                value: I_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "4th index rotor intial value",
+                type: "option",
+                value: NUMBERS
+            },
+            {
+                name: "5th (right-hand) index rotor",
+                type: "editableOption",
+                value: I_ROTORS,
+                defaultIndex: 0
+            },
+            {
+                name: "5th index rotor intial value",
+                type: "option",
+                value: NUMBERS
+            },
+            {
+                name: "SIGABA mode",
+                type: "option",
+                value: ["Encrypt", "Decrypt"]
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        const sigabaSwitch = args[40];
+        const cipherRotors = [];
+        const controlRotors = [];
+        const indexRotors = [];
+        for (let i=0; i<5; i++) {
+            const rotorWiring = args[i*3];
+            cipherRotors.push(new CRRotor(rotorWiring, args[i*3+2], args[i*3+1]));
+        }
+        for (let i=5; i<10; i++) {
+            const rotorWiring = args[i*3];
+            controlRotors.push(new CRRotor(rotorWiring, args[i*3+2], args[i*3+1]));
+        }
+        for (let i=15; i<20; i++) {
+            const rotorWiring = args[i*2];
+            indexRotors.push(new IRotor(rotorWiring, args[i*2+1]));
+        }
+        const sigaba = new SigabaMachine(cipherRotors, controlRotors, indexRotors);
+        let result;
+        if (sigabaSwitch === "Encrypt") {
+            result = sigaba.encrypt(input);
+        } else if (sigabaSwitch === "Decrypt") {
+            result = sigaba.decrypt(input);
+        }
+        return result;
+    }
+
+}
+export default Sigaba;

package/src/core/operations/ScatterChart.mjs

@@ -87,7 +87,7 @@ class ScatterChart extends Operation {
         const recordDelimiter = Utils.charRep(args[0]),
             fieldDelimiter = Utils.charRep(args[1]),
             columnHeadingsAreIncluded = args[2],
-            fillColour = args[5],
+            fillColour = Utils.escapeHtml(args[5]),
             radius = args[6],
             colourInInput = args[7],
             dimension = 500;

package/src/core/operations/SeriesChart.mjs

@@ -72,7 +72,10 @@ class SeriesChart extends Operation {
             fieldDelimiter = Utils.charRep(args[1]),
             xLabel = args[2],
             pipRadius = args[3],
-            seriesColours = args[4].split(","),
+            // Escape HTML from all colours to prevent reflected XSS. See https://github.com/gchq/CyberChef/issues/1265
+            seriesColours = args[4].split(",").map((colour) => {
+                return Utils.escapeHtml(colour);
+            }),
             svgWidth = 500,
             interSeriesPadding = 20,
             xAxisHeight = 50,

package/src/core/operations/ToBase45.mjs

@@ -0,0 +1,78 @@
+/**
+ * @author Thomas Weißschuh [thomas@t-8ch.de]
+ * @copyright Crown Copyright 2021
+ * @license Apache-2.0
+ */
+
+import {ALPHABET, highlightToBase45, highlightFromBase45} from "../lib/Base45.mjs";
+import Operation from "../Operation.mjs";
+import Utils from "../Utils.mjs";
+
+/**
+ * To Base45 operation
+ */
+class ToBase45 extends Operation {
+
+    /**
+     * ToBase45 constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "To Base45";
+        this.module = "Default";
+        this.description = "Base45 is a notation for encoding arbitrary byte data using a restricted set of symbols that can be conveniently used by humans and processed by computers. The high number base results in shorter strings than with the decimal or hexadecimal system. Base45 is optimized for usage with QR codes.";
+        this.infoURL = "https://wikipedia.org/wiki/List_of_numeral_systems";
+        this.inputType = "ArrayBuffer";
+        this.outputType = "string";
+        this.args = [
+            {
+                name: "Alphabet",
+                type: "string",
+                value: ALPHABET
+            }
+        ];
+
+        this.highlight = highlightToBase45;
+        this.highlightReverse = highlightFromBase45;
+    }
+
+    /**
+     * @param {ArrayBuffer} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        input = new Uint8Array(input);
+        const alphabet = Utils.expandAlphRange(args[0]);
+        if (!input) return "";
+
+        const res = [];
+
+        for (const pair of Utils.chunked(input, 2)) {
+            let b = 0;
+            for (const e of pair) {
+                b *= 256;
+                b += e;
+            }
+
+            let chars = 0;
+            do {
+                res.push(alphabet[b % 45]);
+                chars++;
+                b = Math.floor(b / 45);
+            } while (b > 0);
+
+            if (chars < 2) {
+                res.push("0");
+            }
+        }
+
+
+        return res.join("");
+
+    }
+
+}
+
+export default ToBase45;

package/src/core/operations/Typex.mjs

@@ -1,6 +1,9 @@
 /**
  * Emulation of the Typex machine.
  *
+ * Tested against a genuine Typex machine using a variety of inputs
+ * and settings to confirm correctness.
+ *
  * @author s2224834
  * @copyright Crown Copyright 2019
  * @license Apache-2.0

package/src/core/operations/index.mjs

@@ -120,6 +120,7 @@ import FrequencyDistribution from "./FrequencyDistribution.mjs";
 import FromBCD from "./FromBCD.mjs";
 import FromBase from "./FromBase.mjs";
 import FromBase32 from "./FromBase32.mjs";
+import FromBase45 from "./FromBase45.mjs";
 import FromBase58 from "./FromBase58.mjs";
 import FromBase62 from "./FromBase62.mjs";
 import FromBase64 from "./FromBase64.mjs";
@@ -274,6 +275,7 @@ import SHA0 from "./SHA0.mjs";
 import SHA1 from "./SHA1.mjs";
 import SHA2 from "./SHA2.mjs";
 import SHA3 from "./SHA3.mjs";
+import SIGABA from "./SIGABA.mjs";
 import SM3 from "./SM3.mjs";
 import SQLBeautify from "./SQLBeautify.mjs";
 import SQLMinify from "./SQLMinify.mjs";
@@ -315,6 +317,7 @@ import TextEncodingBruteForce from "./TextEncodingBruteForce.mjs";
 import ToBCD from "./ToBCD.mjs";
 import ToBase from "./ToBase.mjs";
 import ToBase32 from "./ToBase32.mjs";
+import ToBase45 from "./ToBase45.mjs";
 import ToBase58 from "./ToBase58.mjs";
 import ToBase62 from "./ToBase62.mjs";
 import ToBase64 from "./ToBase64.mjs";
@@ -487,6 +490,7 @@ export {
     FromBCD,
     FromBase,
     FromBase32,
+    FromBase45,
     FromBase58,
     FromBase62,
     FromBase64,
@@ -641,6 +645,7 @@ export {
     SHA1,
     SHA2,
     SHA3,
+    SIGABA,
     SM3,
     SQLBeautify,
     SQLMinify,
@@ -682,6 +687,7 @@ export {
     ToBCD,
     ToBase,
     ToBase32,
+    ToBase45,
     ToBase58,
     ToBase62,
     ToBase64,

package/src/node/index.mjs

@@ -127,6 +127,7 @@ import {
     FromBCD as core_FromBCD,
     FromBase as core_FromBase,
     FromBase32 as core_FromBase32,
+    FromBase45 as core_FromBase45,
     FromBase58 as core_FromBase58,
     FromBase62 as core_FromBase62,
     FromBase64 as core_FromBase64,
@@ -275,6 +276,7 @@ import {
     SHA1 as core_SHA1,
     SHA2 as core_SHA2,
     SHA3 as core_SHA3,
+    SIGABA as core_SIGABA,
     SM3 as core_SM3,
     SQLBeautify as core_SQLBeautify,
     SQLMinify as core_SQLMinify,
@@ -315,6 +317,7 @@ import {
     ToBCD as core_ToBCD,
     ToBase as core_ToBase,
     ToBase32 as core_ToBase32,
+    ToBase45 as core_ToBase45,
     ToBase58 as core_ToBase58,
     ToBase62 as core_ToBase62,
     ToBase64 as core_ToBase64,
@@ -494,6 +497,7 @@ function generateChef() {
         "fromBCD": _wrap(core_FromBCD),
         "fromBase": _wrap(core_FromBase),
         "fromBase32": _wrap(core_FromBase32),
+        "fromBase45": _wrap(core_FromBase45),
         "fromBase58": _wrap(core_FromBase58),
         "fromBase62": _wrap(core_FromBase62),
         "fromBase64": _wrap(core_FromBase64),
@@ -642,6 +646,7 @@ function generateChef() {
         "SHA1": _wrap(core_SHA1),
         "SHA2": _wrap(core_SHA2),
         "SHA3": _wrap(core_SHA3),
+        "SIGABA": _wrap(core_SIGABA),
         "SM3": _wrap(core_SM3),
         "SQLBeautify": _wrap(core_SQLBeautify),
         "SQLMinify": _wrap(core_SQLMinify),
@@ -682,6 +687,7 @@ function generateChef() {
         "toBCD": _wrap(core_ToBCD),
         "toBase": _wrap(core_ToBase),
         "toBase32": _wrap(core_ToBase32),
+        "toBase45": _wrap(core_ToBase45),
         "toBase58": _wrap(core_ToBase58),
         "toBase62": _wrap(core_ToBase62),
         "toBase64": _wrap(core_ToBase64),
@@ -872,6 +878,7 @@ const frequencyDistribution = chef.frequencyDistribution;
 const fromBCD = chef.fromBCD;
 const fromBase = chef.fromBase;
 const fromBase32 = chef.fromBase32;
+const fromBase45 = chef.fromBase45;
 const fromBase58 = chef.fromBase58;
 const fromBase62 = chef.fromBase62;
 const fromBase64 = chef.fromBase64;
@@ -1026,6 +1033,7 @@ const SHA0 = chef.SHA0;
 const SHA1 = chef.SHA1;
 const SHA2 = chef.SHA2;
 const SHA3 = chef.SHA3;
+const SIGABA = chef.SIGABA;
 const SM3 = chef.SM3;
 const SQLBeautify = chef.SQLBeautify;
 const SQLMinify = chef.SQLMinify;
@@ -1067,6 +1075,7 @@ const textEncodingBruteForce = chef.textEncodingBruteForce;
 const toBCD = chef.toBCD;
 const toBase = chef.toBase;
 const toBase32 = chef.toBase32;
+const toBase45 = chef.toBase45;
 const toBase58 = chef.toBase58;
 const toBase62 = chef.toBase62;
 const toBase64 = chef.toBase64;
@@ -1241,6 +1250,7 @@ const operations = [
     fromBCD,
     fromBase,
     fromBase32,
+    fromBase45,
     fromBase58,
     fromBase62,
     fromBase64,
@@ -1395,6 +1405,7 @@ const operations = [
     SHA1,
     SHA2,
     SHA3,
+    SIGABA,
     SM3,
     SQLBeautify,
     SQLMinify,
@@ -1436,6 +1447,7 @@ const operations = [
     toBCD,
     toBase,
     toBase32,
+    toBase45,
     toBase58,
     toBase62,
     toBase64,
@@ -1614,6 +1626,7 @@ export {
     fromBCD,
     fromBase,
     fromBase32,
+    fromBase45,
     fromBase58,
     fromBase62,
     fromBase64,
@@ -1768,6 +1781,7 @@ export {
     SHA1,
     SHA2,
     SHA3,
+    SIGABA,
     SM3,
     SQLBeautify,
     SQLMinify,
@@ -1809,6 +1823,7 @@ export {
     toBCD,
     toBase,
     toBase32,
+    toBase45,
     toBase58,
     toBase62,
     toBase64,

package/tests/operations/index.mjs

@@ -20,6 +20,7 @@ import TestRegister from "../lib/TestRegister.mjs";
 import "./tests/BCD.mjs";
 import "./tests/BSON.mjs";
 import "./tests/BaconCipher.mjs";
+import "./tests/Base45.mjs";
 import "./tests/Base58.mjs";
 import "./tests/Base64.mjs";
 import "./tests/Base62.mjs";
@@ -108,6 +109,8 @@ import "./tests/JA3Fingerprint.mjs";
 import "./tests/JA3SFingerprint.mjs";
 import "./tests/HASSH.mjs";
 import "./tests/GetAllCasings.mjs";
+import "./tests/SIGABA.mjs";
+
 
 // Cannot test operations that use the File type yet
 // import "./tests/SplitColourChannels.mjs";