Merge branch 'master' into update-tesseract-version-to-6-0-1

.editorconfig

@@ -12,3 +12,7 @@ indent_size = 4
 [{package.json,.travis.yml,nightwatch.json}]
 indent_style = space
 indent_size = 2
+
+[.github/**.yml]
+indent_style = space
+indent_size = 2

.github/workflows/codeql.yml

@@ -1,40 +0,0 @@
-name: "CodeQL Analysis"
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-    types: [synchronize, opened, reopened]
-  schedule:
-    - cron: '22 17 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/master.yml

@@ -1,5 +1,8 @@
 name: "Master Build, Test & Deploy"
 
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
   push:
@@ -8,14 +11,17 @@ on:
 
 jobs:
   main:
+    permissions:
+      contents: write
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Set node version
-      uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-        node-version: '18.x'
+          node-version: 18
+          registry-url: "https://registry.npmjs.org"
 
       - name: Install
         run: |

.github/workflows/pull_requests.yml

@@ -1,5 +1,8 @@
 name: "Pull Requests"
 
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
   pull_request:
@@ -9,12 +12,13 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Set node version
-      uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-        node-version: '18.x'
+          node-version: 18
+          registry-url: "https://registry.npmjs.org"
 
       - name: Install
         run: |
@@ -45,8 +49,6 @@ jobs:
         id: build-image
         uses: docker/build-push-action@v6
         with:
-        # Not being uploaded to any registry, use a simple name to allow Buildah to build correctly.
-        image: cyberchef
           platforms: linux/amd64,linux/arm64
       - name: UI Tests
         if: success()

.github/workflows/releases.yml

@@ -4,7 +4,11 @@ on:
   workflow_dispatch:
   push:
     tags:
-    - 'v*'
+      - "v*"
+
+permissions:
+  id-token: write
+  contents: read
 
 env:
   REGISTRY: ghcr.io
@@ -16,12 +20,13 @@ jobs:
   main:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
 
       - name: Set node version
-      uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
-        node-version: '18.x'
+          node-version: 18
+          registry-url: "https://registry.npmjs.org"
 
       - name: Install
         run: |
@@ -89,6 +94,4 @@ jobs:
           body: "See the [CHANGELOG](https://github.com/gchq/CyberChef/blob/master/CHANGELOG.md) and [commit messages](https://github.com/gchq/CyberChef/commits/master) for details."
 
       - name: Publish to NPM
-      uses: JS-DevTools/npm-publish@v1
+        run: npm publish
-      with:
-        token: ${{ secrets.NPM_TOKEN }}

src/core/operations/FromHexdump.mjs

@@ -43,7 +43,7 @@ class FromHexdump extends Operation {
      */
     run(input, args) {
         const output = [],
-            regex = /^\s*(?:[\dA-F]{4,16}h?:?)?[ \t]+((?:[\dA-F]{2} ){1,8}(?:[ \t]|[\dA-F]{2}-)(?:[\dA-F]{2} ){1,8}|(?:[\dA-F]{4} )*[\dA-F]{4}|(?:[\dA-F]{2} )*[\dA-F]{2})/igm;
+            regex = /^\s*(?:[\dA-F]{4,16}h?:?)?[ \t]+((?:[\dA-F]{2} ){1,8}(?:[ \t]|[\dA-F]{2}-)(?:[\dA-F]{2} ){1,8}|(?:[\dA-F]{4} )+(?:[\dA-F]{2})?|(?:[\dA-F]{2} )*[\dA-F]{2})/igm;
         let block, line;
 
         while ((block = regex.exec(input))) {

src/node/apiUtils.mjs

@@ -66,7 +66,7 @@ export function removeSubheadingsFromArray(array) {
  * @param str
  */
 export function sanitise(str) {
-    return str.replace(/ /g, "").toLowerCase();
+    return str.replace(/[/\s.-]/g, "").toLowerCase();
 }
 
 

src/web/static/sitemap.mjs

@@ -1,6 +1,5 @@
 import sm from "sitemap";
-import OperationConfig from "../../core/config/OperationConfig.json" assert {type: "json"};
+import OperationConfig from "../../core/config/OperationConfig.json" assert { type: "json" };
-
 
 /**
  * Generates an XML sitemap for all CyberChef operations and a number of recipes.
@@ -10,25 +9,25 @@ import OperationConfig from "../../core/config/OperationConfig.json" assert {typ
  * @license Apache-2.0
  */
 
-const smStream = new sm.SitemapStream({
+const baseUrl = "https://gchq.github.io/CyberChef/";
-    hostname: "https://gchq.github.io/CyberChef",
+
-});
+const smStream = new sm.SitemapStream({});
 
 smStream.write({
-    url: "/",
+    url: baseUrl,
     changefreq: "weekly",
-    priority: 1.0
+    priority: 1.0,
 });
 
 for (const op in OperationConfig) {
     smStream.write({
-        url: `/?op=${encodeURIComponent(op)}`,
+        url: `${baseUrl}?op=${encodeURIComponent(op)}`,
         changeFreq: "yearly",
-        priority: 0.5
+        priority: 0.5,
     });
 }
 smStream.end();
 
 sm.streamToPromise(smStream).then(
-    buffer => console.log(buffer.toString()) // eslint-disable-line no-console
+    (buffer) => console.log(buffer.toString()), // eslint-disable-line no-console
 );

tests/node/tests/nodeApi.mjs

@@ -345,6 +345,42 @@ TestRegister.addApiTests([
         assert.strictEqual(result.toString(), "begin_something_aaaaaaaaaaaaaa_end_something");
     }),
 
+    it("chef.bake: should accept operation names from Chef Website which contain forward slash", () => {
+        const result = chef.bake("I'll have the test salmon", [
+            { "op": "Find / Replace",
+                "args": [{ "option": "Regex", "string": "test" }, "good", true, false, true, false]}
+        ]);
+        assert.strictEqual(result.toString(), "I'll have the good salmon");
+    }),
+
+    it("chef.bake: should accept operation names from Chef Website which contain a hyphen", () => {
+        const result = chef.bake("I'll have the test salmon", [
+            { "op": "Adler-32 Checksum",
+                "args": [] }
+        ]);
+        assert.strictEqual(result.toString(), "6e4208f8");
+    }),
+
+    it("chef.bake: should accept operation names from Chef Website which contain a period", () => {
+        const result = chef.bake("30 13 02 01 05 16 0e 41 6e 79 62 6f 64 79 20 74 68 65 72 65 3f", [
+            { "op": "Parse ASN.1 hex string",
+                "args": [0, 32] }
+        ]);
+        assert.strictEqual(result.toString(), `SEQUENCE
+  INTEGER 05
+  IA5String 'Anybody there?'
+`);
+    }),
+
+    it("Excluded operations: throw a sensible error when you try and call one", () => {
+        try {
+            chef.fork();
+        } catch (e) {
+            assert.strictEqual(e.type, "ExcludedOperationError");
+            assert.strictEqual(e.message, "Sorry, the Fork operation is not available in the Node.js version of CyberChef.");
+        }
+    }),
+
     it("chef.bake: cannot accept flowControl operations in recipe", () => {
         assert.throws(() => chef.bake("some input", "magic"), {
             name: "TypeError",

tests/operations/tests/Hexdump.mjs

@@ -152,6 +152,17 @@ TestRegister.addTests([
             }
         ],
     },
+    {
+        name: "From Hexdump: xxd format, odd number of bytes",
+        input: "00000000: 6162 6364 65                             abcde",
+        expectedOutput: "abcde",
+        recipeConfig: [
+            {
+                op: "From Hexdump",
+                args: []
+            }
+        ],
+    },
     {
         name: "From Hexdump: Wireshark",
         input: `00000000  00 01 02 03 04 05 06 07  08 09 0a 0b 0c 0d 0e 0f ........ ........