Merge branch 'master' into feat/1216-1531-upgrade-uuid

Author: a3957273

.github/workflows/releases.yml

@@ -25,6 +25,7 @@ jobs:
 
     - name: Install
       run: |
+        export DETECT_CHROMEDRIVER_VERSION=true
         npm ci
         npm run setheapsize
 
@@ -61,12 +62,22 @@ jobs:
         tags: ${{ steps.image-metadata.outputs.tags }}
         labels: ${{ steps.image-metadata.outputs.labels }}
         containerfiles: ./Dockerfile
-        platforms: linux/amd64
+        platforms: linux/amd64,linux/arm64
         oci: true
+        # enable build layer caching between platforms
+        layers: true
         # Webpack seems to use a lot of open files, increase the max open file limit to accomodate.
         extra-args: |
           --ulimit nofile=10000
 
+    - name: Publish to GHCR
+      uses: redhat-actions/push-to-registry@v2
+      with:
+        image: ${{ steps.build-image.outputs.image }}
+        tags: ${{ steps.build-image.outputs.tags }}
+        registry: ${{ env.REGISTRY }}
+        username: ${{ env.REGISTRY_USER }}
+        password: ${{ env.REGISTRY_PASSWORD }}
 
     - name: Upload Release Assets
       id: upload-release-assets
@@ -83,11 +94,3 @@ jobs:
       uses: JS-DevTools/npm-publish@v1
       with:
         token: ${{ secrets.NPM_TOKEN }}
-
-    - name: Publish to GHCR
-      uses: redhat-actions/push-to-registry@v2
-      with:
-        tags: ${{ steps.build-image.outputs.tags }}
-        registry: ${{ env.REGISTRY }}
-        username: ${{ env.REGISTRY_USER }}
-        password: ${{ env.REGISTRY_PASSWORD }}

Dockerfile

@@ -1,9 +1,35 @@
-FROM node:18-alpine AS build
+#####################################
+# Build the app to a static website #
+#####################################
+# Modifier --platform=$BUILDPLATFORM limits the platform to "BUILDPLATFORM" during buildx multi-platform builds
+# This is because npm "chromedriver" package is not compatiable with all platforms
+# For more info see: https://docs.docker.com/build/building/multi-platform/#cross-compilation
+FROM --platform=$BUILDPLATFORM node:18-alpine AS builder
 
+WORKDIR /app
+
+COPY package.json .
+COPY package-lock.json .
+
+# Install dependencies
+# --ignore-scripts prevents postinstall script (which runs grunt) as it depends on files other than package.json
+RUN npm ci --ignore-scripts
+
+# Copy files needed for postinstall and build
 COPY . .
-RUN npm ci
+
+# npm postinstall runs grunt, which depends on files other than package.json
+RUN npm run postinstall
+
+# Build the app
 RUN npm run build
 
-FROM nginx:1.25-alpine3.18 AS cyberchef
+#########################################
+# Package static build files into nginx #
+#########################################
+# 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 TARGETPLATFORM
+FROM --platform=${TARGETPLATFORM} nginx:stable-alpine AS cyberchef
 
-COPY --from=build ./build/prod /usr/share/nginx/html/
+COPY --from=builder /app/build/prod /usr/share/nginx/html/

package-lock.json

@@ -123,6 +123,7 @@
     "d3": "7.9.0",
     "d3-hexbin": "^0.2.2",
     "diff": "^5.2.0",
+    "dompurify": "^3.2.5",
     "es6-promisify": "^7.0.0",
     "escodegen": "^2.1.0",
     "esprima": "^4.0.1",
@@ -131,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",
@@ -139,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"
         ]
     },
     {
@@ -470,6 +475,7 @@
             "Jq",
             "CSS selector",
             "PHP Deserialize",
+            "PHP Serialize",
             "Microsoft Script Decoder",
             "Strip HTML tags",
             "Diff",

src/core/config/Categories.json

@@ -0,0 +1,23 @@
+// import Utils from "../Utils.mjs";
+
+/**
+ * Base32 resources.
+ *
+ * @author Peter C-S [[email protected]]
+ * @license Apache-2.0
+ */
+
+/**
+ * Base32 alphabets.
+ */
+export const ALPHABET_OPTIONS = [
+    {
+        name: "Standard", // https://www.rfc-editor.org/rfc/rfc4648#section-6
+        value: "A-Z2-7=",
+    },
+    {
+        name: "Hex Extended", // https://www.rfc-editor.org/rfc/rfc4648#section-7
+        value: "0-9A-V=",
+    },
+];
+

src/core/lib/Base32.mjs

@@ -112,7 +112,7 @@ class AESDecrypt extends Operation {
     run(input, args) {
         const key = Utils.convertToByteString(args[0].string, args[0].option),
             iv = Utils.convertToByteString(args[1].string, args[1].option),
-            mode = args[2].substring(0, 3),
+            mode = args[2].split("/")[0],
             noPadding = args[2].endsWith("NoPadding"),
             inputType = args[3],
             outputType = args[4],

src/core/operations/AESDecrypt.mjs

@@ -66,6 +66,14 @@ class AESEncrypt extends Operation {
                     {
                         name: "ECB",
                         off: [5]
+                    },
+                    {
+                        name: "CBC/NoPadding",
+                        off: [5]
+                    },
+                    {
+                        name: "ECB/NoPadding",
+                        off: [5]
                     }
                 ]
             },
@@ -98,7 +106,8 @@ class AESEncrypt extends Operation {
     run(input, args) {
         const key = Utils.convertToByteString(args[0].string, args[0].option),
             iv = Utils.convertToByteString(args[1].string, args[1].option),
-            mode = args[2],
+            mode = args[2].split("/")[0],
+            noPadding =  args[2].endsWith("NoPadding"),
             inputType = args[3],
             outputType = args[4],
             aad = Utils.convertToByteString(args[5].string, args[5].option);
@@ -114,11 +123,20 @@ The following algorithms will be used based on the size of the key:
 
         input = Utils.convertToByteString(input, inputType);
 
+        // Handle NoPadding modes
+        if (noPadding && input.length % 16 !== 0) {
+            throw new OperationError("Input length must be a multiple of 16 bytes for NoPadding modes.");
+        }
         const cipher = forge.cipher.createCipher("AES-" + mode, key);
         cipher.start({
             iv: iv,
             additionalData: mode === "GCM" ? aad : undefined
         });
+        if (noPadding) {
+            cipher.mode.pad = function(output, options) {
+                return true;
+            };
+        }
         cipher.update(forge.util.createBuffer(input));
         cipher.finish();
 

src/core/operations/AESEncrypt.mjs

@@ -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;