cyberchef 10.22.1 → 10.24.0

package/src/core/operations/ImageOpacity.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Image Opacity operation
  */
 class ImageOpacity extends Operation {
-
     /**
      * ImageOpacity constructor
      */
@@ -35,8 +34,8 @@ class ImageOpacity extends Operation {
                 type: "number",
                 value: 100,
                 min: 0,
-                max: 100
-            }
+                max: 100,
+            },
         ];
     }
 
@@ -63,10 +62,10 @@ class ImageOpacity extends Operation {
             image.opacity(opacity / 100);
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -90,7 +89,6 @@ class ImageOpacity extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default ImageOpacity;

package/src/core/operations/InvertImage.mjs

@@ -9,13 +9,12 @@ import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
 import { isWorkerEnvironment } from "../Utils.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Invert Image operation
  */
 class InvertImage extends Operation {
-
     /**
      * InvertImage constructor
      */
@@ -54,10 +53,10 @@ class InvertImage extends Operation {
             image.invert();
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -81,7 +80,6 @@ class InvertImage extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default InvertImage;

package/src/core/operations/Jq.mjs

@@ -30,7 +30,12 @@ class Jq extends Operation {
                 name: "Query",
                 type: "string",
                 value: ""
-            }
+            },
+            {
+                name: "Raw",
+                type: "boolean",
+                value: false
+            },
         ];
     }
 
@@ -40,7 +45,7 @@ class Jq extends Operation {
      * @returns {string}
      */
     run(input, args) {
-        const [query] = args;
+        const [query, raw] = args;
         let result;
 
         try {
@@ -48,8 +53,11 @@ class Jq extends Operation {
         } catch (err) {
             throw new OperationError(`Invalid jq expression: ${err.message}`);
         }
-
-        return JSON.stringify(result);
+        if (raw && typeof result === "string") {
+            return result;
+        } else {
+            return JSON.stringify(result);
+        }
     }
 
 }

package/src/core/operations/NormaliseImage.mjs

@@ -8,13 +8,12 @@ import Operation from "../Operation.mjs";
 import OperationError from "../errors/OperationError.mjs";
 import { isImage } from "../lib/FileType.mjs";
 import { toBase64 } from "../lib/Base64.mjs";
-import Jimp from "jimp/es/index.js";
+import { Jimp, JimpMime } from "jimp";
 
 /**
  * Normalise Image operation
  */
 class NormaliseImage extends Operation {
-
     /**
      * NormaliseImage constructor
      */
@@ -27,7 +26,7 @@ class NormaliseImage extends Operation {
         this.infoURL = "";
         this.inputType = "ArrayBuffer";
         this.outputType = "ArrayBuffer";
-        this.presentType=  "html";
+        this.presentType = "html";
         this.args = [];
     }
 
@@ -52,10 +51,10 @@ class NormaliseImage extends Operation {
             image.normalize();
 
             let imageBuffer;
-            if (image.getMIME() === "image/gif") {
-                imageBuffer = await image.getBufferAsync(Jimp.MIME_PNG);
+            if (image.mime === "image/gif") {
+                imageBuffer = await image.getBuffer(JimpMime.png);
             } else {
-                imageBuffer = await image.getBufferAsync(Jimp.AUTO);
+                imageBuffer = await image.getBuffer(image.mime);
             }
             return imageBuffer.buffer;
         } catch (err) {
@@ -79,7 +78,6 @@ class NormaliseImage extends Operation {
 
         return `<img src="data:${type};base64,${toBase64(dataArray)}">`;
     }
-
 }
 
 export default NormaliseImage;

package/src/core/operations/OffsetChecker.mjs

@@ -99,7 +99,7 @@ class OffsetChecker extends Operation {
             }
         }
 
-        return outputs.join(sampleDelim);
+        return outputs.join(Utils.escapeHtml(sampleDelim));
     }
 
 }

package/src/core/operations/ParityBit.mjs

@@ -0,0 +1,128 @@
+/**
+ * @author j83305 [awz22@protonmail.com]
+ * @copyright Crown Copyright 2020
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import { calculateParityBit, decodeParityBit } from "../lib/ParityBit.mjs";
+
+/**
+ * Parity Bit operation
+ */
+class ParityBit extends Operation {
+
+    /**
+     * ParityBit constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Parity Bit";
+        this.module = "Default";
+        this.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";
+        this.infoURL = "https://wikipedia.org/wiki/Parity_bit";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [
+            {
+                name: "Mode",
+                type: "option",
+                value: [
+                    "Even Parity",
+                    "Odd Parity"
+                ]
+            },
+            {
+                name: "Postion",
+                type: "option",
+                value: [
+                    "Start",
+                    "End"
+                ]
+            },
+            {
+                name: "Encode or Decode",
+                type: "option",
+                value: [
+                    "Encode",
+                    "Decode"
+                ]
+            },
+            {
+                name: "Delimiter",
+                type: "shortString",
+                value: ""
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        if (input.length === 0) {
+            return input;
+        }
+        /**
+         * determines weather to use the encode or decode method based off args[2]
+         * @param input input to be encoded or decoded
+         * @param args array
+         */
+        const method = (input, args) => args[2] === "Encode" ? calculateParityBit(input, args) : decodeParityBit(input, args);
+        if (args[3].length > 0) {
+            const byteStrings = input.split(args[3]);
+            for (let byteStringsArrayIndex = 0; byteStringsArrayIndex < byteStrings.length; byteStringsArrayIndex++) {
+                byteStrings[byteStringsArrayIndex] = method(byteStrings[byteStringsArrayIndex], args);
+            }
+            return byteStrings.join(args[3]);
+        }
+        return method(input, args);
+    }
+
+    /**
+     * Highlight Parity Bit
+     *
+     * @param {Object[]} pos
+     * @param {number} pos[].start
+     * @param {number} pos[].end
+     * @param {Object[]} args
+     * @returns {Object[]} pos
+     */
+    highlight(pos, args) {
+        if (args[3].length === 0) {
+            if (args[1] === "Prepend") {
+                pos[0].start += 1;
+                pos[0].end += 1;
+            }
+            return pos;
+        }
+        // need to be able to read input to do the highlighting when there is a delimiter
+    }
+
+    /**
+     * Highlight Parity Bit in reverse
+     *
+     * @param {Object[]} pos
+     * @param {number} pos[].start
+     * @param {number} pos[].end
+     * @param {Object[]} args
+     * @returns {Object[]} pos
+     */
+    highlightReverse(pos, args) {
+        if (args[3].length === 0) {
+            if (args[1] === "Prepend") {
+                if (pos[0].start > 0) {
+                    pos[0].start -= 1;
+                }
+                pos[0].end -= 1;
+            }
+            return pos;
+        }
+    }
+
+}
+
+export default ParityBit;

package/src/core/operations/ParseEthernetFrame.mjs

@@ -0,0 +1,112 @@
+/**
+ * @author tedk [tedk@ted.do]
+ * @copyright Crown Copyright 2024
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+import Utils from "../Utils.mjs";
+import {fromHex, toHex} from "../lib/Hex.mjs";
+
+/**
+ * Parse Ethernet frame operation
+ */
+class ParseEthernetFrame extends Operation {
+
+    /**
+     * ParseEthernetFrame constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Parse Ethernet frame";
+        this.module = "Default";
+        this.description = "Parses an Ethernet frame and either shows the deduced values (Source and destination MAC, VLANs) or returns the packet data.<br /><br />Good for use in conjunction with the Parse IPv4, and Parse TCP/UDP recipes.";
+        this.infoURL = "https://en.wikipedia.org/wiki/Ethernet_frame#Frame_%E2%80%93_data_link_layer";
+        this.inputType = "string";
+        this.outputType = "html";
+        this.args = [
+            {
+                name: "Input type",
+                type: "option",
+                value: [
+                    "Raw", "Hex"
+                ],
+                defaultIndex: 0,
+            },
+            {
+                name: "Return type",
+                type: "option",
+                value: [
+                    "Text output", "Packet data", "Packet data (hex)",
+                ],
+                defaultIndex: 0,
+            }
+        ];
+    }
+
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {html}
+     */
+    run(input, args) {
+        const format = args[0];
+        const outputFormat = args[1];
+
+        if (format === "Hex") {
+            input = fromHex(input);
+        } else if (format === "Raw") {
+            input = new Uint8Array(Utils.strToArrayBuffer(input));
+        } else {
+            throw new OperationError("Invalid input format selected.");
+        }
+
+        const destinationMac = input.slice(0, 6);
+        const sourceMac = input.slice(6, 12);
+
+        let offset = 12;
+        const vlans = [];
+
+        while (offset < input.length) {
+            const ethType = Utils.byteArrayToChars(input.slice(offset, offset+2));
+            offset += 2;
+
+            if (ethType === "\x81\x00" || ethType === "\x88\xA8") {
+                // Parse the VLAN tag:
+                // [0000] 0000 0000 0000
+                //  ^^^ PRIO  - Ignored
+                //     ^ DEI  - Ignored
+                //        ^^^^ ^^^^ ^^^^ VLAN ID
+                const vlanTag = input.slice(offset, offset+2);
+                vlans.push(((vlanTag[0] & 0b00001111) << 8) | vlanTag[1]);
+
+                offset += 2;
+            } else {
+                break;
+            }
+        }
+
+        const packetData = input.slice(offset);
+
+        if (outputFormat === "Packet data") {
+            return Utils.byteArrayToChars(packetData);
+        } else if (outputFormat === "Packet data (hex)") {
+            return toHex(packetData);
+        } else if (outputFormat === "Text output") {
+            let retval = `Source MAC: ${toHex(sourceMac, ":")}\nDestination MAC: ${toHex(destinationMac, ":")}\n`;
+            if (vlans.length > 0) {
+                retval += `VLAN: ${vlans.join(", ")}\n`;
+            }
+            retval += `Data:\n${toHex(packetData)}`;
+            return retval;
+        }
+
+    }
+
+
+}
+
+export default ParseEthernetFrame;

package/src/core/operations/ParseIPv4Header.mjs

@@ -33,6 +33,12 @@ class ParseIPv4Header extends Operation {
                 "name": "Input format",
                 "type": "option",
                 "value": ["Hex", "Raw"]
+            },
+            {
+                "name": "Output format",
+                "type": "option",
+                "value": ["Table", "Data (hex)", "Data (raw)"],
+                defaultIndex: 0,
             }
         ];
     }
@@ -44,6 +50,8 @@ class ParseIPv4Header extends Operation {
      */
     run(input, args) {
         const format = args[0];
+        const outputFormat = args[1];
+
         let output;
 
         if (format === "Hex") {
@@ -98,7 +106,10 @@ class ParseIPv4Header extends Operation {
             checksumResult = givenChecksum + " (incorrect, should be " + correctChecksum + ")";
         }
 
-        output = `<table class='table table-hover table-sm table-bordered table-nonfluid'><tr><th>Field</th><th>Value</th></tr>
+        const data = input.slice(ihl * 4);
+
+        if (outputFormat === "Table") {
+            output = `<table class='table table-hover table-sm table-bordered table-nonfluid'><tr><th>Field</th><th>Value</th></tr>
 <tr><td>Version</td><td>${version}</td></tr>
 <tr><td>Internet Header Length (IHL)</td><td>${ihl} (${ihl * 4} bytes)</td></tr>
 <tr><td>Differentiated Services Code Point (DSCP)</td><td>${dscp}</td></tr>
@@ -116,13 +127,19 @@ class ParseIPv4Header extends Operation {
 <tr><td>Protocol</td><td>${protocol}, ${protocolInfo.protocol} (${protocolInfo.keyword})</td></tr>
 <tr><td>Header checksum</td><td>${checksumResult}</td></tr>
 <tr><td>Source IP address</td><td>${ipv4ToStr(srcIP)}</td></tr>
-<tr><td>Destination IP address</td><td>${ipv4ToStr(dstIP)}</td></tr>`;
+<tr><td>Destination IP address</td><td>${ipv4ToStr(dstIP)}</td></tr>
+<tr><td>Data (hex)</td><td>${toHex(data)}</td></tr>`;
 
-        if (ihl > 5) {
-            output += `<tr><td>Options</td><td>${toHex(options)}</td></tr>`;
-        }
+            if (ihl > 5) {
+                output += `<tr><td>Options</td><td>${toHex(options)}</td></tr>`;
+            }
 
-        return output + "</table>";
+            return output + "</table>";
+        } else if (outputFormat === "Data (hex)") {
+            return toHex(data);
+        } else if (outputFormat === "Data (raw)") {
+            return Utils.byteArrayToChars(data);
+        }
     }
 
 }

package/src/core/operations/ParseQRCode.mjs

@@ -13,7 +13,6 @@ import { parseQrCode } from "../lib/QRCode.mjs";
  * Parse QR Code operation
  */
 class ParseQRCode extends Operation {
-
     /**
      * ParseQRCode constructor
      */
@@ -22,24 +21,26 @@ class ParseQRCode extends Operation {
 
         this.name = "Parse QR Code";
         this.module = "Image";
-        this.description = "Reads an image file and attempts to detect and read a Quick Response (QR) code from the image.<br><br><u>Normalise Image</u><br>Attempts to normalise the image before parsing it to improve detection of a QR code.";
+        this.description =
+            "Reads an image file and attempts to detect and read a Quick Response (QR) code from the image.<br><br><u>Normalise Image</u><br>Attempts to normalise the image before parsing it to improve detection of a QR code.";
         this.infoURL = "https://wikipedia.org/wiki/QR_code";
         this.inputType = "ArrayBuffer";
         this.outputType = "string";
         this.args = [
             {
-                "name": "Normalise image",
-                "type": "boolean",
-                "value": false
-            }
+                name: "Normalise image",
+                type: "boolean",
+                value: false,
+            },
         ];
         this.checks = [
             {
-                "pattern": "^(?:\\xff\\xd8\\xff|\\x89\\x50\\x4e\\x47|\\x47\\x49\\x46|.{8}\\x57\\x45\\x42\\x50|\\x42\\x4d)",
-                "flags": "",
-                "args": [false],
-                "useful": true
-            }
+                pattern:
+                    "^(?:\\xff\\xd8\\xff|\\x89\\x50\\x4e\\x47|\\x47\\x49\\x46|.{8}\\x57\\x45\\x42\\x50|\\x42\\x4d)",
+                flags: "",
+                args: [false],
+                useful: true,
+            },
         ];
     }
 
@@ -54,9 +55,8 @@ class ParseQRCode extends Operation {
         if (!isImage(input)) {
             throw new OperationError("Invalid file type.");
         }
-        return await parseQrCode(input, normalise);
+        return parseQrCode(input, normalise);
     }
-
 }
 
 export default ParseQRCode;