From 1542cadde8f60d50f2bf8d53d0f0b9f888e2cbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=BCgo?= <8133415+rbpi@users.noreply.github.com>
Date: Wed, 4 Feb 2026 01:44:59 +0700
Subject: [PATCH 1/2] Update Sitemap URLs to Use Valid Paths in sitemap.mjs
 (#1861)

Co-authored-by: C85297 <95289555+C85297@users.noreply.github.com>
---
 src/web/static/sitemap.mjs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/web/static/sitemap.mjs b/src/web/static/sitemap.mjs
index b96047fc..4f8101d4 100644
--- a/src/web/static/sitemap.mjs
+++ b/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({
-    hostname: "https://gchq.github.io/CyberChef",
-});
+const baseUrl = "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
 );

From fa34e2fafc5df9c7153676c5df6d8263094c12cb Mon Sep 17 00:00:00 2001
From: Thomas <31802793+ThomasNotTom@users.noreply.github.com>
Date: Wed, 4 Feb 2026 09:38:25 +0000
Subject: [PATCH 2/2] Fix: Correctly parse xxd odd byte hexdumps (#2058)

Co-authored-by: GCHQDeveloper581 <63102987+GCHQDeveloper581@users.noreply.github.com>
---
 src/core/operations/FromHexdump.mjs |  2 +-
 tests/operations/tests/Hexdump.mjs  | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/core/operations/FromHexdump.mjs b/src/core/operations/FromHexdump.mjs
index e8c25441..6fd3c1dc 100644
--- a/src/core/operations/FromHexdump.mjs
+++ b/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))) {
diff --git a/tests/operations/tests/Hexdump.mjs b/tests/operations/tests/Hexdump.mjs
index 90523a08..6eb486db 100644
--- a/tests/operations/tests/Hexdump.mjs
+++ b/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 ........ ........