Merge branch 'master' into feature/detect-chromedriver

Author: a3957273

Diff for: src/core/config/Categories.json

@@ -236,6 +236,7 @@
             "Parse IPv6 address",
             "Parse IPv4 header",
             "Parse TCP",
+            "Parse TLS record",
             "Parse UDP",
             "Parse SSH Host Key",
             "Parse URI",

Diff for: src/core/lib/Protocol.mjs

@@ -26,6 +26,9 @@ export function objToTable(obj, nested=false) {
         </tr>`;
 
     for (const key in obj) {
+        if (typeof obj[key] === "function")
+            continue;
+
         html += `<tr><td style='word-wrap: break-word'>${key}</td>`;
         if (typeof obj[key] === "object")
             html += `<td style='padding: 0'>${objToTable(obj[key], true)}</td>`;

Diff for: src/core/operations/JWTSign.mjs

@@ -36,6 +36,11 @@ class JWTSign extends Operation {
                 name: "Signing algorithm",
                 type: "option",
                 value: JWT_ALGORITHMS
+            },
+            {
+                name: "Header",
+                type: "text",
+                value: "{}"
             }
         ];
     }
@@ -46,11 +51,12 @@ class JWTSign extends Operation {
      * @returns {string}
      */
     run(input, args) {
-        const [key, algorithm] = args;
+        const [key, algorithm, header] = args;
 
         try {
             return jwt.sign(input, key, {
-                algorithm: algorithm === "None" ? "none" : algorithm
+                algorithm: algorithm === "None" ? "none" : algorithm,
+                header: JSON.parse(header || "{}")
             });
         } catch (err) {
             throw new OperationError(`Error: Have you entered the key correctly? The key should be either the secret for HMAC algorithms or the PEM-encoded private key for RSA and ECDSA.

Diff for: src/core/operations/JWTVerify.mjs

@@ -22,7 +22,7 @@ class JWTVerify extends Operation {
 
         this.name = "JWT Verify";
         this.module = "Crypto";
-        this.description = "Verifies that a JSON Web Token is valid and has been signed with the provided secret / private key.<br><br>The key should be either the secret for HMAC algorithms or the PEM-encoded private key for RSA and ECDSA.";
+        this.description = "Verifies that a JSON Web Token is valid and has been signed with the provided secret / private key.<br><br>The key should be either the secret for HMAC algorithms or the PEM-encoded public key for RSA and ECDSA.";
         this.infoURL = "https://wikipedia.org/wiki/JSON_Web_Token";
         this.inputType = "string";
         this.outputType = "JSON";