cyberchef 9.49.1 → 9.50.0

package/CHANGELOG.md

@@ -13,6 +13,9 @@ All major and minor version changes will be documented in this file. Details of
 
 ## Details
 
+### [9.50.0] - 2022-11-25
+- Added 'Shuffle' operation [@mikecat] | [#1472]
+
 ### [9.49.0] - 2022-11-11
 - Added 'LZ4 Compress' and 'LZ4 Decompress' operations [@n1474335] | [31a7f83]
 
@@ -324,6 +327,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
+[9.50.0]: https://github.com/gchq/CyberChef/releases/tag/v9.50.0
 [9.49.0]: https://github.com/gchq/CyberChef/releases/tag/v9.49.0
 [9.48.0]: https://github.com/gchq/CyberChef/releases/tag/v9.48.0
 [9.47.0]: https://github.com/gchq/CyberChef/releases/tag/v9.47.0
@@ -568,4 +572,5 @@ All major and minor version changes will be documented in this file. Details of
 [#1308]: https://github.com/gchq/CyberChef/pull/1308
 [#1421]: https://github.com/gchq/CyberChef/pull/1421
 [#1427]: https://github.com/gchq/CyberChef/pull/1427
+[#1472]: https://github.com/gchq/CyberChef/pull/1472
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.49.1",
+  "version": "9.50.0",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

package/src/core/config/Categories.json

@@ -249,6 +249,7 @@
             "To Table",
             "Reverse",
             "Sort",
+            "Shuffle",
             "Unique",
             "Split",
             "Filter",

package/src/core/config/OperationConfig.json

@@ -12981,6 +12981,30 @@
             }
         ]
     },
+    "Shuffle": {
+        "module": "Default",
+        "description": "Randomly reorders input elements.",
+        "infoURL": "https://wikipedia.org/wiki/Shuffling",
+        "inputType": "string",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Delimiter",
+                "type": "option",
+                "value": [
+                    "Line feed",
+                    "CRLF",
+                    "Space",
+                    "Comma",
+                    "Semi-colon",
+                    "Colon",
+                    "Nothing (separate chars)"
+                ]
+            }
+        ]
+    },
     "Sleep": {
         "module": "Default",
         "description": "Sleep causes the recipe to wait for a specified number of milliseconds before continuing execution.",
@@ -13348,6 +13372,11 @@
                 "name": "Ciphertext",
                 "type": "binaryString",
                 "value": "XYZABCDEFGHIJKLMNOPQRSTUVW"
+            },
+            {
+                "name": "Ignore case",
+                "type": "boolean",
+                "value": false
             }
         ]
     },

package/src/core/config/modules/Default.mjs

@@ -125,6 +125,7 @@ import SetDifference from "../../operations/SetDifference.mjs";
 import SetIntersection from "../../operations/SetIntersection.mjs";
 import SetUnion from "../../operations/SetUnion.mjs";
 import ShowBase64Offsets from "../../operations/ShowBase64Offsets.mjs";
+import Shuffle from "../../operations/Shuffle.mjs";
 import Sleep from "../../operations/Sleep.mjs";
 import Sort from "../../operations/Sort.mjs";
 import Split from "../../operations/Split.mjs";
@@ -298,6 +299,7 @@ OpModules.Default = {
     "Set Intersection": SetIntersection,
     "Set Union": SetUnion,
     "Show Base64 offsets": ShowBase64Offsets,
+    "Shuffle": Shuffle,
     "Sleep": Sleep,
     "Sort": Sort,
     "Split": Split,

package/src/core/operations/Shuffle.mjs

@@ -0,0 +1,78 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2022
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import Utils from "../Utils.mjs";
+import {INPUT_DELIM_OPTIONS} from "../lib/Delim.mjs";
+
+/**
+ * Shuffle operation
+ */
+class Shuffle extends Operation {
+
+    /**
+     * Shuffle constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Shuffle";
+        this.module = "Default";
+        this.description = "Randomly reorders input elements.";
+        this.infoURL = "https://wikipedia.org/wiki/Shuffling";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [
+            {
+                name: "Delimiter",
+                type: "option",
+                value: INPUT_DELIM_OPTIONS
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        const delim = Utils.charRep(args[0]);
+        if (input.length === 0) return input;
+
+        // return a random number in [0, 1)
+        const rng = (typeof crypto) !== "undefined" && crypto.getRandomValues ? (function() {
+            const buf = new Uint32Array(2);
+            return function() {
+                // generate 53-bit random integer: 21 + 32 bits
+                crypto.getRandomValues(buf);
+                const value = (buf[0] >>> (32 - 21)) * ((1 << 30) * 4) + buf[1];
+                return value / ((1 << 23) * (1 << 30));
+            };
+        })() : Math.random;
+
+        // return a random integer in [0, max)
+        const randint = function(max) {
+            return Math.floor(rng() * max);
+        };
+
+        // Split input into shuffleable sections
+        const toShuffle = input.split(delim);
+
+        // shuffle elements
+        for (let i = toShuffle.length - 1; i > 0; i--) {
+            const idx = randint(i + 1);
+            const tmp = toShuffle[idx];
+            toShuffle[idx] = toShuffle[i];
+            toShuffle[i] = tmp;
+        }
+
+        return toShuffle.join(delim);
+    }
+
+}
+
+export default Shuffle;

package/src/core/operations/Substitute.mjs

@@ -34,10 +34,50 @@ class Substitute extends Operation {
                 "name": "Ciphertext",
                 "type": "binaryString",
                 "value": "XYZABCDEFGHIJKLMNOPQRSTUVW"
+            },
+            {
+                "name": "Ignore case",
+                "type": "boolean",
+                "value": false
             }
         ];
     }
 
+    /**
+     * Convert a single character using the dictionary, if ignoreCase is true then
+     * check in the dictionary for both upper and lower case versions of the character.
+     * In output the input character case is preserved.
+     * @param {string} char
+     * @param {Object} dict
+     * @param {boolean} ignoreCase
+     * @returns {string}
+     */
+    cipherSingleChar(char, dict, ignoreCase) {
+        if (!ignoreCase)
+            return dict[char] || char;
+
+        const isUpperCase = char === char.toUpperCase();
+
+        // convert using the dictionary keeping the case of the input character
+
+        if (dict[char] !== undefined) {
+            // if the character is in the dictionary return the value with the input case
+            return isUpperCase ? dict[char].toUpperCase() : dict[char].toLowerCase();
+        }
+
+        // check for the other case, if it is in the dictionary return the value with the right case
+        if (isUpperCase) {
+            if (dict[char.toLowerCase()] !== undefined)
+                return dict[char.toLowerCase()].toUpperCase();
+        } else {
+            if (dict[char.toUpperCase()] !== undefined)
+                return dict[char.toUpperCase()].toLowerCase();
+        }
+
+        return char;
+    }
+
+
     /**
      * @param {string} input
      * @param {Object[]} args
@@ -45,17 +85,23 @@ class Substitute extends Operation {
      */
     run(input, args) {
         const plaintext = Utils.expandAlphRange([...args[0]]),
-            ciphertext = Utils.expandAlphRange([...args[1]]);
-        let output = "",
-            index = -1;
+            ciphertext = Utils.expandAlphRange([...args[1]]),
+            ignoreCase = args[2];
+        let output = "";
 
         if (plaintext.length !== ciphertext.length) {
             output = "Warning: Plaintext and Ciphertext lengths differ\n\n";
         }
 
+        // create dictionary for conversion
+        const dict = {};
+        for (let i = 0; i < Math.min(ciphertext.length, plaintext.length); i++) {
+            dict[plaintext[i]] = ciphertext[i];
+        }
+
+        // map every letter with the conversion function
         for (const character of input) {
-            index = plaintext.indexOf(character);
-            output += index > -1 && index < ciphertext.length ? ciphertext[index] : character;
+            output += this.cipherSingleChar(character, dict, ignoreCase);
         }
 
         return output;

package/src/core/operations/index.mjs

@@ -313,6 +313,7 @@ import Shake from "./Shake.mjs";
 import SharpenImage from "./SharpenImage.mjs";
 import ShowBase64Offsets from "./ShowBase64Offsets.mjs";
 import ShowOnMap from "./ShowOnMap.mjs";
+import Shuffle from "./Shuffle.mjs";
 import Sleep from "./Sleep.mjs";
 import Snefru from "./Snefru.mjs";
 import Sort from "./Sort.mjs";
@@ -704,6 +705,7 @@ export {
     SharpenImage,
     ShowBase64Offsets,
     ShowOnMap,
+    Shuffle,
     Sleep,
     Snefru,
     Sort,

package/src/node/index.mjs

@@ -314,6 +314,7 @@ import {
     SharpenImage as core_SharpenImage,
     ShowBase64Offsets as core_ShowBase64Offsets,
     ShowOnMap as core_ShowOnMap,
+    Shuffle as core_Shuffle,
     Sleep as core_Sleep,
     Snefru as core_Snefru,
     Sort as core_Sort,
@@ -705,6 +706,7 @@ function generateChef() {
         "sharpenImage": _wrap(core_SharpenImage),
         "showBase64Offsets": _wrap(core_ShowBase64Offsets),
         "showOnMap": _wrap(core_ShowOnMap),
+        "shuffle": _wrap(core_Shuffle),
         "sleep": _wrap(core_Sleep),
         "snefru": _wrap(core_Snefru),
         "sort": _wrap(core_Sort),
@@ -1113,6 +1115,7 @@ const shake = chef.shake;
 const sharpenImage = chef.sharpenImage;
 const showBase64Offsets = chef.showBase64Offsets;
 const showOnMap = chef.showOnMap;
+const shuffle = chef.shuffle;
 const sleep = chef.sleep;
 const snefru = chef.snefru;
 const sort = chef.sort;
@@ -1506,6 +1509,7 @@ const operations = [
     sharpenImage,
     showBase64Offsets,
     showOnMap,
+    shuffle,
     sleep,
     snefru,
     sort,
@@ -1903,6 +1907,7 @@ export {
     sharpenImage,
     showBase64Offsets,
     showOnMap,
+    shuffle,
     sleep,
     snefru,
     sort,

package/tests/operations/index.mjs

@@ -124,6 +124,7 @@ import "./tests/UnescapeString.mjs";
 import "./tests/LS47.mjs";
 import "./tests/LZString.mjs";
 import "./tests/NTLM.mjs";
+import "./tests/Shuffle.mjs";
 
 // Cannot test operations that use the File type yet
 // import "./tests/SplitColourChannels.mjs";

package/tests/operations/tests/Shuffle.mjs

@@ -0,0 +1,54 @@
+/**
+ * @author mikecat
+ * @copyright Crown Copyright 2022
+ * @license Apache-2.0
+ */
+import TestRegister from "../../lib/TestRegister.mjs";
+
+TestRegister.addTests([
+    {
+        "name": "Shuffle empty",
+        "input": "",
+        "expectedOutput": "",
+        "recipeConfig": [
+            {
+                "op": "Shuffle",
+                "args": ["Comma"]
+            }
+        ]
+    },
+    {
+        "name": "Shuffle bytes",
+        "input": "12345678",
+        "expectedOutput": "31 32 33 34 35 36 37 38",
+        "recipeConfig": [
+            {
+                "op": "Shuffle",
+                "args": ["Nothing (separate chars)"]
+            },
+            {
+                "op": "To Hex",
+                "args": ["Space", 0]
+            },
+            {
+                "op": "Sort",
+                "args": ["Space", false, "Alphabetical (case sensitive)"]
+            }
+        ]
+    },
+    {
+        "name": "Shuffle lines",
+        "input": "1\n2\n3\n4\n5\n6\n7\n8\n9\na\nb\nc\nd\ne\nf\n",
+        "expectedOutput": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\na\nb\nc\nd\ne\nf",
+        "recipeConfig": [
+            {
+                "op": "Shuffle",
+                "args": ["Line feed"]
+            },
+            {
+                "op": "Sort",
+                "args": ["Line feed", false, "Alphabetical (case sensitive)"]
+            }
+        ]
+    }
+]);