cyberchef 9.38.7 → 9.39.0

package/CHANGELOG.md

@@ -13,6 +13,9 @@ All major and minor version changes will be documented in this file. Details of
 
 ## Details
 
+### [9.39.0] - 2022-06-09
+- Added 'ELF Info' operation [@n1073645] | [#1364]
+
 ### [9.38.0] - 2022-05-30
 - Added 'Parse TCP' operation [@n1474335] | [a895d1d]
 
@@ -291,6 +294,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
+[9.39.0]: https://github.com/gchq/CyberChef/releases/tag/v9.39.0
 [9.38.0]: https://github.com/gchq/CyberChef/releases/tag/v9.38.0
 [9.37.0]: https://github.com/gchq/CyberChef/releases/tag/v9.37.0
 [9.36.0]: https://github.com/gchq/CyberChef/releases/tag/v9.36.0
@@ -508,3 +512,4 @@ All major and minor version changes will be documented in this file. Details of
 [#1244]: https://github.com/gchq/CyberChef/pull/1244
 [#1313]: https://github.com/gchq/CyberChef/pull/1313
 [#1326]: https://github.com/gchq/CyberChef/pull/1326
+[#1364]: https://github.com/gchq/CyberChef/pull/1364

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.38.7",
+  "version": "9.39.0",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -122,6 +122,7 @@
     "js-crc": "^0.2.0",
     "js-sha3": "^0.8.0",
     "jsesc": "^3.0.2",
+    "json5": "^2.2.1",
     "jsonpath": "^1.1.1",
     "jsonwebtoken": "^8.5.1",
     "jsqr": "^1.4.0",

package/src/core/config/Categories.json

@@ -413,7 +413,8 @@
             "Extract RGBA",
             "View Bit Plane",
             "Randomize Colour Palette",
-            "Extract LSB"
+            "Extract LSB",
+            "ELF Info"
         ]
     },
     {

package/src/core/config/OperationConfig.json

@@ -4141,6 +4141,16 @@
             }
         ]
     },
+    "ELF Info": {
+        "module": "Default",
+        "description": "Implements readelf-like functionality. This operation will extract the ELF Header, Program Headers, Section Headers and Symbol Table for an ELF file.",
+        "infoURL": "https://www.wikipedia.org/wiki/Executable_and_Linkable_Format",
+        "inputType": "ArrayBuffer",
+        "outputType": "string",
+        "flowControl": false,
+        "manualBake": false,
+        "args": []
+    },
     "Encode NetBIOS Name": {
         "module": "Default",
         "description": "NetBIOS names as seen across the client interface to NetBIOS are exactly 16 bytes long. Within the NetBIOS-over-TCP protocols, a longer representation is used.<br><br>There are two levels of encoding. The first level maps a NetBIOS name into a domain system name.  The second level maps the domain system name into the 'compressed' representation required for interaction with the domain name system.<br><br>This operation carries out the first level of encoding. See RFC 1001 for full details.",
@@ -7637,10 +7647,10 @@
     },
     "JSON Beautify": {
         "module": "Code",
-        "description": "Indents and prettifies JavaScript Object Notation (JSON) code.",
+        "description": "Indents and pretty prints JavaScript Object Notation (JSON) code.<br><br>Tags: json viewer, prettify, syntax highlighting",
         "infoURL": null,
         "inputType": "string",
-        "outputType": "string",
+        "outputType": "html",
         "flowControl": false,
         "manualBake": false,
         "args": [
@@ -7653,6 +7663,11 @@
                 "name": "Sort Object Keys",
                 "type": "boolean",
                 "value": false
+            },
+            {
+                "name": "Formatted",
+                "type": "boolean",
+                "value": true
             }
         ]
     },
@@ -8580,7 +8595,7 @@
     "PEM to Hex": {
         "module": "Default",
         "description": "Converts PEM (Privacy Enhanced Mail) format to a hexadecimal DER (Distinguished Encoding Rules) string.",
-        "infoURL": "https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail#Format",
+        "infoURL": "https://wikipedia.org/wiki/Privacy-Enhanced_Mail#Format",
         "inputType": "string",
         "outputType": "string",
         "flowControl": false,

package/src/core/config/modules/Default.mjs

@@ -33,6 +33,7 @@ import DefangURL from "../../operations/DefangURL.mjs";
 import DetectFileType from "../../operations/DetectFileType.mjs";
 import Divide from "../../operations/Divide.mjs";
 import DropBytes from "../../operations/DropBytes.mjs";
+import ELFInfo from "../../operations/ELFInfo.mjs";
 import EncodeNetBIOSName from "../../operations/EncodeNetBIOSName.mjs";
 import EscapeString from "../../operations/EscapeString.mjs";
 import EscapeUnicodeCharacters from "../../operations/EscapeUnicodeCharacters.mjs";
@@ -201,6 +202,7 @@ OpModules.Default = {
     "Detect File Type": DetectFileType,
     "Divide": Divide,
     "Drop bytes": DropBytes,
+    "ELF Info": ELFInfo,
     "Encode NetBIOS Name": EncodeNetBIOSName,
     "Escape string": EscapeString,
     "Escape Unicode Characters": EscapeUnicodeCharacters,

package/src/core/config/scripts/newMinorVersion.mjs

@@ -131,7 +131,7 @@ const getFeature = function() {
 
             // PR IDs
             prIDs.forEach(prID => {
-                changelogData = changelogData.replace(/(\n\[#[^\]]+\]: https:\/\/github.com\/gchq\/CyberChef\/pull\/[^\n]+\n)\n/, "$1" + prID + "\n\n");
+                changelogData = changelogData.replace(/(\n\[#[^\]]+\]: https:\/\/github.com\/gchq\/CyberChef\/pull\/[^\n]+\n)\n*$/, "$1" + prID + "\n\n");
             });
 
             fs.writeFileSync(path.join(process.cwd(), "CHANGELOG.md"), changelogData);

package/src/core/lib/PublicKey.mjs

@@ -9,35 +9,25 @@
 import { toHex, fromHex } from "./Hex.mjs";
 
 /**
- * Formats Distinguished Name (DN) strings.
+ * Formats Distinguished Name (DN) objects to strings.
  *
- * @param {string} dnStr
+ * @param {Object} dnObj
  * @param {number} indent
  * @returns {string}
  */
-export function formatDnStr(dnStr, indent) {
-    const fields = dnStr.substr(1).replace(/([^\\])\//g, "$1$1/").split(/[^\\]\//);
-    let output = "",
-        maxKeyLen = 0,
-        key,
-        value,
-        i,
-        str;
-
-    for (i = 0; i < fields.length; i++) {
-        if (!fields[i].length) continue;
-
-        key = fields[i].split("=")[0];
+export function formatDnObj(dnObj, indent) {
+    let output = "";
 
-        maxKeyLen = key.length > maxKeyLen ? key.length : maxKeyLen;
-    }
+    const maxKeyLen = dnObj.array.reduce((max, item) => {
+        return item[0].type.length > max ? item[0].type.length : max;
+    }, 0);
 
-    for (i = 0; i < fields.length; i++) {
-        if (!fields[i].length) continue;
+    for (let i = 0; i < dnObj.array.length; i++) {
+        if (!dnObj.array[i].length) continue;
 
-        key = fields[i].split("=")[0];
-        value = fields[i].split("=")[1];
-        str = key.padEnd(maxKeyLen, " ") + " = " + value + "\n";
+        const key = dnObj.array[i][0].type;
+        const value = dnObj.array[i][0].value;
+        const str = `${key.padEnd(maxKeyLen, " ")} = ${value}\n`;
 
         output += str.padStart(indent + str.length, " ");
     }

package/src/core/lib/Stream.mjs

@@ -48,12 +48,14 @@ export default class Stream {
      * Interpret the following bytes as a string, stopping at the next null byte or
      * the supplied limit.
      *
-     * @param {number} numBytes
+     * @param {number} [numBytes=-1]
      * @returns {string}
      */
-    readString(numBytes) {
+    readString(numBytes=-1) {
         if (this.position > this.length) return undefined;
 
+        if (numBytes === -1) numBytes = this.length - this.position;
+
         let result = "";
         for (let i = this.position; i < this.position + numBytes; i++) {
             const currentByte = this.bytes[i];