cyberchef 9.46.6 → 9.47.0

package/CHANGELOG.md

@@ -13,6 +13,9 @@ All major and minor version changes will be documented in this file. Details of
 
 ## Details
 
+### [9.47.0] - 2022-10-14
+- Added 'LZMA Decompress' and 'LZMA Compress' operations [@mattnotmitt] | [#1421]
+
 ### [9.46.0] - 2022-07-08
 - Added 'Cetacean Cipher Encode' and 'Cetacean Cipher Decode' operations [@valdelaseras] | [#1308]
 
@@ -315,6 +318,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
+[9.47.0]: https://github.com/gchq/CyberChef/releases/tag/v9.47.0
 [9.46.0]: https://github.com/gchq/CyberChef/releases/tag/v9.46.0
 [9.45.0]: https://github.com/gchq/CyberChef/releases/tag/v9.45.0
 [9.44.0]: https://github.com/gchq/CyberChef/releases/tag/v9.44.0
@@ -552,4 +556,5 @@ All major and minor version changes will be documented in this file. Details of
 [#1266]: https://github.com/gchq/CyberChef/pull/1266
 [#1250]: https://github.com/gchq/CyberChef/pull/1250
 [#1308]: https://github.com/gchq/CyberChef/pull/1308
+[#1421]: https://github.com/gchq/CyberChef/pull/1421
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.46.6",
+  "version": "9.47.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",
@@ -87,6 +87,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
+    "@blu3r4y/lzma": "^2.3.3",
     "arrive": "^2.4.1",
     "avsc": "^5.7.4",
     "bcryptjs": "^2.4.3",

package/src/core/config/Categories.json

@@ -330,8 +330,10 @@
             "Bzip2 Compress",
             "Tar",
             "Untar",
+            "LZString Decompress",
             "LZString Compress",
-            "LZString Decompress"
+            "LZMA Decompress",
+            "LZMA Compress"
         ]
     },
     {

package/src/core/config/OperationConfig.json

@@ -8013,6 +8013,43 @@
             }
         ]
     },
+    "LZMA Compress": {
+        "module": "Compression",
+        "description": "Compresses data using the Lempel–Ziv–Markov chain algorithm. Compression mode determines the speed and effectiveness of the compression: 1 is fastest and less effective, 9 is slowest and most effective",
+        "infoURL": "https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Markov_chain_algorithm",
+        "inputType": "ArrayBuffer",
+        "outputType": "ArrayBuffer",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Compression Mode",
+                "type": "option",
+                "value": [
+                    "1",
+                    "2",
+                    "3",
+                    "4",
+                    "5",
+                    "6",
+                    "7",
+                    "8",
+                    "9"
+                ],
+                "defaultIndex": 6
+            }
+        ]
+    },
+    "LZMA Decompress": {
+        "module": "Compression",
+        "description": "Decompresses data using the Lempel-Ziv-Markov chain Algorithm.",
+        "infoURL": "https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Markov_chain_algorithm",
+        "inputType": "ArrayBuffer",
+        "outputType": "ArrayBuffer",
+        "flowControl": false,
+        "manualBake": false,
+        "args": []
+    },
     "LZString Compress": {
         "module": "Compression",
         "description": "Compress the input with lz-string.",
@@ -9721,7 +9758,7 @@
     },
     "Parse SSH Host Key": {
         "module": "Default",
-        "description": "Parses a SSH host key and extracts fields from it.<br>The key type can be:<ul><li>ssh-rsa</li><li>ssh-dss</li><li>ecdsa-sha2</li></ul>The key format can be either Hex or Base64.",
+        "description": "Parses a SSH host key and extracts fields from it.<br>The key type can be:<ul><li>ssh-rsa</li><li>ssh-dss</li><li>ecdsa-sha2</li><li>ssh-ed25519</li></ul>The key format can be either Hex or Base64.",
         "infoURL": "https://wikipedia.org/wiki/Secure_Shell",
         "inputType": "string",
         "outputType": "string",

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

@@ -9,6 +9,8 @@ import Bzip2Compress from "../../operations/Bzip2Compress.mjs";
 import Bzip2Decompress from "../../operations/Bzip2Decompress.mjs";
 import Gunzip from "../../operations/Gunzip.mjs";
 import Gzip from "../../operations/Gzip.mjs";
+import LZMACompress from "../../operations/LZMACompress.mjs";
+import LZMADecompress from "../../operations/LZMADecompress.mjs";
 import LZStringCompress from "../../operations/LZStringCompress.mjs";
 import LZStringDecompress from "../../operations/LZStringDecompress.mjs";
 import RawDeflate from "../../operations/RawDeflate.mjs";
@@ -27,6 +29,8 @@ OpModules.Compression = {
     "Bzip2 Decompress": Bzip2Decompress,
     "Gunzip": Gunzip,
     "Gzip": Gzip,
+    "LZMA Compress": LZMACompress,
+    "LZMA Decompress": LZMADecompress,
     "LZString Compress": LZStringCompress,
     "LZString Decompress": LZStringDecompress,
     "Raw Deflate": RawDeflate,

package/src/core/operations/LZMACompress.mjs

@@ -0,0 +1,64 @@
+/**
+ * @author Matt C [me@mitt.dev]
+ * @copyright Crown Copyright 2022
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+
+import { compress } from "@blu3r4y/lzma";
+import {isWorkerEnvironment} from "../Utils.mjs";
+
+/**
+ * LZMA Compress operation
+ */
+class LZMACompress extends Operation {
+
+    /**
+     * LZMACompress constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "LZMA Compress";
+        this.module = "Compression";
+        this.description = "Compresses data using the Lempel\u2013Ziv\u2013Markov chain algorithm. Compression mode determines the speed and effectiveness of the compression: 1 is fastest and less effective, 9 is slowest and most effective";
+        this.infoURL = "https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Markov_chain_algorithm";
+        this.inputType = "ArrayBuffer";
+        this.outputType = "ArrayBuffer";
+        this.args = [
+            {
+                name: "Compression Mode",
+                type: "option",
+                value: [
+                    "1", "2", "3", "4", "5", "6", "7", "8", "9"
+                ],
+                "defaultIndex": 6
+            }
+        ];
+    }
+
+    /**
+     * @param {ArrayBuffer} input
+     * @param {Object[]} args
+     * @returns {ArrayBuffer}
+     */
+    async run(input, args) {
+        const mode = Number(args[0]);
+        return new Promise((resolve, reject) => {
+            compress(new Uint8Array(input), mode, (result, error) => {
+                if (error) {
+                    reject(new OperationError(`Failed to compress input: ${error.message}`));
+                }
+                // The compression returns as an Int8Array, but we can just get the unsigned data from the buffer
+                resolve(new Int8Array(result).buffer);
+            }, (percent) => {
+                if (isWorkerEnvironment()) self.sendStatusMessage(`Compressing input: ${(percent*100).toFixed(2)}%`);
+            });
+        });
+    }
+
+}
+
+export default LZMACompress;

package/src/core/operations/LZMADecompress.mjs

@@ -0,0 +1,57 @@
+/**
+ * @author Matt C [me@mitt.dev]
+ * @copyright Crown Copyright 2022
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+import {decompress} from "@blu3r4y/lzma";
+import Utils, {isWorkerEnvironment} from "../Utils.mjs";
+
+/**
+ * LZMA Decompress operation
+ */
+class LZMADecompress extends Operation {
+
+    /**
+     * LZMADecompress constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "LZMA Decompress";
+        this.module = "Compression";
+        this.description = "Decompresses data using the Lempel-Ziv-Markov chain Algorithm.";
+        this.infoURL = "https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Markov_chain_algorithm";
+        this.inputType = "ArrayBuffer";
+        this.outputType = "ArrayBuffer";
+    }
+
+    /**
+     * @param {ArrayBuffer} input
+     * @param {Object[]} args
+     * @returns {ArrayBuffer}
+     */
+    async run(input, args) {
+        return new Promise((resolve, reject) => {
+            decompress(new Uint8Array(input), (result, error) => {
+                if (error) {
+                    reject(new OperationError(`Failed to decompress input: ${error.message}`));
+                }
+                // The decompression returns either a String or an untyped unsigned int8 array, but we can just get the unsigned data from the buffer
+
+                if (typeof result == "string") {
+                    resolve(Utils.strToArrayBuffer(result));
+                } else {
+                    resolve(new Int8Array(result).buffer);
+                }
+            }, (percent) => {
+                if (isWorkerEnvironment()) self.sendStatusMessage(`Decompressing input: ${(percent*100).toFixed(2)}%`);
+            });
+        });
+    }
+
+}
+
+export default LZMADecompress;

package/src/core/operations/ParseSSHHostKey.mjs

@@ -23,7 +23,7 @@ class ParseSSHHostKey extends Operation {
 
         this.name = "Parse SSH Host Key";
         this.module = "Default";
-        this.description = "Parses a SSH host key and extracts fields from it.<br>The key type can be:<ul><li>ssh-rsa</li><li>ssh-dss</li><li>ecdsa-sha2</li></ul>The key format can be either Hex or Base64.";
+        this.description = "Parses a SSH host key and extracts fields from it.<br>The key type can be:<ul><li>ssh-rsa</li><li>ssh-dss</li><li>ecdsa-sha2</li><li>ssh-ed25519</li></ul>The key format can be either Hex or Base64.";
         this.infoURL = "https://wikipedia.org/wiki/Secure_Shell";
         this.inputType = "string";
         this.outputType = "string";
@@ -71,6 +71,8 @@ class ParseSSHHostKey extends Operation {
         } else if (keyType.startsWith("ecdsa-sha2")) {
             output += `\nCurve: ${Utils.byteArrayToChars(fromHex(fields[1]))}`;
             output += `\nPoint: 0x${fields.slice(2)}`;
+        } else if (keyType === "ssh-ed25519") {
+            output += `\nx: 0x${fields[1]}`;
         } else {
             output += "\nUnsupported key type.";
             output += `\nParameters: ${fields.slice(1)}`;

package/src/core/operations/index.mjs

@@ -196,6 +196,8 @@ import Jump from "./Jump.mjs";
 import Keccak from "./Keccak.mjs";
 import LS47Decrypt from "./LS47Decrypt.mjs";
 import LS47Encrypt from "./LS47Encrypt.mjs";
+import LZMACompress from "./LZMACompress.mjs";
+import LZMADecompress from "./LZMADecompress.mjs";
 import LZStringCompress from "./LZStringCompress.mjs";
 import LZStringDecompress from "./LZStringDecompress.mjs";
 import Label from "./Label.mjs";
@@ -581,6 +583,8 @@ export {
     Keccak,
     LS47Decrypt,
     LS47Encrypt,
+    LZMACompress,
+    LZMADecompress,
     LZStringCompress,
     LZStringDecompress,
     Label,

package/src/node/index.mjs

@@ -199,6 +199,8 @@ import {
     Keccak as core_Keccak,
     LS47Decrypt as core_LS47Decrypt,
     LS47Encrypt as core_LS47Encrypt,
+    LZMACompress as core_LZMACompress,
+    LZMADecompress as core_LZMADecompress,
     LZStringCompress as core_LZStringCompress,
     LZStringDecompress as core_LZStringDecompress,
     Lorenz as core_Lorenz,
@@ -584,6 +586,8 @@ function generateChef() {
         "keccak": _wrap(core_Keccak),
         "LS47Decrypt": _wrap(core_LS47Decrypt),
         "LS47Encrypt": _wrap(core_LS47Encrypt),
+        "LZMACompress": _wrap(core_LZMACompress),
+        "LZMADecompress": _wrap(core_LZMADecompress),
         "LZStringCompress": _wrap(core_LZStringCompress),
         "LZStringDecompress": _wrap(core_LZStringDecompress),
         "lorenz": _wrap(core_Lorenz),
@@ -984,6 +988,8 @@ const jump = chef.jump;
 const keccak = chef.keccak;
 const LS47Decrypt = chef.LS47Decrypt;
 const LS47Encrypt = chef.LS47Encrypt;
+const LZMACompress = chef.LZMACompress;
+const LZMADecompress = chef.LZMADecompress;
 const LZStringCompress = chef.LZStringCompress;
 const LZStringDecompress = chef.LZStringDecompress;
 const label = chef.label;
@@ -1371,6 +1377,8 @@ const operations = [
     keccak,
     LS47Decrypt,
     LS47Encrypt,
+    LZMACompress,
+    LZMADecompress,
     LZStringCompress,
     LZStringDecompress,
     label,
@@ -1762,6 +1770,8 @@ export {
     keccak,
     LS47Decrypt,
     LS47Encrypt,
+    LZMACompress,
+    LZMADecompress,
     LZStringCompress,
     LZStringDecompress,
     label,

package/tests/operations/tests/Compress.mjs

@@ -23,4 +23,56 @@ TestRegister.addTests([
             }
         ],
     },
+    {
+        name: "LZMA compress & decompress",
+        input: "The cat sat on the mat.",
+        // Generated using command `echo -n "The cat sat on the mat." | lzma -z -6 | xxd -p`
+        expectedOutput: "The cat sat on the mat.",
+        recipeConfig: [
+            {
+                "op": "LZMA Compress",
+                "args": ["6"]
+            },
+            {
+                "op": "LZMA Decompress",
+                "args": []
+            },
+        ],
+    },
+    {
+        name: "LZMA decompress: binary",
+        // Generated using command `echo "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10" | xxd -r -p | lzma -z -6 | xxd -p`
+        input: "5d00008000ffffffffffffffff00000052500a84f99bb28021a969d627e03e8a922effffbd160000",
+        expectedOutput: "00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10",
+        recipeConfig: [
+            {
+                "op": "From Hex",
+                "args": ["Space"]
+            },
+            {
+                "op": "LZMA Decompress",
+                "args": []
+            },
+            {
+                "op": "To Hex",
+                "args": ["Space", 0]
+            }
+        ],
+    },
+    {
+        name: "LZMA decompress: string",
+        // Generated using command `echo -n "The cat sat on the mat." | lzma -z -6 | xxd -p`
+        input: "5d00008000ffffffffffffffff002a1a08a202b1a4b814b912c94c4152e1641907d3fd8cd903ffff4fec0000",
+        expectedOutput: "The cat sat on the mat.",
+        recipeConfig: [
+            {
+                "op": "From Hex",
+                "args": ["Space"]
+            },
+            {
+                "op": "LZMA Decompress",
+                "args": []
+            }
+        ],
+    },
 ]);

package/tests/operations/tests/ParseSSHHostKey.mjs

@@ -49,6 +49,18 @@ Point: 0x046c59592006272250a15070142a6be36d1e45464313f930d985a6e6f0eba3cd39d0367
             }
         ]
     },
+    {
+        name: "SSH Host Key: Ed25519",
+        input: "AAAAC3NzaC1lZDI1NTE5AAAAIBOF6r99IkvqGu1kwZrHHIqjpTB5w79bpv67B/Aw3+WJ",
+        expectedOutput: `Key type: ssh-ed25519
+x: 0x1385eabf7d224bea1aed64c19ac71c8aa3a53079c3bf5ba6febb07f030dfe589`,
+        recipeConfig: [
+            {
+                op: "Parse SSH Host Key",
+                args: ["Base64"]
+            }
+        ]
+    },
     {
         name: "SSH Host Key: Extract key",
         input: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiJZ/9W9Ix/Dk9b+K4E+RGCug1AtkGXaJ9vNIY0YHFHLpWsB8DAuh/cGEI9TLbL1gzR2wG+RJNQ2EAQVWe6ypkK63Jm4zw4re+vhEiszpnP889J0h5N9yzyTndesrl4d3cQtv861FcKDPxUJbRALdtl6gwOB7BCL8gsXJLLVLO4EesrbPXD454qpVt7CgJXEXByOFjcIm3XwkdOnXMPHHnMSD7EIN1SvQMD6PfIDrbDd6KQt5QXW/Rc/BsfX5cbUIV1QW5A/GbepXHHKmWRtLC2J/mH3hW2Zq/hITPEaJdG1CtIilQmJaZGXpfGIwFeb0Av9pSL926arZZ6vDi9ctF test@test",