Merge branch 'master' into fix/improve-hint-display

Author: bartvanandel

.github/workflows/releases.yml

@@ -92,6 +92,5 @@ jobs:
 
     - name: Publish to NPM
       uses: JS-DevTools/npm-publish@v1
-      if: false
       with:
-        token: ${{ secrets.NPM_TOKEN }}
+        token: ${{ secrets.NPM_TOKEN }}

Dockerfile

@@ -29,8 +29,7 @@ RUN npm run build
 #########################################
 # We are using Github Actions: redhat-actions/buildah-build@v2 which needs manual selection of arch in base image
 # Remove TARGETARCH if docker buildx is supported in the CI release as --platform=$TARGETPLATFORM will be automatically set
-ARG TARGETARCH
 ARG TARGETPLATFORM
-FROM ${TARGETARCH}/nginx:stable-alpine AS cyberchef
+FROM --platform=${TARGETPLATFORM} nginx:stable-alpine AS cyberchef
 
 COPY --from=builder /app/build/prod /usr/share/nginx/html/

package-lock.json

@@ -132,6 +132,7 @@
     "file-saver": "^2.0.5",
     "flat": "^6.0.1",
     "geodesy": "1.1.3",
+    "hash-wasm": "^4.12.0",
     "highlight.js": "^11.9.0",
     "ieee754": "^1.2.1",
     "jimp": "^0.22.12",
@@ -140,6 +141,7 @@
     "js-sha3": "^0.9.3",
     "jsesc": "^3.0.2",
     "json5": "^2.2.3",
+    "jsonata": "^2.0.3",
     "jsonpath-plus": "^9.0.0",
     "jsonwebtoken": "8.5.1",
     "jsqr": "^1.4.0",

package.json

@@ -294,6 +294,7 @@
             "To Upper case",
             "To Lower case",
             "Swap case",
+            "Alternating Caps",
             "To Case Insensitive Regex",
             "From Case Insensitive Regex",
             "Add line numbers",
@@ -369,6 +370,7 @@
             "Regular expression",
             "XPath expression",
             "JPath expression",
+            "Jsonata Query",
             "CSS selector",
             "Extract EXIF",
             "Extract ID3",
@@ -404,6 +406,7 @@
         "name": "Hashing",
         "ops": [
             "Analyse hash",
+            "Generate all checksums",
             "Generate all hashes",
             "MD2",
             "MD4",
@@ -422,6 +425,7 @@
             "Snefru",
             "BLAKE2b",
             "BLAKE2s",
+            "BLAKE3",
             "GOST Hash",
             "Streebog",
             "SSDEEP",
@@ -446,7 +450,8 @@
             "Adler-32 Checksum",
             "Luhn Checksum",
             "CRC Checksum",
-            "TCP/IP Checksum"
+            "TCP/IP Checksum",
+            "XOR Checksum"
         ]
     },
     {

src/core/config/Categories.json

@@ -0,0 +1,53 @@
+/**
+ * @author sw5678
+ * @copyright Crown Copyright 2023
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+
+/**
+ * Alternating caps operation
+ */
+class AlternatingCaps extends Operation {
+
+    /**
+     * AlternatingCaps constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Alternating Caps";
+        this.module = "Default";
+        this.description = "Alternating caps, also known as studly caps, sticky caps, or spongecase is a form of text notation in which the capitalization of letters varies by some pattern, or arbitrarily. An example of this would be spelling 'alternative caps' as 'aLtErNaTiNg CaPs'.";
+        this.infoURL = "https://en.wikipedia.org/wiki/Alternating_caps";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args= [];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        let output = "";
+        let previousCaps = true;
+        for (let i = 0; i < input.length; i++) {
+            // Check if the element is a letter
+            if (!RegExp(/^\p{L}/, "u").test(input[i])) {
+                output += input[i];
+            } else if (previousCaps) {
+                output += input[i].toLowerCase();
+                previousCaps = false;
+            } else {
+                output += input[i].toUpperCase();
+                previousCaps = true;
+            }
+        }
+        return output;
+    }
+}
+
+export default AlternatingCaps;

src/core/operations/AlternatingCaps.mjs

@@ -0,0 +1,58 @@
+/**
+ * @author xumptex [xumptex@outlook.fr]
+ * @copyright Crown Copyright 2025
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
+import { blake3 } from "hash-wasm";
+/**
+ * BLAKE3 operation
+ */
+class BLAKE3 extends Operation {
+
+    /**
+     * BLAKE3 constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "BLAKE3";
+        this.module = "Hashing";
+        this.description = "Hashes the input using BLAKE3 (UTF-8 encoded), with an optional key (also UTF-8), and outputs the result in hexadecimal format.";
+        this.infoURL = "https://en.wikipedia.org/wiki/BLAKE_(hash_function)#BLAKE3";
+        this.inputType = "string";
+        this.outputType = "string";
+        this.args = [
+            {
+                "name": "Size (bytes)",
+                "type": "number"
+            }, {
+                "name": "Key",
+                "type": "string",
+                "value": ""
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {string}
+     */
+    run(input, args) {
+        const key = args[1];
+        const size = args[0];
+        // Check if the user want a key hash or not
+        if (key === "") {
+            return blake3(input, size*8);
+        } if (key.length !== 32) {
+            throw new OperationError("The key must be exactly 32 bytes long");
+        }
+        return blake3(input, size*8, key);
+    }
+
+}
+
+export default BLAKE3;

src/core/operations/BLAKE3.mjs

@@ -9,6 +9,7 @@ import OperationError from "../errors/OperationError.mjs";
 import { fromBase64 } from "../lib/Base64.mjs";
 import { toHexFast } from "../lib/Hex.mjs";
 import r from "jsrsasign";
+import Utils from "../Utils.mjs";
 
 /**
  * ECDSA Verify operation
@@ -59,6 +60,11 @@ class ECDSAVerify extends Operation {
                 name: "Message",
                 type: "text",
                 value: ""
+            },
+            {
+                name: "Message format",
+                type: "option",
+                value: ["Raw", "Hex", "Base64"]
             }
         ];
     }
@@ -70,7 +76,7 @@ class ECDSAVerify extends Operation {
      */
     run(input, args) {
         let inputFormat = args[0];
-        const [, mdAlgo, keyPem, msg] = args;
+        const [, mdAlgo, keyPem, msg, msgFormat] = args;
 
         if (keyPem.replace("-----BEGIN PUBLIC KEY-----", "").length === 0) {
             throw new OperationError("Please enter a public key.");
@@ -145,7 +151,8 @@ class ECDSAVerify extends Operation {
             throw new OperationError("Provided key is not a public key.");
         }
         sig.init(key);
-        sig.updateString(msg);
+        const messageStr = Utils.convertToByteString(msg, msgFormat);
+        sig.updateString(messageStr);
         const result = sig.verify(signatureASN1Hex);
         return result ? "Verified OK" : "Verification Failure";
     }

src/core/operations/ECDSAVerify.mjs

@@ -51,7 +51,7 @@ class ExtractEmailAddresses extends Operation {
     run(input, args) {
         const [displayTotal, sort, unique] = args,
             // email regex from: https://www.regextester.com/98066
-            regex = /(?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9](?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9-]*[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9])?\.)+[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9](?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9-]*[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}\])/ig;
+            regex = /(?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9](?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9-]*[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9])?\.)+[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9](?:[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9-]*[\u00A0-\uD7FF\uE000-\uFFFFa-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\])/ig;
 
         const results = search(
             input,

src/core/operations/ExtractEmailAddresses.mjs

@@ -21,7 +21,7 @@ class ExtractIPAddresses extends Operation {
 
         this.name = "Extract IP addresses";
         this.module = "Regex";
-        this.description = "Extracts all IPv4 and IPv6 addresses.<br><br>Warning: Given a string <code>710.65.0.456</code>, this will match <code>10.65.0.45</code> so always check the original input!";
+        this.description = "Extracts all IPv4 and IPv6 addresses.<br><br>Warning: Given a string <code>1.2.3.4.5.6.7.8</code>, this will match <code>1.2.3.4 and 5.6.7.8</code> so always check the original input!";
         this.inputType = "string";
         this.outputType = "string";
         this.args = [
@@ -65,7 +65,21 @@ class ExtractIPAddresses extends Operation {
      */
     run(input, args) {
         const [includeIpv4, includeIpv6, removeLocal, displayTotal, sort, unique] = args,
-            ipv4 = "(?:(?:\\d|[01]?\\d\\d|2[0-4]\\d|25[0-5])\\.){3}(?:25[0-5]|2[0-4]\\d|[01]?\\d\\d|\\d)(?:\\/\\d{1,2})?",
+
+            // IPv4 decimal groups can have values 0 to 255. To construct a regex the following sub-regex is reused:
+            ipv4DecimalByte = "(?:25[0-5]|2[0-4]\\d|1?[0-9]\\d|\\d)",
+            ipv4OctalByte = "(?:0[1-3]?[0-7]{1,2})",
+
+            // Look behind and ahead will be used to exclude matches with additional decimal digits left and right of IP address
+            lookBehind = "(?<!\\d)",
+            lookAhead = "(?!\\d)",
+
+            // Each variant requires exactly 4 groups with literal . between.
+            ipv4Decimal = "(?:" + lookBehind + ipv4DecimalByte + "\\.){3}" + "(?:" + ipv4DecimalByte + lookAhead + ")",
+            ipv4Octal = "(?:" + lookBehind + ipv4OctalByte + "\\.){3}" + "(?:" + ipv4OctalByte + lookAhead + ")",
+
+            // Then we allow IPv4 addresses to be expressed either entirely in decimal or entirely in Octal
+            ipv4 = "(?:" + ipv4Decimal + "|" + ipv4Octal + ")",
             ipv6 = "((?=.*::)(?!.*::.+::)(::)?([\\dA-F]{1,4}:(:|\\b)|){5}|([\\dA-F]{1,4}:){6})(([\\dA-F]{1,4}((?!\\3)::|:\\b|(?![\\dA-F])))|(?!\\2\\3)){2}";
         let ips  = "";