Merge branch 'v9' of github.com:gchq/CyberChef into node-lib

gchq · Jul 5, 2019 · 0de89f3 · 0de89f3
2 parents e03ff22 + aa362ba
commit 0de89f3
Show file tree

Hide file tree

Showing 28 changed files with 386 additions and 303 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -38,6 +38,8 @@
 
         // disable rules from base configurations
         "no-control-regex": "off",
+        "require-atomic-updates": "off",
+        "no-async-promise-executor": "off",
 
         // stylistic conventions
         "brace-style": ["error", "1tbs"],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.38.1",
+  "version": "8.38.2",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <[email protected]>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -37,14 +37,14 @@
     "node >= 6.5"
   ],
   "devDependencies": {
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
+    "@babel/core": "^7.5.0",
+    "@babel/plugin-transform-runtime": "^7.5.0",
+    "@babel/preset-env": "^7.5.0",
     "autoprefixer": "^9.6.0",
     "babel-eslint": "^10.0.2",
     "babel-loader": "^8.0.6",
     "babel-plugin-dynamic-import-node": "^2.2.0",
-    "chromedriver": "^75.0.0",
+    "chromedriver": "^75.0.1",
     "colors": "^1.3.3",
     "css-loader": "^3.0.0",
     "eslint": "^6.0.1",
@@ -58,7 +58,7 @@
     "grunt-contrib-connect": "^2.0.0",
     "grunt-contrib-copy": "~1.0.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-eslint": "^21.1.0",
+    "grunt-eslint": "^22.0.0",
     "grunt-exec": "~3.0.0",
     "grunt-jsdoc": "^2.4.0",
     "grunt-webpack": "^3.1.3",
@@ -68,33 +68,33 @@
     "ink-docstrap": "^1.3.2",
     "jsdoc-babel": "^0.5.0",
     "mini-css-extract-plugin": "^0.7.0",
-    "nightwatch": "^1.1.12",
+    "nightwatch": "^1.1.13",
     "node-sass": "^4.12.0",
     "postcss-css-variables": "^0.13.0",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "prompt": "^1.0.0",
     "sass-loader": "^7.1.0",
-    "sitemap": "^2.2.0",
+    "sitemap": "^3.2.0",
     "style-loader": "^0.23.1",
-    "svg-url-loader": "^2.3.3",
+    "svg-url-loader": "^3.0.0",
     "url-loader": "^2.0.1",
-    "webpack": "^4.35.0",
+    "webpack": "^4.35.2",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-dev-server": "^3.7.2",
     "webpack-node-externals": "^1.7.2",
     "worker-loader": "^2.0.0"
   },
   "dependencies": {
     "@babel/polyfill": "^7.4.4",
-    "@babel/runtime": "^7.4.5",
+    "@babel/runtime": "^7.5.0",
     "arrive": "^2.4.1",
     "babel-plugin-transform-builtin-extend": "1.1.2",
     "bcryptjs": "^2.4.3",
     "bignumber.js": "^9.0.0",
     "blakejs": "^1.1.0",
     "bootstrap": "4.3.1",
-    "bootstrap-colorpicker": "^2.5.3",
+    "bootstrap-colorpicker": "^3.1.2",
     "bootstrap-material-design": "^4.1.2",
     "bson": "^4.0.2",
     "chi-squared": "^1.1.0",
@@ -103,7 +103,7 @@
     "crypto-api": "^0.8.3",
     "crypto-js": "^3.1.9-1",
     "ctph.js": "0.0.5",
-    "d3": "^5.9.4",
+    "d3": "^5.9.7",
     "d3-hexbin": "^0.2.2",
     "diff": "^4.0.1",
     "es6-promisify": "^6.0.1",

diff --git a/src/core/Chef.mjs b/src/core/Chef.mjs
@@ -42,7 +42,7 @@ class Chef {
         const startTime = new Date().getTime(),
             recipe      = new Recipe(recipeConfig),
             containsFc  = recipe.containsFlowControl(),
-            notUTF8     = options && options.hasOwnProperty("treatAsUtf8") && !options.treatAsUtf8;
+            notUTF8     = options && "treatAsUtf8" in options && !options.treatAsUtf8;
         let error = false,
             progress = 0;
 

diff --git a/src/core/ChefWorker.js b/src/core/ChefWorker.js
@@ -209,7 +209,7 @@ self.loadRequiredModules = function(recipeConfig) {
     recipeConfig.forEach(op => {
         const module = self.OperationConfig[op.op].module;
 
-        if (!OpModules.hasOwnProperty(module)) {
+        if (!(module in OpModules)) {
             log.info(`Loading ${module} module`);
             self.sendStatusMessage(`Loading ${module} module`);
             self.importScripts(`${self.docURL}/modules/${module}.js`);

diff --git a/src/core/Dish.mjs b/src/core/Dish.mjs
@@ -42,8 +42,8 @@ class Dish {
 
         // Case: dishOrInput is dish object
         if (dishOrInput &&
-            dishOrInput.hasOwnProperty("value") &&
-            dishOrInput.hasOwnProperty("type")) {
+            Object.prototype.hasOwnProperty.call(dishOrInput, "value") &&
+            Object.prototype.hasOwnProperty.call(dishOrInput, "type")) {
             this.set(dishOrInput.value, dishOrInput.type);
         // input and type defined separately
         } else if (dishOrInput && type !== null) {
@@ -205,7 +205,7 @@ class Dish {
      * Detects the MIME type of the current dish
      * @returns {string}
      */
-    async detectDishType() {
+    detectDishType() {
         const data = new Uint8Array(this.value.slice(0, 2048)),
             types = detectFileType(data);
 
@@ -236,7 +236,7 @@ class Dish {
                 break;
             case Dish.ARRAY_BUFFER:
             case Dish.BYTE_ARRAY:
-                title = await this.detectDishType();
+                title = this.detectDishType();
                 if (title !== null) break;
                 // fall through if no mime type was detected
             default:

diff --git a/src/core/Utils.mjs b/src/core/Utils.mjs
@@ -177,6 +177,7 @@ class Utils {
             str = Utils.byteArrayToChars(Utils.strToByteArray(str));
         }
 
+        // eslint-disable-next-line no-misleading-character-class
         const re = /[\0-\x08\x0B-\x0C\x0E-\x1F\x7F-\x9F\xAD\u0378\u0379\u037F-\u0383\u038B\u038D\u03A2\u0528-\u0530\u0557\u0558\u0560\u0588\u058B-\u058E\u0590\u05C8-\u05CF\u05EB-\u05EF\u05F5-\u0605\u061C\u061D\u06DD\u070E\u070F\u074B\u074C\u07B2-\u07BF\u07FB-\u07FF\u082E\u082F\u083F\u085C\u085D\u085F-\u089F\u08A1\u08AD-\u08E3\u08FF\u0978\u0980\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09FC-\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF2-\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B55\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B78-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BFB-\u0C00\u0C04\u0C0D\u0C11\u0C29\u0C34\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5A-\u0C5F\u0C64\u0C65\u0C70-\u0C77\u0C80\u0C81\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0D01\u0D04\u0D0D\u0D11\u0D3B\u0D3C\u0D45\u0D49\u0D4F-\u0D56\u0D58-\u0D5F\u0D64\u0D65\u0D76-\u0D78\u0D80\u0D81\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DF1\u0DF5-\u0E00\u0E3B-\u0E3E\u0E5C-\u0E80\u0E83\u0E85\u0E86\u0E89\u0E8B\u0E8C\u0E8E-\u0E93\u0E98\u0EA0\u0EA4\u0EA6\u0EA8\u0EA9\u0EAC\u0EBA\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F48\u0F6D-\u0F70\u0F98\u0FBD\u0FCD\u0FDB-\u0FFF\u10C6\u10C8-\u10CC\u10CE\u10CF\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u137D-\u137F\u139A-\u139F\u13F5-\u13FF\u169D-\u169F\u16F1-\u16FF\u170D\u1715-\u171F\u1737-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17DE\u17DF\u17EA-\u17EF\u17FA-\u17FF\u180F\u181A-\u181F\u1878-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191D-\u191F\u192C-\u192F\u193C-\u193F\u1941-\u1943\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DB-\u19DD\u1A1C\u1A1D\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1A9F\u1AAE-\u1AFF\u1B4C-\u1B4F\u1B7D-\u1B7F\u1BF4-\u1BFB\u1C38-\u1C3A\u1C4A-\u1C4C\u1C80-\u1CBF\u1CC8-\u1CCF\u1CF7-\u1CFF\u1DE7-\u1DFB\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FC5\u1FD4\u1FD5\u1FDC\u1FF0\u1FF1\u1FF5\u1FFF\u200B-\u200F\u202A-\u202E\u2060-\u206F\u2072\u2073\u208F\u209D-\u209F\u20BB-\u20CF\u20F1-\u20FF\u218A-\u218F\u23F4-\u23FF\u2427-\u243F\u244B-\u245F\u2700\u2B4D-\u2B4F\u2B5A-\u2BFF\u2C2F\u2C5F\u2CF4-\u2CF8\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D71-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E3C-\u2E7F\u2E9A\u2EF4-\u2EFF\u2FD6-\u2FEF\u2FFC-\u2FFF\u3040\u3097\u3098\u3100-\u3104\u312E-\u3130\u318F\u31BB-\u31BF\u31E4-\u31EF\u321F\u32FF\u4DB6-\u4DBF\u9FCD-\u9FFF\uA48D-\uA48F\uA4C7-\uA4CF\uA62C-\uA63F\uA698-\uA69E\uA6F8-\uA6FF\uA78F\uA794-\uA79F\uA7AB-\uA7F7\uA82C-\uA82F\uA83A-\uA83F\uA878-\uA87F\uA8C5-\uA8CD\uA8DA-\uA8DF\uA8FC-\uA8FF\uA954-\uA95E\uA97D-\uA97F\uA9CE\uA9DA-\uA9DD\uA9E0-\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A\uAA5B\uAA7C-\uAA7F\uAAC3-\uAADA\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F-\uABBF\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uD7FF\uE000-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBC2-\uFBD2\uFD40-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFE\uFDFF\uFE1A-\uFE1F\uFE27-\uFE2F\uFE53\uFE67\uFE6C-\uFE6F\uFE75\uFEFD-\uFF00\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFDF\uFFE7\uFFEF-\uFFFB\uFFFE\uFFFF]/g;
         const wsRe = /[\x09-\x10\x0D\u2028\u2029]/g;
 
@@ -1194,7 +1195,7 @@ export default Utils;
 Array.prototype.unique = function() {
     const u = {}, a = [];
     for (let i = 0, l = this.length; i < l; i++) {
-        if (u.hasOwnProperty(this[i])) {
+        if (Object.prototype.hasOwnProperty.call(u, this[i])) {
             continue;
         }
         a.push(this[i]);

diff --git a/src/core/config/scripts/generateConfig.mjs b/src/core/config/scripts/generateConfig.mjs
@@ -45,11 +45,11 @@ for (const opObj in Ops) {
         args:        op.args
     };
 
-    if (op.hasOwnProperty("patterns")) {
+    if ("patterns" in op) {
         operationConfig[op.name].patterns = op.patterns;
     }
 
-    if (!modules.hasOwnProperty(op.module))
+    if (!(op.module in modules))
         modules[op.module] = {};
     modules[op.module][op.name] = opObj;
 }

diff --git a/src/core/lib/Enigma.mjs b/src/core/lib/Enigma.mjs
@@ -184,10 +184,10 @@ class PairMapBase {
                 // self-stecker
                 return;
             }
-            if (this.map.hasOwnProperty(a)) {
+            if (Object.prototype.hasOwnProperty.call(this.map, a)) {
                 throw new OperationError(`${name} connects ${pair[0]} more than once`);
             }
-            if (this.map.hasOwnProperty(b)) {
+            if (Object.prototype.hasOwnProperty.call(this.map, b)) {
                 throw new OperationError(`${name} connects ${pair[1]} more than once`);
             }
             this.map[a] = b;
@@ -203,7 +203,7 @@ class PairMapBase {
      * @returns {number}
      */
     transform(c) {
-        if (!this.map.hasOwnProperty(c)) {
+        if (!Object.prototype.hasOwnProperty.call(this.map, c)) {
             return c;
         }
         return this.map[c];

diff --git a/src/core/lib/Magic.mjs b/src/core/lib/Magic.mjs
@@ -338,7 +338,7 @@ class Magic {
         }
 
         // Prune branches that result in unhelpful outputs
-        results = results.filter(r =>
+        const prunedResults = results.filter(r =>
             (r.useful || r.data.length > 0) &&          // The operation resulted in ""
             (                                           // One of the following must be true
                 r.languageScores[0].probability > 0 ||    // Some kind of language was found
@@ -349,7 +349,7 @@ class Magic {
         );
 
         // Return a sorted list of possible recipes along with their properties
-        return results.sort((a, b) => {
+        return prunedResults.sort((a, b) => {
             // Each option is sorted based on its most likely language (lower is better)
             let aScore = a.languageScores[0].score,
                 bScore = b.languageScores[0].score;
@@ -450,7 +450,7 @@ class Magic {
         const opPatterns = [];
 
         for (const op in OperationConfig) {
-            if (!OperationConfig[op].hasOwnProperty("patterns")) continue;
+            if (!("patterns" in OperationConfig[op])) continue;
 
             OperationConfig[op].patterns.forEach(pattern => {
                 opPatterns.push({

diff --git a/src/core/lib/Protobuf.mjs b/src/core/lib/Protobuf.mjs
@@ -124,7 +124,7 @@ class Protobuf {
         // Get the field key/values
         const key = field.key;
         const value = field.value;
-        object[key] = object.hasOwnProperty(key) ?
+        object[key] = Object.prototype.hasOwnProperty.call(object, key) ?
             object[key] instanceof Array ?
                 object[key].concat([value]) :
                 [object[key], value] :

diff --git a/src/core/lib/Typex.mjs b/src/core/lib/Typex.mjs
@@ -98,14 +98,14 @@ export class TypexMachine extends Enigma.EnigmaBase {
                 if (x === " ") {
                     inputMod += "X";
                 } else if (mode) {
-                    if (KEYBOARD_REV.hasOwnProperty(x)) {
+                    if (Object.prototype.hasOwnProperty.call(KEYBOARD_REV, x)) {
                         inputMod += KEYBOARD_REV[x];
                     } else {
                         mode = false;
                         inputMod += "V" + x;
                     }
                 } else {
-                    if (KEYBOARD_REV.hasOwnProperty(x)) {
+                    if (Object.prototype.hasOwnProperty.call(KEYBOARD_REV, x)) {
                         mode = true;
                         inputMod += "Z" + KEYBOARD_REV[x];
                     } else {

diff --git a/src/core/operations/GroupIPAddresses.mjs b/src/core/operations/GroupIPAddresses.mjs
@@ -77,7 +77,7 @@ class GroupIPAddresses extends Operation {
                 ip = strToIpv4(match[1]) >>> 0;
                 network = ip & ipv4Mask;
 
-                if (ipv4Networks.hasOwnProperty(network)) {
+                if (network in ipv4Networks) {
                     ipv4Networks[network].push(ip);
                 } else {
                     ipv4Networks[network] = [ip];
@@ -93,7 +93,7 @@ class GroupIPAddresses extends Operation {
 
                 networkStr = ipv6ToStr(network, true);
 
-                if (ipv6Networks.hasOwnProperty(networkStr)) {
+                if (networkStr in ipv6Networks) {
                     ipv6Networks[networkStr].push(ip);
                 } else {
                     ipv6Networks[networkStr] = [ip];

diff --git a/src/core/operations/JWTVerify.mjs b/src/core/operations/JWTVerify.mjs
@@ -50,7 +50,7 @@ class JWTVerify extends Operation {
                 "none"
             ]});
 
-            if (verified.hasOwnProperty("name") && verified.name === "JsonWebTokenError") {
+            if (Object.prototype.hasOwnProperty.call(verified, "name") && verified.name === "JsonWebTokenError") {
                 throw new OperationError(verified.message);
             }
 

diff --git a/src/core/operations/ParseColourCode.mjs b/src/core/operations/ParseColourCode.mjs
@@ -96,7 +96,7 @@ class ParseColourCode extends Operation {
             cmyk = "cmyk(" + c + ", " + m + ", " + y + ", " + k + ")";
 
         // Generate output
-        return `<div id="colorpicker" style="display: inline-block"></div>
+        return `<div id="colorpicker" style="white-space: normal;"></div>
 Hex:  ${hex}
 RGB:  ${rgb}
 RGBA: ${rgba}
@@ -109,12 +109,12 @@ CMYK: ${cmyk}
         color: '${rgba}',
         container: true,
         inline: true,
-    }).on('changeColor', function(e) {
-        var color = e.color.toRGB();
-        document.getElementById('input-text').value = 'rgba(' +
-            color.r + ', ' + color.g + ', ' + color.b + ', ' + color.a + ')';
+        useAlpha: true
+    }).on('colorpickerChange', function(e) {
+        var color = e.color.string('rgba');
+        document.getElementById('input-text').value = color;
         window.app.autoBake();
-    }).children(".colorpicker").removeClass('dropdown-menu');
+    });
 </script>`;
     }
 

diff --git a/src/core/operations/Register.mjs b/src/core/operations/Register.mjs
@@ -102,7 +102,7 @@ class Register extends Operation {
             args = args.map(arg => {
                 if (typeof arg !== "string" && typeof arg !== "object") return arg;
 
-                if (typeof arg === "object" && arg.hasOwnProperty("string")) {
+                if (typeof arg === "object" && Object.prototype.hasOwnProperty.call(arg, "string")) {
                     arg.string = replaceRegister(arg.string);
                     return arg;
                 }

diff --git a/src/core/operations/ToHTMLEntity.mjs b/src/core/operations/ToHTMLEntity.mjs
@@ -59,13 +59,13 @@ class ToHTMLEntity extends Operation {
             } else if (convertAll) {
                 output += byteToEntity[charcodes[i]] || "&#" + charcodes[i] + ";";
             } else if (numeric) {
-                if (charcodes[i] > 255 || byteToEntity.hasOwnProperty(charcodes[i])) {
+                if (charcodes[i] > 255 || charcodes[i] in byteToEntity) {
                     output += "&#" + charcodes[i] + ";";
                 } else {
                     output += Utils.chr(charcodes[i]);
                 }
             } else if (hexa) {
-                if (charcodes[i] > 255 || byteToEntity.hasOwnProperty(charcodes[i])) {
+                if (charcodes[i] > 255 || charcodes[i] in byteToEntity) {
                     output += "&#x" + Utils.hex(charcodes[i]) + ";";
                 } else {
                     output += Utils.chr(charcodes[i]);

diff --git a/src/node/NodeRecipe.mjs b/src/node/NodeRecipe.mjs
@@ -79,7 +79,8 @@ class NodeRecipe {
     execute(dish) {
         return this.opList.reduce((prev, curr) => {
             // CASE where opList item is op and args
-            if (curr.hasOwnProperty("op") && curr.hasOwnProperty("args")) {
+            if (Object.prototype.hasOwnProperty.call(curr, "op") &&
+                Object.prototype.hasOwnProperty.call(curr, "args")) {
                 return curr.op(prev, curr.args);
             }
             // CASE opList item is just op.

diff --git a/src/web/App.mjs b/src/web/App.mjs
@@ -256,7 +256,7 @@ class App {
 
             for (let j = 0; j < catConf.ops.length; j++) {
                 const opName = catConf.ops[j];
-                if (!this.operations.hasOwnProperty(opName)) {
+                if (!(opName in this.operations)) {
                     log.warn(`${opName} could not be found.`);
                     continue;
                 }
@@ -372,7 +372,7 @@ class App {
     validFavourites(favourites) {
         const validFavs = [];
         for (let i = 0; i < favourites.length; i++) {
-            if (this.operations.hasOwnProperty(favourites[i])) {
+            if (favourites[i] in this.operations) {
                 validFavs.push(favourites[i]);
             } else {
                 this.alert(`The operation "${Utils.escapeHtml(favourites[i])}" is no longer available. ` +

diff --git a/src/web/Manager.mjs b/src/web/Manager.mjs
@@ -321,7 +321,7 @@ class Manager {
             callback: callback.bind(scope || this)
         };
 
-        if (this.dynamicHandlers.hasOwnProperty(eventType)) {
+        if (Object.prototype.hasOwnProperty.call(this.dynamicHandlers, eventType)) {
             // Listener already exists, add new handler to the appropriate list
             this.dynamicHandlers[eventType].push(eventConfig);
         } else {

diff --git a/src/web/waiters/InputWaiter.mjs b/src/web/waiters/InputWaiter.mjs
@@ -219,13 +219,14 @@ class InputWaiter {
     handleLoaderMessage(e) {
         const r = e.data;
 
-        if (r.hasOwnProperty("progress") && r.hasOwnProperty("inputNum")) {
+        if (Object.prototype.hasOwnProperty.call(r, "progress") &&
+            Object.prototype.hasOwnProperty.call(r, "inputNum")) {
             this.manager.tabs.updateInputTabProgress(r.inputNum, r.progress, 100);
-        } else if (r.hasOwnProperty("fileBuffer")) {
+        } else if (Object.prototype.hasOwnProperty.call(r, "fileBuffer")) {
             this.manager.tabs.updateInputTabProgress(r.inputNum, 100, 100);
         }
 
-        const transferable = r.hasOwnProperty("fileBuffer") ? [r.fileBuffer] : undefined;
+        const transferable = Object.prototype.hasOwnProperty.call(r, "fileBuffer") ? [r.fileBuffer] : undefined;
         this.inputWorker.postMessage({
             action: "loaderWorkerMessage",
             data: r
@@ -241,7 +242,7 @@ class InputWaiter {
     handleInputWorkerMessage(e) {
         const r = e.data;
 
-        if (!r.hasOwnProperty("action")) {
+        if (!("action" in r)) {
             log.error("A message was received from the InputWorker with no action property. Ignoring message.");
             return;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ class JWTVerify extends Operation { @@
                     "none"
                 ]});
-                if (verified.hasOwnProperty("name") && verified.name === "JsonWebTokenError") {
+                if (Object.prototype.hasOwnProperty.call(verified, "name") && verified.name === "JsonWebTokenError") {
                     throw new OperationError(verified.message);
                 }
@@ Expand Down @@