7.6.2

Gruntfile.js

@@ -186,7 +186,10 @@ module.exports = function (grunt) {
             options: webpackConfig,
             metaConf: {
                 target: "node",
-                entry: "./src/core/config/OperationConfig.js",
+                entry: [
+                    "babel-polyfill",
+                    "./src/core/config/OperationConfig.js"
+                ],
                 output: {
                     filename: "MetaConfig.js",
                     path: __dirname + "/src/core/config/",
@@ -198,7 +201,10 @@ module.exports = function (grunt) {
             },
             metaConfDev: {
                 target: "node",
-                entry: "./src/core/config/OperationConfig.js",
+                entry: [
+                    "babel-polyfill",
+                    "./src/core/config/OperationConfig.js"
+                ],
                 output: {
                     filename: "MetaConfig.js",
                     path: __dirname + "/src/core/config/",

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "7.5.1",
+  "version": "7.6.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -4341,11 +4341,6 @@
         "pinkie-promise": "2.0.1"
       }
     },
-    "google-code-prettify": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/google-code-prettify/-/google-code-prettify-1.0.5.tgz",
-      "integrity": "sha1-n0d/Ik2/piNy5e+AOn4VdBBAAIQ="
-    },
     "graceful-fs": {
       "version": "4.1.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -4745,6 +4740,11 @@
       "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
       "dev": true
     },
+    "highlight.js": {
+      "version": "9.12.0",
+      "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz",
+      "integrity": "sha1-5tnb5Xy+/mB1HwKvM2GVhwyQwB4="
+    },
     "hmac-drbg": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "7.5.1",
+  "version": "7.6.2",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -80,7 +80,7 @@
     "esprima": "^4.0.0",
     "exif-parser": "^0.1.12",
     "file-saver": "^1.3.3",
-    "google-code-prettify": "^1.0.5",
+    "highlight.js": "^9.12.0",
     "jquery": "^3.2.1",
     "js-crc": "^0.2.0",
     "js-sha3": "^0.7.0",

src/core/FlowControl.js

@@ -52,14 +52,25 @@ const FlowControl = {
             output = "",
             progress = 0;
 
+        state.forkOffset += state.progress + 1;
+
         recipe.addOperations(subOpList);
 
+        // Take a deep(ish) copy of the ingredient values
+        const ingValues = subOpList.map(op => JSON.parse(JSON.stringify(op.getIngValues())));
+
         // Run recipe over each tranche
         for (i = 0; i < inputs.length; i++) {
             log.debug(`Entering tranche ${i + 1} of ${inputs.length}`);
+
+            // Baseline ing values for each tranche so that registers are reset
+            subOpList.forEach((op, i) => {
+                op.setIngValues(JSON.parse(JSON.stringify(ingValues[i])));
+            });
+
             const dish = new Dish(inputs[i], inputType);
             try {
-                progress = await recipe.execute(dish, 0);
+                progress = await recipe.execute(dish, 0, state);
             } catch (err) {
                 if (!ignoreErrors) {
                     throw err;
@@ -117,7 +128,7 @@ const FlowControl = {
         if (!registers) return state;
 
         if (ENVIRONMENT_IS_WORKER()) {
-            self.setRegisters(state.progress, state.numRegisters, registers.slice(1));
+            self.setRegisters(state.forkOffset + state.progress, state.numRegisters, registers.slice(1));
         }
 
         /**

src/core/Recipe.js

@@ -141,11 +141,14 @@ Recipe.prototype.lastOpIndex = function(startIndex) {
  *
  * @param {Dish} dish
  * @param {number} [startFrom=0] - The index of the Operation to start executing from
+ * @param {number} [forkState={}] - If this is a forked recipe, the state of the recipe up to this point
  * @returns {number} - The final progress through the recipe
  */
-Recipe.prototype.execute = async function(dish, startFrom) {
-    startFrom = startFrom || 0;
-    let op, input, output, numJumps = 0, numRegisters = 0;
+Recipe.prototype.execute = async function(dish, startFrom = 0, forkState = {}) {
+    let op, input, output,
+        numJumps = 0,
+        numRegisters = forkState.numRegisters || 0;
+
     log.debug(`[*] Executing recipe of ${this.opList.length} operations, starting at ${startFrom}`);
 
     for (let i = startFrom; i < this.opList.length; i++) {
@@ -171,7 +174,8 @@ Recipe.prototype.execute = async function(dish, startFrom) {
                     "dish":         dish,
                     "opList":       this.opList,
                     "numJumps":     numJumps,
-                    "numRegisters": numRegisters
+                    "numRegisters": numRegisters,
+                    "forkOffset":   forkState.forkOffset || 0
                 };
 
                 state = await op.run(state);
@@ -256,4 +260,5 @@ Recipe.prototype.generateHighlightList = function() {
     return highlights;
 };
 
+
 export default Recipe;

src/core/Utils.js

@@ -903,9 +903,9 @@ const Utils = {
      * "Pretty" CyberChef recipe formats are designed to be included in the fragment (#) or query (?)
      * parts of the URL. They can also be loaded into CyberChef through the 'Load' interface. In order
      * to make this format as readable as possible, various special characters are used unescaped. This
-     * reduces the amount of percent-encoding included in the URL which is typically difficult to read,
-     * as well as substantially increasing the overall length. These characteristics can be quite
-     * offputting for users.
+     * reduces the amount of percent-encoding included in the URL which is typically difficult to read
+     * and substantially increases the overall length. These characteristics can be quite off-putting
+     * for users.
      *
      * @param {Object[]} recipeConfig
      * @param {boolean} newline - whether to add a newline after each operation
@@ -922,12 +922,11 @@ const Utils = {
             name = op.op.replace(/ /g, "_");
             args = JSON.stringify(op.args)
                 .slice(1, -1) // Remove [ and ] as they are implied
-                // We now need to switch double-quoted (") strings to single-quotes (') as these do not
-                // need to be percent-encoded.
+                // We now need to switch double-quoted (") strings to single quotes (') as single quotes
+                // do not need to be percent-encoded.
                 .replace(/'/g, "\\'") // Escape single quotes
-                .replace(/\\"/g, '"') // Unescape double quotes
-                .replace(/(^|,|{|:)"/g, "$1'") // Replace opening " with '
-                .replace(/"(,|:|}|$)/g, "'$1"); // Replace closing " with '
+                .replace(/"((?:[^"\\]|\\.)*)"/g, "'$1'") // Replace opening and closing " with '
+                .replace(/\\"/g, '"'); // Unescape double quotes
 
             disabled = op.disabled ? "/disabled": "";
             bp = op.breakpoint ? "/breakpoint" : "";

src/core/config/Categories.js

@@ -201,6 +201,7 @@ const Categories = [
             "Escape string",
             "Unescape string",
             "Pseudo-Random Number Generator",
+            "Sleep",
         ]
     },
     {
@@ -213,6 +214,7 @@ const Categories = [
             "Windows Filetime to UNIX Timestamp",
             "UNIX Timestamp to Windows Filetime",
             "Extract dates",
+            "Sleep",
         ]
     },
     {

src/core/config/OperationConfig.js

@@ -2125,13 +2125,13 @@ const OperationConfig = {
         args: [
             {
                 name: "Split delimiter",
-                type: "binaryShortString",
-                value: StrUtils.SPLIT_DELIM
+                type: "editableOption",
+                value: StrUtils.SPLIT_DELIM_OPTIONS
             },
             {
                 name: "Join delimiter",
-                type: "option",
-                value: StrUtils.DELIMITER_OPTIONS
+                type: "editableOption",
+                value: StrUtils.JOIN_DELIM_OPTIONS
             }
         ]
     },
@@ -2154,7 +2154,7 @@ const OperationConfig = {
             {
                 name: "Invert condition",
                 type: "boolean",
-                value: SeqUtils.SORT_REVERSE
+                value: false
             },
         ]
     },
@@ -2441,6 +2441,19 @@ const OperationConfig = {
             }
         ]
     },
+    "Sleep": {
+        module: "Default",
+        description: "Sleep causes the recipe to wait for a specified number of milliseconds before continuing execution.",
+        inputType: "ArrayBuffer",
+        outputType: "ArrayBuffer",
+        args: [
+            {
+                name: "Time (ms)",
+                type: "number",
+                value: 1000
+            }
+        ]
+    },
     "Windows Filetime to UNIX Timestamp": {
         module: "JSBN",
         description: "Converts a Windows Filetime value to a UNIX timestamp.<br><br>A Windows Filetime is a 64-bit value representing the number of 100-nanosecond intervals since January 1, 1601 UTC.<br><br>A UNIX timestamp is a 32-bit value representing the number of seconds since January 1, 1970 UTC (the UNIX epoch).<br><br>This operation also supports UNIX timestamps in milliseconds, microseconds and nanoseconds.",
@@ -3449,15 +3462,10 @@ const OperationConfig = {
         outputType: "html",
         args: [
             {
-                name: "Language/File extension",
+                name: "Language",
                 type: "option",
                 value: Code.LANGUAGES
             },
-            {
-                name: "Display line numbers",
-                type: "boolean",
-                value: Code.LINE_NUMS
-            }
         ]
     },
     "TCP/IP Checksum": {

src/core/config/modules/Code.js

@@ -11,7 +11,7 @@ import Code from "../../operations/Code.js";
  *  - xmldom
  *  - xpath
  *  - jpath
- *  - googlecodeprettify
+ *  - highlight.js
  *
  * @author n1474335 [n1474335@gmail.com]
  * @copyright Crown Copyright 2017

src/core/config/modules/Default.js

@@ -130,6 +130,7 @@ OpModules.Default = {
     "Translate DateTime Format": DateTime.runTranslateFormat,
     "From UNIX Timestamp":  DateTime.runFromUnixTimestamp,
     "To UNIX Timestamp":    DateTime.runToUnixTimestamp,
+    "Sleep":                DateTime.runSleep,
     "Microsoft Script Decoder": MS.runDecodeScript,
     "Entropy":              Entropy.runEntropy,
     "Frequency distribution": Entropy.runFreqDistrib,

src/core/operations/Code.js

@@ -1,12 +1,10 @@
 import {camelCase, kebabCase, snakeCase} from "lodash";
-
-import Utils from "../Utils.js";
 import vkbeautify from "vkbeautify";
 import {DOMParser} from "xmldom";
 import xpath from "xpath";
 import jpath from "jsonpath";
 import nwmatcher from "nwmatcher";
-import prettyPrintOne from "imports-loader?window=>global!exports-loader?prettyPrintOne!google-code-prettify/bin/prettify.min.js";
+import hljs from "highlight.js";
 
 
 /**
@@ -24,12 +22,7 @@ const Code = {
      * @constant
      * @default
      */
-    LANGUAGES: ["default-code", "default-markup", "bash", "bsh", "c", "cc", "coffee", "cpp", "cs", "csh", "cv", "cxx", "cyc", "htm", "html", "in.tag", "java", "javascript", "js", "json", "m", "mxml", "perl", "pl", "pm", "py", "python", "rb", "rc", "rs", "ruby", "rust", "sh", "uq.val", "xhtml", "xml", "xsl"],
-    /**
-     * @constant
-     * @default
-     */
-    LINE_NUMS: false,
+    LANGUAGES: ["auto detect"].concat(hljs.listLanguages()),
 
     /**
      * Syntax highlighter operation.
@@ -39,9 +32,13 @@ const Code = {
      * @returns {html}
      */
     runSyntaxHighlight: function(input, args) {
-        let language = args[0],
-            lineNums = args[1];
-        return "<code class='prettyprint'>" + prettyPrintOne(Utils.escapeHtml(input), language, lineNums) + "</code>";
+        const language = args[0];
+
+        if (language === "auto detect") {
+            return hljs.highlightAuto(input).value;
+        }
+
+        return hljs.highlight(language, input, true).value;
     },
 
 

src/core/operations/DateTime.js

@@ -189,6 +189,20 @@ const DateTime = {
     },
 
 
+    /**
+     * Sleep operation.
+     *
+     * @param {ArrayBuffer} input
+     * @param {Object[]} args
+     * @returns {ArrayBuffer}
+     */
+    runSleep: async function(input, args) {
+        const ms = args[0];
+        await new Promise(r => setTimeout(r, ms));
+        return input;
+    },
+
+
     /**
      * @constant
      */

src/core/operations/Extract.js

@@ -287,7 +287,7 @@ const Extract = {
             includeUnixPath = args[1],
             displayTotal = args[2],
             winDrive = "[A-Z]:\\\\",
-            winName = "[A-Z\\d][A-Z\\d\\- '_\\(\\)]{0,61}",
+            winName = "[A-Z\\d][A-Z\\d\\- '_\\(\\)~]{0,61}",
             winExt = "[A-Z\\d]{1,6}",
             winPath = winDrive + "(?:" + winName + "\\\\?)*" + winName +
                 "(?:\\." + winExt + ")?",

src/core/operations/Regex.js

@@ -44,7 +44,7 @@ const Regex = {
         },
         {
             name: "Windows file path",
-            value: "([A-Za-z]):\\\\((?:[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)]{0,61}\\\\?)*[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)]{0,61})(\\.[A-Za-z\\d]{1,6})?"
+            value: "([A-Za-z]):\\\\((?:[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)~]{0,61}\\\\?)*[A-Za-z\\d][A-Za-z\\d\\- \\x27_\\(\\)]{0,61})(\\.[A-Za-z\\d]{1,6})?"
         },
         {
             name: "UNIX file path",

src/core/operations/StrUtils.js

@@ -65,12 +65,28 @@ const StrUtils = {
      * @constant
      * @default
      */
-    SPLIT_DELIM: ",",
+    SPLIT_DELIM_OPTIONS: [
+        {name: "Comma", value: ","},
+        {name: "Space", value: " "},
+        {name: "Line feed", value: "\\n"},
+        {name: "CRLF", value: "\\r\\n"},
+        {name: "Semi-colon", value: ";"},
+        {name: "Colon", value: ":"},
+        {name: "Nothing (separate chars)", value: ""}
+    ],
     /**
      * @constant
      * @default
      */
-    DELIMITER_OPTIONS: ["Line feed", "CRLF", "Space", "Comma", "Semi-colon", "Colon", "Nothing (separate chars)"],
+    JOIN_DELIM_OPTIONS: [
+        {name: "Line feed", value: "\\n"},
+        {name: "CRLF", value: "\\r\\n"},
+        {name: "Space", value: " "},
+        {name: "Comma", value: ","},
+        {name: "Semi-colon", value: ";"},
+        {name: "Colon", value: ":"},
+        {name: "Nothing (join chars)", value: ""}
+    ],
 
     /**
      * Split operation.
@@ -80,14 +96,20 @@ const StrUtils = {
      * @returns {string}
      */
     runSplit: function(input, args) {
-        let splitDelim = args[0] || StrUtils.SPLIT_DELIM,
-            joinDelim = Utils.charRep[args[1]],
+        let splitDelim = args[0],
+            joinDelim = args[1],
             sections = input.split(splitDelim);
 
         return sections.join(joinDelim);
     },
 
 
+    /**
+     * @constant
+     * @default
+     */
+    DELIMITER_OPTIONS: ["Line feed", "CRLF", "Space", "Comma", "Semi-colon", "Colon", "Nothing (separate chars)"],
+
     /**
      * Filter operation.
      *

src/web/App.js

@@ -443,6 +443,7 @@ App.prototype.getRecipeConfig = function() {
 /**
  * Given a recipe configuration, sets the recipe to that configuration.
  *
+ * @fires Manager#statechange
  * @param {Object[]} recipeConfig - The recipe configuration
  */
 App.prototype.setRecipeConfig = function(recipeConfig) {

src/web/InputWaiter.js

@@ -64,6 +64,7 @@ InputWaiter.prototype.set = function(input) {
         this.setInputInfo(input.size, null);
     } else {
         inputText.value = input;
+        this.closeFile();
         window.dispatchEvent(this.manager.statechange);
         const lines = input.length < (this.app.options.ioDisplayThreshold * 1024) ?
             input.count("\n") + 1 : null;

src/web/OperationsWaiter.js

@@ -167,7 +167,8 @@ OperationsWaiter.prototype.opListCreate = function(e) {
 OperationsWaiter.prototype.enableOpsListPopovers = function(el) {
     $(el).find("[data-toggle=popover]").addBack("[data-toggle=popover]")
         .popover({trigger: "manual"})
-        .on("mouseenter", function() {
+        .on("mouseenter", function(e) {
+            if (e.buttons > 0) return; // Mouse button held down - likely dragging an opertion
             const _this = this;
             $(this).popover("show");
             $(".popover").on("mouseleave", function () {
@@ -178,7 +179,7 @@ OperationsWaiter.prototype.enableOpsListPopovers = function(el) {
             setTimeout(function() {
                 // Determine if the popover associated with this element is being hovered over
                 if ($(_this).data("bs.popover") &&
-                    !$(_this).data("bs.popover").$tip.is(":hover")) {
+                    ($(_this).data("bs.popover").$tip && !$(_this).data("bs.popover").$tip.is(":hover"))) {
                     $(_this).popover("hide");
                 }
             }, 50);

src/web/OutputWaiter.js

@@ -64,7 +64,7 @@ OutputWaiter.prototype.set = function(data, type, duration, preserveBuffer) {
 
             outputText.value = "";
             outputHtml.innerHTML = data;
-            this.dishStr = Utils.stripHtmlTags(data, true);
+            this.dishStr = Utils.unescapeHtml(Utils.stripHtmlTags(data, true));
             length = data.length;
             lines = this.dishStr.count("\n") + 1;
 

src/web/stylesheets/index.js

@@ -7,7 +7,7 @@
  */
 
 /* Libraries */
-import "google-code-prettify/src/prettify.css";
+import "highlight.js/styles/vs.css";
 
 /* Frameworks */
 import "./vendors/bootstrap.less";