cyberchef 9.54.0 → 9.55.0

package/CHANGELOG.md

@@ -13,6 +13,9 @@ All major and minor version changes will be documented in this file. Details of
 
 ## Details
 
+### [9.55.0] - 2022-12-09
+- Added 'AMF Encode' and 'AMF Decode' operations [@n1474335] | [760eff4]
+
 ### [9.54.0] - 2022-11-25
 - Added 'Rabbit' operation [@mikecat] | [#1450]
 
@@ -339,6 +342,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
+[9.55.0]: https://github.com/gchq/CyberChef/releases/tag/v9.55.0
 [9.54.0]: https://github.com/gchq/CyberChef/releases/tag/v9.54.0
 [9.53.0]: https://github.com/gchq/CyberChef/releases/tag/v9.53.0
 [9.52.0]: https://github.com/gchq/CyberChef/releases/tag/v9.52.0
@@ -492,6 +496,7 @@ All major and minor version changes will be documented in this file. Details of
 [dd18e52]: https://github.com/gchq/CyberChef/commit/dd18e529939078b89867297b181a584e8b2cc7da
 [a895d1d]: https://github.com/gchq/CyberChef/commit/a895d1d82a2f92d440a0c5eca2bc7c898107b737
 [31a7f83]: https://github.com/gchq/CyberChef/commit/31a7f83b82e78927f89689f323fcb9185144d6ff
+[760eff4]: https://github.com/gchq/CyberChef/commit/760eff49b5307aaa3104c5e5b437ffe62299acd1
 
 [#95]: https://github.com/gchq/CyberChef/pull/299
 [#173]: https://github.com/gchq/CyberChef/pull/173

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.54.0",
+  "version": "9.55.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",
@@ -86,6 +86,7 @@
     "worker-loader": "^3.0.8"
   },
   "dependencies": {
+    "@astronautlabs/amf": "^0.0.6",
     "@babel/polyfill": "^7.12.1",
     "@blu3r4y/lzma": "^2.3.3",
     "arrive": "^2.4.1",
@@ -151,6 +152,7 @@
     "process": "^0.11.10",
     "protobufjs": "^6.11.3",
     "qr-image": "^3.2.0",
+    "reflect-metadata": "^0.1.13",
     "scryptsy": "^2.1.0",
     "snackbarjs": "^1.1.0",
     "sortablejs": "^1.15.0",

package/src/core/config/Categories.json

@@ -46,6 +46,8 @@
             "From Quoted Printable",
             "To Punycode",
             "From Punycode",
+            "AMF Encode",
+            "AMF Decode",
             "To Hex Content",
             "From Hex Content",
             "PEM to Hex",

package/src/core/config/OperationConfig.json

@@ -446,6 +446,46 @@
             }
         ]
     },
+    "AMF Decode": {
+        "module": "Encodings",
+        "description": "Action Message Format (AMF) is a binary format used to serialize object graphs such as ActionScript objects and XML, or send messages between an Adobe Flash client and a remote service, usually a Flash Media Server or third party alternatives.",
+        "infoURL": "https://wikipedia.org/wiki/Action_Message_Format",
+        "inputType": "ArrayBuffer",
+        "outputType": "JSON",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Format",
+                "type": "option",
+                "value": [
+                    "AMF0",
+                    "AMF3"
+                ],
+                "defaultIndex": 1
+            }
+        ]
+    },
+    "AMF Encode": {
+        "module": "Encodings",
+        "description": "Action Message Format (AMF) is a binary format used to serialize object graphs such as ActionScript objects and XML, or send messages between an Adobe Flash client and a remote service, usually a Flash Media Server or third party alternatives.",
+        "infoURL": "https://wikipedia.org/wiki/Action_Message_Format",
+        "inputType": "JSON",
+        "outputType": "ArrayBuffer",
+        "flowControl": false,
+        "manualBake": false,
+        "args": [
+            {
+                "name": "Format",
+                "type": "option",
+                "value": [
+                    "AMF0",
+                    "AMF3"
+                ],
+                "defaultIndex": 1
+            }
+        ]
+    },
     "AND": {
         "module": "Default",
         "description": "AND the input with the given key.<br>e.g. <code>fe023da5</code>",

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

@@ -5,6 +5,8 @@
 * @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
+import AMFDecode from "../../operations/AMFDecode.mjs";
+import AMFEncode from "../../operations/AMFEncode.mjs";
 import CitrixCTX1Decode from "../../operations/CitrixCTX1Decode.mjs";
 import CitrixCTX1Encode from "../../operations/CitrixCTX1Encode.mjs";
 import DecodeText from "../../operations/DecodeText.mjs";
@@ -19,6 +21,8 @@ import ToPunycode from "../../operations/ToPunycode.mjs";
 const OpModules = typeof self === "undefined" ? {} : self.OpModules || {};
 
 OpModules.Encodings = {
+    "AMF Decode": AMFDecode,
+    "AMF Encode": AMFEncode,
     "Citrix CTX1 Decode": CitrixCTX1Decode,
     "Citrix CTX1 Encode": CitrixCTX1Encode,
     "Decode text": DecodeText,

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

@@ -9,6 +9,7 @@
 */
 import CiphersModule from "./Ciphers.mjs";
 import DefaultModule from "./Default.mjs";
+import EncodingsModule from "./Encodings.mjs";
 import ImageModule from "./Image.mjs";
 import CryptoModule from "./Crypto.mjs";
 import SerialiseModule from "./Serialise.mjs";
@@ -16,7 +17,6 @@ import HashingModule from "./Hashing.mjs";
 import BletchleyModule from "./Bletchley.mjs";
 import CompressionModule from "./Compression.mjs";
 import CodeModule from "./Code.mjs";
-import EncodingsModule from "./Encodings.mjs";
 import DiffModule from "./Diff.mjs";
 import ShellcodeModule from "./Shellcode.mjs";
 import ChartsModule from "./Charts.mjs";
@@ -35,6 +35,7 @@ Object.assign(
     OpModules,
     CiphersModule,
     DefaultModule,
+    EncodingsModule,
     ImageModule,
     CryptoModule,
     SerialiseModule,
@@ -42,7 +43,6 @@ Object.assign(
     BletchleyModule,
     CompressionModule,
     CodeModule,
-    EncodingsModule,
     DiffModule,
     ShellcodeModule,
     ChartsModule,

package/src/core/operations/AMFDecode.mjs

@@ -0,0 +1,52 @@
+/**
+ * @author n1474335 [n1474335@gmail.com]
+ * @copyright Crown Copyright 2022
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import "reflect-metadata"; // Required as a shim for the amf library
+import { AMF0, AMF3 } from "@astronautlabs/amf";
+
+/**
+ * AMF Decode operation
+ */
+class AMFDecode extends Operation {
+
+    /**
+     * AMFDecode constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "AMF Decode";
+        this.module = "Encodings";
+        this.description = "Action Message Format (AMF) is a binary format used to serialize object graphs such as ActionScript objects and XML, or send messages between an Adobe Flash client and a remote service, usually a Flash Media Server or third party alternatives.";
+        this.infoURL = "https://wikipedia.org/wiki/Action_Message_Format";
+        this.inputType = "ArrayBuffer";
+        this.outputType = "JSON";
+        this.args = [
+            {
+                name: "Format",
+                type: "option",
+                value: ["AMF0", "AMF3"],
+                defaultIndex: 1
+            }
+        ];
+    }
+
+    /**
+     * @param {ArrayBuffer} input
+     * @param {Object[]} args
+     * @returns {JSON}
+     */
+    run(input, args) {
+        const [format] = args;
+        const handler = format === "AMF0" ? AMF0 : AMF3;
+        const encoded = new Uint8Array(input);
+        return handler.Value.deserialize(encoded);
+    }
+
+}
+
+export default AMFDecode;

package/src/core/operations/AMFEncode.mjs

@@ -0,0 +1,52 @@
+/**
+ * @author n1474335 [n1474335@gmail.com]
+ * @copyright Crown Copyright 2022
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation.mjs";
+import "reflect-metadata"; // Required as a shim for the amf library
+import { AMF0, AMF3 } from "@astronautlabs/amf";
+
+/**
+ * AMF Encode operation
+ */
+class AMFEncode extends Operation {
+
+    /**
+     * AMFEncode constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "AMF Encode";
+        this.module = "Encodings";
+        this.description = "Action Message Format (AMF) is a binary format used to serialize object graphs such as ActionScript objects and XML, or send messages between an Adobe Flash client and a remote service, usually a Flash Media Server or third party alternatives.";
+        this.infoURL = "https://wikipedia.org/wiki/Action_Message_Format";
+        this.inputType = "JSON";
+        this.outputType = "ArrayBuffer";
+        this.args = [
+            {
+                name: "Format",
+                type: "option",
+                value: ["AMF0", "AMF3"],
+                defaultIndex: 1
+            }
+        ];
+    }
+
+    /**
+     * @param {JSON} input
+     * @param {Object[]} args
+     * @returns {ArrayBuffer}
+     */
+    run(input, args) {
+        const [format] = args;
+        const handler = format === "AMF0" ? AMF0 : AMF3;
+        const output = handler.Value.any(input).serialize();
+        return output.buffer;
+    }
+
+}
+
+export default AMFEncode;

package/src/core/operations/index.mjs

@@ -12,6 +12,8 @@ import AESDecrypt from "./AESDecrypt.mjs";
 import AESEncrypt from "./AESEncrypt.mjs";
 import AESKeyUnwrap from "./AESKeyUnwrap.mjs";
 import AESKeyWrap from "./AESKeyWrap.mjs";
+import AMFDecode from "./AMFDecode.mjs";
+import AMFEncode from "./AMFEncode.mjs";
 import AND from "./AND.mjs";
 import AddLineNumbers from "./AddLineNumbers.mjs";
 import AddTextToImage from "./AddTextToImage.mjs";
@@ -409,6 +411,8 @@ export {
     AESEncrypt,
     AESKeyUnwrap,
     AESKeyWrap,
+    AMFDecode,
+    AMFEncode,
     AND,
     AddLineNumbers,
     AddTextToImage,

package/src/node/index.mjs

@@ -22,6 +22,8 @@ import {
     AESEncrypt as core_AESEncrypt,
     AESKeyUnwrap as core_AESKeyUnwrap,
     AESKeyWrap as core_AESKeyWrap,
+    AMFDecode as core_AMFDecode,
+    AMFEncode as core_AMFEncode,
     AND as core_AND,
     AddLineNumbers as core_AddLineNumbers,
     AddTextToImage as core_AddTextToImage,
@@ -419,6 +421,8 @@ function generateChef() {
         "AESEncrypt": _wrap(core_AESEncrypt),
         "AESKeyUnwrap": _wrap(core_AESKeyUnwrap),
         "AESKeyWrap": _wrap(core_AESKeyWrap),
+        "AMFDecode": _wrap(core_AMFDecode),
+        "AMFEncode": _wrap(core_AMFEncode),
         "AND": _wrap(core_AND),
         "addLineNumbers": _wrap(core_AddLineNumbers),
         "addTextToImage": _wrap(core_AddTextToImage),
@@ -824,6 +828,8 @@ const AESDecrypt = chef.AESDecrypt;
 const AESEncrypt = chef.AESEncrypt;
 const AESKeyUnwrap = chef.AESKeyUnwrap;
 const AESKeyWrap = chef.AESKeyWrap;
+const AMFDecode = chef.AMFDecode;
+const AMFEncode = chef.AMFEncode;
 const AND = chef.AND;
 const addLineNumbers = chef.addLineNumbers;
 const addTextToImage = chef.addTextToImage;
@@ -1223,6 +1229,8 @@ const operations = [
     AESEncrypt,
     AESKeyUnwrap,
     AESKeyWrap,
+    AMFDecode,
+    AMFEncode,
     AND,
     addLineNumbers,
     addTextToImage,
@@ -1626,6 +1634,8 @@ export {
     AESEncrypt,
     AESKeyUnwrap,
     AESKeyWrap,
+    AMFDecode,
+    AMFEncode,
     AND,
     addLineNumbers,
     addTextToImage,