cyberchef 11.1.0 → 11.3.0

package/src/core/Recipe.mjs

@@ -212,6 +212,8 @@ class Recipe  {
                     self.sendProgressMessage(i + 1, this.opList.length);
                 }
 
+                op.validateIngredients(op.ingValues);
+
                 if (op.flowControl) {
                     // Package up the current state
                     let state = {
@@ -239,9 +241,11 @@ class Recipe  {
                     // Cannot rely on `err instanceof OperationError` here as extending
                     // native types is not fully supported yet.
                     dish.set(err.message, "string");
+                    this.lastRunOp = null;
                     return i;
                 } else if (err instanceof DishError || err?.type === "DishError") {
                     dish.set(err.message, "string");
+                    this.lastRunOp = null;
                     return i;
                 } else {
                     const e = typeof err == "string" ? { message: err } : err;

package/src/core/Utils.mjs

@@ -1015,6 +1015,7 @@ class Utils {
 
         // Parse bespoke recipe format
         recipe = recipe.replace(/\n/g, "");
+        Utils._validatePrettyRecipe(recipe);
         let m, args;
         const recipeRegex = /([^(]+)\(((?:'[^'\\]*(?:\\.[^'\\]*)*'|[^)/'])*)(\/[^)]+)?\)/g,
             recipeConfig = [];
@@ -1040,6 +1041,53 @@ class Utils {
     }
 
 
+    /**
+     * Performs a linear structural validation pass over pretty recipe syntax.
+     *
+     * @param {string} recipe
+     * @throws {Error} if the recipe is structurally invalid
+     */
+    static _validatePrettyRecipe(recipe) {
+        let i = 0;
+
+        while (i < recipe.length) {
+            const openParen = recipe.indexOf("(", i);
+            if (openParen === -1 || openParen === i) {
+                throw new Error("Invalid recipe");
+            }
+
+            i = openParen + 1;
+            let inString = false,
+                escaped = false,
+                foundCloseParen = false;
+
+            for (; i < recipe.length; i++) {
+                const c = recipe[i];
+
+                if (inString) {
+                    if (escaped) {
+                        escaped = false;
+                    } else if (c === "\\") {
+                        escaped = true;
+                    } else if (c === "'") {
+                        inString = false;
+                    }
+                } else if (c === "'") {
+                    inString = true;
+                } else if (c === ")") {
+                    foundCloseParen = true;
+                    i++;
+                    break;
+                }
+            }
+
+            if (!foundCloseParen || inString || escaped) {
+                throw new Error("Invalid recipe");
+            }
+        }
+    }
+
+
     /**
      * Formats a list of files or directories.
      *

package/src/core/config/Categories.json

@@ -83,7 +83,9 @@
             "Rison Decode",
             "To Modhex",
             "From Modhex",
-            "MIME Decoding"
+            "MIME Decoding",
+            "To COBS",
+            "From COBS"
         ]
     },
     {
@@ -113,6 +115,12 @@
             "SM4 Decrypt",
             "RC6 Encrypt",
             "RC6 Decrypt",
+            "Ascon Encrypt",
+            "Ascon Decrypt",
+            "PRESENT Encrypt",
+            "PRESENT Decrypt",
+            "Twofish Encrypt",
+            "Twofish Decrypt",
             "GOST Encrypt",
             "GOST Decrypt",
             "GOST Sign",
@@ -129,6 +137,10 @@
             "XOR Brute Force",
             "Vigenère Encode",
             "Vigenère Decode",
+            "TEA Encrypt",
+            "TEA Decrypt",
+            "XTEA Encrypt",
+            "XTEA Decrypt",
             "XXTEA Encrypt",
             "XXTEA Decrypt",
             "To Morse Code",
@@ -163,6 +175,7 @@
             "AES Key Wrap",
             "AES Key Unwrap",
             "Pseudo-Random Number Generator",
+            "Pseudo-Random Prime Generator",
             "Enigma",
             "Bombe",
             "Multiple Bombe",
@@ -231,9 +244,9 @@
             "Subtract",
             "Multiply",
             "Divide",
-            "Modular Exponentiation",
-            "Modular Inverse",
+            "MOD",
             "Extended GCD",
+            "Modular Inverse",
             "Mean",
             "Median",
             "Standard Deviation",
@@ -446,6 +459,8 @@
             "BLAKE2b",
             "BLAKE2s",
             "BLAKE3",
+            "Ascon Hash",
+            "Ascon MAC",
             "GOST Hash",
             "Streebog",
             "SSDEEP",
@@ -558,7 +573,7 @@
             "Scatter chart",
             "Series chart",
             "Heatmap chart",
-            "Extract Audio Metadata"
+            "Render PDF"
         ]
     },
     {
@@ -584,7 +599,8 @@
             "HTML To Text",
             "Generate Lorem Ipsum",
             "Numberwang",
-            "XKCD Random Number"
+            "XKCD Random Number",
+            "Automated Validation Test Op"
         ]
     },
     {
@@ -602,4 +618,4 @@
             "Comment"
         ]
     }
-]
+]