cyberchef 11.0.0 → 11.2.0

package/src/core/config/OperationConfig.json

@@ -144,6 +144,11 @@
                     "Base64"
                 ]
             },
+            {
+                "name": "IV Length",
+                "type": "number",
+                "value": 16
+            },
             {
                 "name": "Mode",
                 "type": "argSelector",
@@ -151,57 +156,57 @@
                     {
                         "name": "CBC",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "CFB",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "OFB",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "CTR",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "GCM",
                         "on": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "ECB",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "CBC/NoPadding",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     },
                     {
                         "name": "ECB/NoPadding",
                         "off": [
-                            5,
-                            6
+                            6,
+                            7
                         ]
                     }
                 ]
@@ -243,6 +248,39 @@
                     "Latin1",
                     "Base64"
                 ]
+            },
+            {
+                "name": "IV from input",
+                "type": "argSelector",
+                "value": [
+                    {
+                        "name": "Off",
+                        "on": [
+                            1
+                        ],
+                        "off": [
+                            2
+                        ]
+                    },
+                    {
+                        "name": "From start",
+                        "on": [
+                            2
+                        ],
+                        "off": [
+                            1
+                        ]
+                    },
+                    {
+                        "name": "From end",
+                        "on": [
+                            2
+                        ],
+                        "off": [
+                            1
+                        ]
+                    }
+                ]
             }
         ]
     },
@@ -357,6 +395,15 @@
                     "Latin1",
                     "Base64"
                 ]
+            },
+            {
+                "name": "Include IV in output",
+                "type": "option",
+                "value": [
+                    "Off",
+                    "Prepend",
+                    "Append"
+                ]
             }
         ]
     },
@@ -7552,6 +7599,26 @@
             }
         ]
     },
+    "Escape Smart Characters": {
+        "module": "Default",
+        "description": "Converts smart (typographic) Unicode characters — e.g. smart quotes, em/en dashes, ellipses, ©, ®, ™, arrows — into their plain ASCII equivalents.<br><br>Characters with no ASCII mapping (e.g. <code>☣</code>) are handled according to the 'Unmappable characters' option.<br><br>e.g. <code>“Hello” — world…</code> becomes <code>\"Hello\" -- world...</code>",
+        "infoURL": "",
+        "inputType": "string",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Unmappable characters",
+                "type": "option",
+                "value": [
+                    "Include",
+                    "Remove",
+                    "Replace with '.'"
+                ]
+            }
+        ]
+    },
     "Escape string": {
         "module": "Default",
         "description": "Escapes special characters in a string so that they do not cause conflicts. For example, <code>Don't stop me now</code> becomes <code>Don\\'t stop me now</code>.<br><br>Supports the following escape sequences:<ul><li><code>\\n</code> (Line feed/newline)</li><li><code>\\r</code> (Carriage return)</li><li><code>\\t</code> (Horizontal tab)</li><li><code>\\b</code> (Backspace)</li><li><code>\\f</code> (Form feed)</li><li><code>\\xnn</code> (Hex, where n is 0-f)</li><li><code>\\\\</code> (Backslash)</li><li><code>\\'</code> (Single quote)</li><li><code>\\&quot;</code> (Double quote)</li><li><code>\\unnnn</code> (Unicode character)</li><li><code>\\u{nnnnnn}</code> (Unicode code point)</li></ul>",
@@ -13143,6 +13210,27 @@
             }
         ]
     },
+    "PGP Sign": {
+        "module": "PGP",
+        "description": "Input: the message you want to sign\n<br><br>\nArguments: the ASCII-armoured PGP private key of the sender.\n<br><br>\nPretty Good Privacy is an encryption standard (OpenPGP) used for encrypting, decrypting, and signing messages.\n<br><br>\nThis function uses the Keybase implementation of PGP.",
+        "infoURL": "https://wikipedia.org/wiki/Pretty_Good_Privacy",
+        "inputType": "string",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Private key of signer",
+                "type": "text",
+                "value": ""
+            },
+            {
+                "name": "Private key passphrase (optional)",
+                "type": "string",
+                "value": ""
+            }
+        ]
+    },
     "PGP Verify": {
         "module": "PGP",
         "description": "Input: the ASCII-armoured encrypted PGP message you want to verify.\n<br><br>\nArgument: the ASCII-armoured PGP public key of the signer\n<br><br>\nThis operation uses PGP to decrypt a clearsigned message.\n<br><br>\nPretty Good Privacy is an encryption standard (OpenPGP) used for encrypting, decrypting, and signing messages.\n<br><br>\nThis function uses the Keybase implementation of PGP.",
@@ -13226,7 +13314,7 @@
     },
     "Parity Bit": {
         "module": "Default",
-        "description": "A parity bit, or check bit, is the simplest form of error detection. It is a bit which is added to a string of bits and represents if the number of 1's in the binary string is an even number or odd number.<br><br>If a delimiter is specified, the parity bit calculation will be performed on each 'block' of the input data, where the blocks are created by slicing the input at each occurence of the delimiter character",
+        "description": "A parity bit, or check bit, is the simplest form of error detection. It is a bit which is added to a string of bits and represents if the number of 1's in the binary string is an even number or odd number.<br><br>If a delimiter is specified, the parity bit calculation will be performed on each 'block' of the input data, where the blocks are created by slicing the input at each occurrence of the delimiter character",
         "infoURL": "https://wikipedia.org/wiki/Parity_bit",
         "inputType": "string",
         "outputType": "string",
@@ -14918,6 +15006,16 @@
             }
         ]
     },
+    "ROR13": {
+        "module": "Default",
+        "description": "Computes a ROR13 hash used in API hashing techniques.",
+        "infoURL": "",
+        "inputType": "byteArray",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": []
+    },
     "ROT13": {
         "module": "Default",
         "description": "A simple caesar substitution cipher which rotates alphabet characters by the specified amount (default 13).",
@@ -15574,6 +15672,16 @@
             }
         ]
     },
+    "Remove ANSI Escape Codes": {
+        "module": "Default",
+        "description": "Removes ANSI Escape Codes.",
+        "infoURL": "https://wikipedia.org/wiki/ANSI_escape_code",
+        "inputType": "string",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": []
+    },
     "Remove Diacritics": {
         "module": "Default",
         "description": "Replaces accented characters with their latin character equivalent. Accented characters are made up of Unicode combining characters, so unicode text formatting such as strikethroughs and underlines will also be removed.",
@@ -15928,7 +16036,7 @@
     },
     "SHA2": {
         "module": "Crypto",
-        "description": "The SHA-2 (Secure Hash Algorithm 2) hash functions were designed by the NSA. SHA-2 includes significant changes from its predecessor, SHA-1. The SHA-2 family consists of hash functions with digests (hash values) that are 224, 256, 384 or 512 bits: SHA224, SHA256, SHA384, SHA512.<br><br><ul><li>SHA-512 operates on 64-bit words.</li><li>SHA-256 operates on 32-bit words.</li><li>SHA-384 is largely identical to SHA-512 but is truncated to 384 bytes.</li><li>SHA-224 is largely identical to SHA-256 but is truncated to 224 bytes.</li><li>SHA-512/224 and SHA-512/256 are truncated versions of SHA-512, but the initial values are generated using the method described in Federal Information Processing Standards (FIPS) PUB 180-4.</li></ul> The message digest algorithm for SHA256 variants consists, by default, of 64 rounds, and for SHA512 variants, it is, by default, 160.",
+        "description": "The SHA-2 (Secure Hash Algorithm 2) hash functions were designed by the NSA. SHA-2 includes significant changes from its predecessor, SHA-1. The SHA-2 family consists of hash functions with digests (hash values) that are 224, 256, 384 or 512 bits: SHA224, SHA256, SHA384, SHA512.<br><br><ul><li>SHA-512 operates on 64-bit words.</li><li>SHA-256 operates on 32-bit words.</li><li>SHA-384 is largely identical to SHA-512 but is truncated to 384 bits.</li><li>SHA-224 is largely identical to SHA-256 but is truncated to 224 bits.</li><li>SHA-512/224 and SHA-512/256 are truncated versions of SHA-512, but the initial values are generated using the method described in Federal Information Processing Standards (FIPS) PUB 180-4.</li></ul> The message digest algorithm for SHA256 variants consists, by default, of 64 rounds, and for SHA512 variants, it is, by default, 160.",
         "infoURL": "https://wikipedia.org/wiki/SHA-2",
         "inputType": "ArrayBuffer",
         "outputType": "string",
@@ -19288,7 +19396,8 @@
                 "name": "Width",
                 "type": "number",
                 "value": 16,
-                "min": 1
+                "min": 1,
+                "max": 65536
             },
             {
                 "name": "Upper case hex",
@@ -21895,6 +22004,22 @@
             }
         ]
     },
+    "Wrap": {
+        "module": "Default",
+        "description": "Wraps the input text at a specified number of characters per line.",
+        "infoURL": null,
+        "inputType": "string",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Line Width",
+                "type": "number",
+                "value": 64
+            }
+        ]
+    },
     "XKCD Random Number": {
         "module": "Default",
         "description": "RFC 1149.5 specifies 4 as the standard IEEE-vetted random number.",

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

@@ -41,6 +41,7 @@ import DropBytes from "../../operations/DropBytes.mjs";
 import DropNthBytes from "../../operations/DropNthBytes.mjs";
 import ELFInfo from "../../operations/ELFInfo.mjs";
 import EncodeNetBIOSName from "../../operations/EncodeNetBIOSName.mjs";
+import EscapeSmartCharacters from "../../operations/EscapeSmartCharacters.mjs";
 import EscapeString from "../../operations/EscapeString.mjs";
 import EscapeUnicodeCharacters from "../../operations/EscapeUnicodeCharacters.mjs";
 import ExpandAlphabetRange from "../../operations/ExpandAlphabetRange.mjs";
@@ -131,11 +132,13 @@ import ParseUNIXFilePermissions from "../../operations/ParseUNIXFilePermissions.
 import PlayMedia from "../../operations/PlayMedia.mjs";
 import PowerSet from "../../operations/PowerSet.mjs";
 import RAKE from "../../operations/RAKE.mjs";
+import ROR13 from "../../operations/ROR13.mjs";
 import ROT13 from "../../operations/ROT13.mjs";
 import ROT13BruteForce from "../../operations/ROT13BruteForce.mjs";
 import ROT47 from "../../operations/ROT47.mjs";
 import ROT47BruteForce from "../../operations/ROT47BruteForce.mjs";
 import ROT8000 from "../../operations/ROT8000.mjs";
+import RemoveANSIEscapeCodes from "../../operations/RemoveANSIEscapeCodes.mjs";
 import RemoveDiacritics from "../../operations/RemoveDiacritics.mjs";
 import RemoveLineNumbers from "../../operations/RemoveLineNumbers.mjs";
 import RemoveNullBytes from "../../operations/RemoveNullBytes.mjs";
@@ -207,6 +210,7 @@ import Unique from "../../operations/Unique.mjs";
 import VarIntDecode from "../../operations/VarIntDecode.mjs";
 import VarIntEncode from "../../operations/VarIntEncode.mjs";
 import WindowsFiletimeToUNIXTimestamp from "../../operations/WindowsFiletimeToUNIXTimestamp.mjs";
+import Wrap from "../../operations/Wrap.mjs";
 import XKCDRandomNumber from "../../operations/XKCDRandomNumber.mjs";
 import XOR from "../../operations/XOR.mjs";
 import XORBruteForce from "../../operations/XORBruteForce.mjs";
@@ -251,6 +255,7 @@ OpModules.Default = {
     "Drop nth bytes": DropNthBytes,
     "ELF Info": ELFInfo,
     "Encode NetBIOS Name": EncodeNetBIOSName,
+    "Escape Smart Characters": EscapeSmartCharacters,
     "Escape string": EscapeString,
     "Escape Unicode Characters": EscapeUnicodeCharacters,
     "Expand alphabet range": ExpandAlphabetRange,
@@ -341,11 +346,13 @@ OpModules.Default = {
     "Play Media": PlayMedia,
     "Power Set": PowerSet,
     "RAKE": RAKE,
+    "ROR13": ROR13,
     "ROT13": ROT13,
     "ROT13 Brute Force": ROT13BruteForce,
     "ROT47": ROT47,
     "ROT47 Brute Force": ROT47BruteForce,
     "ROT8000": ROT8000,
+    "Remove ANSI Escape Codes": RemoveANSIEscapeCodes,
     "Remove Diacritics": RemoveDiacritics,
     "Remove line numbers": RemoveLineNumbers,
     "Remove null bytes": RemoveNullBytes,
@@ -417,6 +424,7 @@ OpModules.Default = {
     "VarInt Decode": VarIntDecode,
     "VarInt Encode": VarIntEncode,
     "Windows Filetime to UNIX Timestamp": WindowsFiletimeToUNIXTimestamp,
+    "Wrap": Wrap,
     "XKCD Random Number": XKCDRandomNumber,
     "XOR": XOR,
     "XOR Brute Force": XORBruteForce,

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

@@ -10,6 +10,7 @@ import PGPDecrypt from "../../operations/PGPDecrypt.mjs";
 import PGPDecryptAndVerify from "../../operations/PGPDecryptAndVerify.mjs";
 import PGPEncrypt from "../../operations/PGPEncrypt.mjs";
 import PGPEncryptAndSign from "../../operations/PGPEncryptAndSign.mjs";
+import PGPSign from "../../operations/PGPSign.mjs";
 import PGPVerify from "../../operations/PGPVerify.mjs";
 
 const OpModules = typeof self === "undefined" ? {} : self.OpModules || {};
@@ -20,6 +21,7 @@ OpModules.PGP = {
     "PGP Decrypt and Verify": PGPDecryptAndVerify,
     "PGP Encrypt": PGPEncrypt,
     "PGP Encrypt and Sign": PGPEncryptAndSign,
+    "PGP Sign": PGPSign,
     "PGP Verify": PGPVerify,
 };
 

package/src/core/config/scripts/generateOpsIndex.mjs

@@ -58,3 +58,66 @@ fs.writeFileSync(
     code
 );
 console.log("Written operation index.");
+
+// find all test files
+const testsDir = path.join(process.cwd() + "/tests/operations/tests/");
+const testObjs = [];
+fs.readdirSync(testsDir).forEach(file => {
+    if (!file.endsWith(".mjs")) return;
+    testObjs.push(file.split(".mjs")[0]);
+});
+
+// Construct test index file
+code = `/**
+* THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateOpsIndex.mjs
+*
+* @author john [john19696@protonmail.com]
+* @author tlwr [toby@toby.codes]
+* @author n1474335 [n1474335@gmail.com]
+* @copyright Crown Copyright ${new Date().getUTCFullYear()}
+* @license Apache-2.0
+*/
+
+import {
+    setLongTestFailure,
+    logTestReport,
+} from "../lib/utils.mjs";
+
+import "../lib/wasmFetchPolyfill.mjs";
+
+import TestRegister from "../lib/TestRegister.mjs";
+`;
+
+testObjs.forEach(obj => {
+    if (obj !== "SplitColourChannels")
+        code += `import "./tests/${obj}.mjs";\n`;
+    else
+        code += `// Cannot test operations that use the File type yet
+// import "./tests/SplitColourChannels.mjs";\n`;
+});
+
+code += `
+
+const testStatus = {
+    allTestsPassing: true,
+    counts: {
+        total: 0,
+    }
+};
+
+setLongTestFailure();
+
+const logOpsTestReport = logTestReport.bind(null, testStatus);
+
+(async function() {
+    const results = await TestRegister.runTests();
+    logOpsTestReport(results);
+})();
+`;
+
+// Write tests file
+fs.writeFileSync(
+    path.join(testsDir, "../index.mjs"),
+    code
+);
+console.log("Written operation tests index.");

package/src/core/config/scripts/newOperation.mjs

@@ -23,7 +23,7 @@ if (!fs.existsSync(dir)) {
     console.log("Example> node --experimental-modules src/core/config/scripts/newOperation.mjs");
     process.exit(1);
 }
-
+const testDir = path.join(process.cwd() + "/tests/operations/tests/");
 const ioTypes = ["string", "byteArray", "number", "html", "ArrayBuffer", "BigNumber", "JSON", "File", "List<File>"];
 
 const schema = {
@@ -123,6 +123,30 @@ prompt.get(schema, (err, result) => {
         return txt.charAt(0).toUpperCase() + txt.substr(1);
     }).replace(/[\s-()./]/g, "");
 
+    const testTemplate = `/**
+* ${moduleName} tests
+*
+* @author ${result.authorName} [${result.authorEmail}]
+* @copyright Crown Copyright ${(new Date()).getFullYear()}
+* @license Apache-2.0
+*/
+
+import TestRegister from "../../lib/TestRegister.mjs";
+
+TestRegister.addTests([
+    {
+        name: "${result.opName}: test",
+        input: "Example input",
+        expectedOutput: "Expected output",
+        recipeConfig: [
+            {
+                op: "${result.opName}",
+                args: [],
+            },
+        ],
+    },
+]);
+`;
 
     const template = `/**
  * @author ${result.authorName} [${result.authorEmail}]
@@ -218,13 +242,16 @@ export default ${moduleName};
     }
     fs.writeFileSync(filename, template);
 
+    const testFilename = path.join(testDir, `./${moduleName}.mjs`);
+    fs.writeFileSync(testFilename, testTemplate);
+
     console.log(`\nOperation template written to ${colors.green(filename)}`);
+    console.log(`\nOperation test template written to ${colors.green(testFilename)}`);
     console.log(`\nNext steps:
 1. Add your operation to ${colors.green("src/core/config/Categories.json")}
-2. Write your operation code.
-3. Write tests in ${colors.green("tests/operations/tests/")}
+2. Write your operation code in ${colors.green(filename)}
+3. Write your operation test code in ${colors.green(testFilename)}
 4. Run ${colors.cyan("npm run lint")} and ${colors.cyan("npm run test")}
 5. Submit a Pull Request to get your operation added to the official CyberChef repository.`);
 
 });
-

package/src/core/dishTypes/DishType.mjs

@@ -11,7 +11,7 @@
 class DishType {
 
     /**
-     * Warn translations dont work without value from bind
+     * Warn translations don't work without value from bind
      */
     static checkForValue(value) {
         if (value === undefined) {

package/src/core/errors/ExcludedOperationError.mjs

@@ -1,5 +1,5 @@
 /**
- * Custom error type for handling operation that isnt included in node.js API
+ * Custom error type for handling operation that isn't included in node.js API
  *
  * @author d98762625 [d98762625@gmail.com]
  * @copyright Crown Copyright 2018

package/src/core/lib/Charts.mjs

@@ -153,7 +153,7 @@ export function getSeriesValues(input, recordDelimiter, fieldDelimiter, columnHe
     );
 
     let xValues = new Set();
-    const series = {};
+    const series = Object.create(null);
 
     values.forEach(row => {
         const serie = row[0],
@@ -163,14 +163,14 @@ export function getSeriesValues(input, recordDelimiter, fieldDelimiter, columnHe
         if (Number.isNaN(val)) throw new OperationError("Values must be numbers in base 10.");
 
         xValues.add(xVal);
-        if (typeof series[serie] === "undefined") series[serie] = {};
+        if (typeof series[serie] === "undefined") series[serie] = Object.create(null);
         series[serie][xVal] = val;
     });
 
     xValues = new Array(...xValues);
 
     const seriesList = [];
-    for (const seriesName in series) {
+    for (const seriesName of Object.keys(series)) {
         const serie = series[seriesName];
         seriesList.push({name: seriesName, data: serie});
     }

package/src/core/lib/Protocol.mjs

@@ -8,6 +8,7 @@
 
 import BigNumber from "bignumber.js";
 import {toHexFast} from "../lib/Hex.mjs";
+import Utils from "../Utils.mjs";
 
 /**
  * Recursively displays a JSON object as an HTML table
@@ -25,15 +26,16 @@ export function objToTable(obj, nested=false) {
             <th>Value</th>
         </tr>`;
 
-    for (const key in obj) {
-        if (typeof obj[key] === "function")
+    for (const key of Object.keys(obj)) {
+        const value = obj[key];
+        if (typeof value === "function")
             continue;
 
-        html += `<tr><td style='word-wrap: break-word'>${key}</td>`;
-        if (typeof obj[key] === "object")
-            html += `<td style='padding: 0'>${objToTable(obj[key], true)}</td>`;
+        html += `<tr><td style='word-wrap: break-word'>${Utils.escapeHtml(String(key))}</td>`;
+        if (value !== null && typeof value === "object")
+            html += `<td style='padding: 0'>${objToTable(value, true)}</td>`;
         else
-            html += `<td>${obj[key]}</td>`;
+            html += `<td>${Utils.escapeHtml(String(value))}</td>`;
         html += "</tr>";
     }
     html += "</table>";