Skip to content

Commit 0de89f3

Browse files
d98762625d98762625
committed
Merge branch 'v9' of github.com:gchq/CyberChef into node-lib
2 parents e03ff22 + aa362ba commit 0de89f3

28 files changed

+386
-303
lines changed

‎.eslintrc.json

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
// disable rules from base configurations
4040
"no-control-regex": "off",
41+
"require-atomic-updates": "off",
42+
"no-async-promise-executor": "off",
4143

4244
// stylistic conventions
4345
"brace-style": ["error", "1tbs"],

‎package-lock.json

+314-236
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "cyberchef",
3-
"version": "8.38.1",
3+
"version": "8.38.2",
44
"description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
55
"author": "n1474335 <[email protected]>",
66
"homepage": "https://gchq.github.io/CyberChef",
@@ -37,14 +37,14 @@
3737
"node >= 6.5"
3838
],
3939
"devDependencies": {
40-
"@babel/core": "^7.4.5",
41-
"@babel/plugin-transform-runtime": "^7.4.4",
42-
"@babel/preset-env": "^7.4.5",
40+
"@babel/core": "^7.5.0",
41+
"@babel/plugin-transform-runtime": "^7.5.0",
42+
"@babel/preset-env": "^7.5.0",
4343
"autoprefixer": "^9.6.0",
4444
"babel-eslint": "^10.0.2",
4545
"babel-loader": "^8.0.6",
4646
"babel-plugin-dynamic-import-node": "^2.2.0",
47-
"chromedriver": "^75.0.0",
47+
"chromedriver": "^75.0.1",
4848
"colors": "^1.3.3",
4949
"css-loader": "^3.0.0",
5050
"eslint": "^6.0.1",
@@ -58,7 +58,7 @@
5858
"grunt-contrib-connect": "^2.0.0",
5959
"grunt-contrib-copy": "~1.0.0",
6060
"grunt-contrib-watch": "^1.1.0",
61-
"grunt-eslint": "^21.1.0",
61+
"grunt-eslint": "^22.0.0",
6262
"grunt-exec": "~3.0.0",
6363
"grunt-jsdoc": "^2.4.0",
6464
"grunt-webpack": "^3.1.3",
@@ -68,33 +68,33 @@
6868
"ink-docstrap": "^1.3.2",
6969
"jsdoc-babel": "^0.5.0",
7070
"mini-css-extract-plugin": "^0.7.0",
71-
"nightwatch": "^1.1.12",
71+
"nightwatch": "^1.1.13",
7272
"node-sass": "^4.12.0",
7373
"postcss-css-variables": "^0.13.0",
7474
"postcss-import": "^12.0.1",
7575
"postcss-loader": "^3.0.0",
7676
"prompt": "^1.0.0",
7777
"sass-loader": "^7.1.0",
78-
"sitemap": "^2.2.0",
78+
"sitemap": "^3.2.0",
7979
"style-loader": "^0.23.1",
80-
"svg-url-loader": "^2.3.3",
80+
"svg-url-loader": "^3.0.0",
8181
"url-loader": "^2.0.1",
82-
"webpack": "^4.35.0",
82+
"webpack": "^4.35.2",
8383
"webpack-bundle-analyzer": "^3.3.2",
8484
"webpack-dev-server": "^3.7.2",
8585
"webpack-node-externals": "^1.7.2",
8686
"worker-loader": "^2.0.0"
8787
},
8888
"dependencies": {
8989
"@babel/polyfill": "^7.4.4",
90-
"@babel/runtime": "^7.4.5",
90+
"@babel/runtime": "^7.5.0",
9191
"arrive": "^2.4.1",
9292
"babel-plugin-transform-builtin-extend": "1.1.2",
9393
"bcryptjs": "^2.4.3",
9494
"bignumber.js": "^9.0.0",
9595
"blakejs": "^1.1.0",
9696
"bootstrap": "4.3.1",
97-
"bootstrap-colorpicker": "^2.5.3",
97+
"bootstrap-colorpicker": "^3.1.2",
9898
"bootstrap-material-design": "^4.1.2",
9999
"bson": "^4.0.2",
100100
"chi-squared": "^1.1.0",
@@ -103,7 +103,7 @@
103103
"crypto-api": "^0.8.3",
104104
"crypto-js": "^3.1.9-1",
105105
"ctph.js": "0.0.5",
106-
"d3": "^5.9.4",
106+
"d3": "^5.9.7",
107107
"d3-hexbin": "^0.2.2",
108108
"diff": "^4.0.1",
109109
"es6-promisify": "^6.0.1",

‎src/core/Chef.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class Chef {
4242
const startTime = new Date().getTime(),
4343
recipe = new Recipe(recipeConfig),
4444
containsFc = recipe.containsFlowControl(),
45-
notUTF8 = options && options.hasOwnProperty("treatAsUtf8") && !options.treatAsUtf8;
45+
notUTF8 = options && "treatAsUtf8" in options && !options.treatAsUtf8;
4646
let error = false,
4747
progress = 0;
4848

‎src/core/ChefWorker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ self.loadRequiredModules = function(recipeConfig) {
209209
recipeConfig.forEach(op => {
210210
const module = self.OperationConfig[op.op].module;
211211

212-
if (!OpModules.hasOwnProperty(module)) {
212+
if (!(module in OpModules)) {
213213
log.info(`Loading ${module} module`);
214214
self.sendStatusMessage(`Loading ${module} module`);
215215
self.importScripts(`${self.docURL}/modules/${module}.js`);

‎src/core/Dish.mjs

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ class Dish {
4242

4343
// Case: dishOrInput is dish object
4444
if (dishOrInput &&
45-
dishOrInput.hasOwnProperty("value") &&
46-
dishOrInput.hasOwnProperty("type")) {
45+
Object.prototype.hasOwnProperty.call(dishOrInput, "value") &&
46+
Object.prototype.hasOwnProperty.call(dishOrInput, "type")) {
4747
this.set(dishOrInput.value, dishOrInput.type);
4848
// input and type defined separately
4949
} else if (dishOrInput && type !== null) {
@@ -205,7 +205,7 @@ class Dish {
205205
* Detects the MIME type of the current dish
206206
* @returns {string}
207207
*/
208-
async detectDishType() {
208+
detectDishType() {
209209
const data = new Uint8Array(this.value.slice(0, 2048)),
210210
types = detectFileType(data);
211211

@@ -236,7 +236,7 @@ class Dish {
236236
break;
237237
case Dish.ARRAY_BUFFER:
238238
case Dish.BYTE_ARRAY:
239-
title = await this.detectDishType();
239+
title = this.detectDishType();
240240
if (title !== null) break;
241241
// fall through if no mime type was detected
242242
default:

‎src/core/Utils.mjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ class Utils {
177177
str = Utils.byteArrayToChars(Utils.strToByteArray(str));
178178
}
179179

180+
// eslint-disable-next-line no-misleading-character-class
180181
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;
181182
const wsRe = /[\x09-\x10\x0D\u2028\u2029]/g;
182183

@@ -1194,7 +1195,7 @@ export default Utils;
11941195
Array.prototype.unique = function() {
11951196
const u = {}, a = [];
11961197
for (let i = 0, l = this.length; i < l; i++) {
1197-
if (u.hasOwnProperty(this[i])) {
1198+
if (Object.prototype.hasOwnProperty.call(u, this[i])) {
11981199
continue;
11991200
}
12001201
a.push(this[i]);

‎src/core/config/scripts/generateConfig.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ for (const opObj in Ops) {
4545
args: op.args
4646
};
4747

48-
if (op.hasOwnProperty("patterns")) {
48+
if ("patterns" in op) {
4949
operationConfig[op.name].patterns = op.patterns;
5050
}
5151

52-
if (!modules.hasOwnProperty(op.module))
52+
if (!(op.module in modules))
5353
modules[op.module] = {};
5454
modules[op.module][op.name] = opObj;
5555
}

‎src/core/lib/Enigma.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ class PairMapBase {
184184
// self-stecker
185185
return;
186186
}
187-
if (this.map.hasOwnProperty(a)) {
187+
if (Object.prototype.hasOwnProperty.call(this.map, a)) {
188188
throw new OperationError(`${name} connects ${pair[0]} more than once`);
189189
}
190-
if (this.map.hasOwnProperty(b)) {
190+
if (Object.prototype.hasOwnProperty.call(this.map, b)) {
191191
throw new OperationError(`${name} connects ${pair[1]} more than once`);
192192
}
193193
this.map[a] = b;
@@ -203,7 +203,7 @@ class PairMapBase {
203203
* @returns {number}
204204
*/
205205
transform(c) {
206-
if (!this.map.hasOwnProperty(c)) {
206+
if (!Object.prototype.hasOwnProperty.call(this.map, c)) {
207207
return c;
208208
}
209209
return this.map[c];

‎src/core/lib/Magic.mjs

+3-3
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ class Magic {
338338
}
339339

340340
// Prune branches that result in unhelpful outputs
341-
results = results.filter(r =>
341+
const prunedResults = results.filter(r =>
342342
(r.useful || r.data.length > 0) && // The operation resulted in ""
343343
( // One of the following must be true
344344
r.languageScores[0].probability > 0 || // Some kind of language was found
@@ -349,7 +349,7 @@ class Magic {
349349
);
350350

351351
// Return a sorted list of possible recipes along with their properties
352-
return results.sort((a, b) => {
352+
return prunedResults.sort((a, b) => {
353353
// Each option is sorted based on its most likely language (lower is better)
354354
let aScore = a.languageScores[0].score,
355355
bScore = b.languageScores[0].score;
@@ -450,7 +450,7 @@ class Magic {
450450
const opPatterns = [];
451451

452452
for (const op in OperationConfig) {
453-
if (!OperationConfig[op].hasOwnProperty("patterns")) continue;
453+
if (!("patterns" in OperationConfig[op])) continue;
454454

455455
OperationConfig[op].patterns.forEach(pattern => {
456456
opPatterns.push({

‎src/core/lib/Protobuf.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class Protobuf {
124124
// Get the field key/values
125125
const key = field.key;
126126
const value = field.value;
127-
object[key] = object.hasOwnProperty(key) ?
127+
object[key] = Object.prototype.hasOwnProperty.call(object, key) ?
128128
object[key] instanceof Array ?
129129
object[key].concat([value]) :
130130
[object[key], value] :

‎src/core/lib/Typex.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ export class TypexMachine extends Enigma.EnigmaBase {
9898
if (x === " ") {
9999
inputMod += "X";
100100
} else if (mode) {
101-
if (KEYBOARD_REV.hasOwnProperty(x)) {
101+
if (Object.prototype.hasOwnProperty.call(KEYBOARD_REV, x)) {
102102
inputMod += KEYBOARD_REV[x];
103103
} else {
104104
mode = false;
105105
inputMod += "V" + x;
106106
}
107107
} else {
108-
if (KEYBOARD_REV.hasOwnProperty(x)) {
108+
if (Object.prototype.hasOwnProperty.call(KEYBOARD_REV, x)) {
109109
mode = true;
110110
inputMod += "Z" + KEYBOARD_REV[x];
111111
} else {

‎src/core/operations/GroupIPAddresses.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class GroupIPAddresses extends Operation {
7777
ip = strToIpv4(match[1]) >>> 0;
7878
network = ip & ipv4Mask;
7979

80-
if (ipv4Networks.hasOwnProperty(network)) {
80+
if (network in ipv4Networks) {
8181
ipv4Networks[network].push(ip);
8282
} else {
8383
ipv4Networks[network] = [ip];
@@ -93,7 +93,7 @@ class GroupIPAddresses extends Operation {
9393

9494
networkStr = ipv6ToStr(network, true);
9595

96-
if (ipv6Networks.hasOwnProperty(networkStr)) {
96+
if (networkStr in ipv6Networks) {
9797
ipv6Networks[networkStr].push(ip);
9898
} else {
9999
ipv6Networks[networkStr] = [ip];

‎src/core/operations/JWTVerify.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class JWTVerify extends Operation {
5050
"none"
5151
]});
5252

53-
if (verified.hasOwnProperty("name") && verified.name === "JsonWebTokenError") {
53+
if (Object.prototype.hasOwnProperty.call(verified, "name") && verified.name === "JsonWebTokenError") {
5454
throw new OperationError(verified.message);
5555
}
5656

‎src/core/operations/ParseColourCode.mjs

+6-6
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class ParseColourCode extends Operation {
9696
cmyk = "cmyk(" + c + ", " + m + ", " + y + ", " + k + ")";
9797

9898
// Generate output
99-
return `<div id="colorpicker" style="display: inline-block"></div>
99+
return `<div id="colorpicker" style="white-space: normal;"></div>
100100
Hex: ${hex}
101101
RGB: ${rgb}
102102
RGBA: ${rgba}
@@ -109,12 +109,12 @@ CMYK: ${cmyk}
109109
color: '${rgba}',
110110
container: true,
111111
inline: true,
112-
}).on('changeColor', function(e) {
113-
var color = e.color.toRGB();
114-
document.getElementById('input-text').value = 'rgba(' +
115-
color.r + ', ' + color.g + ', ' + color.b + ', ' + color.a + ')';
112+
useAlpha: true
113+
}).on('colorpickerChange', function(e) {
114+
var color = e.color.string('rgba');
115+
document.getElementById('input-text').value = color;
116116
window.app.autoBake();
117-
}).children(".colorpicker").removeClass('dropdown-menu');
117+
});
118118
</script>`;
119119
}
120120

‎src/core/operations/Register.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class Register extends Operation {
102102
args = args.map(arg => {
103103
if (typeof arg !== "string" && typeof arg !== "object") return arg;
104104

105-
if (typeof arg === "object" && arg.hasOwnProperty("string")) {
105+
if (typeof arg === "object" && Object.prototype.hasOwnProperty.call(arg, "string")) {
106106
arg.string = replaceRegister(arg.string);
107107
return arg;
108108
}

‎src/core/operations/ToHTMLEntity.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ class ToHTMLEntity extends Operation {
5959
} else if (convertAll) {
6060
output += byteToEntity[charcodes[i]] || "&#" + charcodes[i] + ";";
6161
} else if (numeric) {
62-
if (charcodes[i] > 255 || byteToEntity.hasOwnProperty(charcodes[i])) {
62+
if (charcodes[i] > 255 || charcodes[i] in byteToEntity) {
6363
output += "&#" + charcodes[i] + ";";
6464
} else {
6565
output += Utils.chr(charcodes[i]);
6666
}
6767
} else if (hexa) {
68-
if (charcodes[i] > 255 || byteToEntity.hasOwnProperty(charcodes[i])) {
68+
if (charcodes[i] > 255 || charcodes[i] in byteToEntity) {
6969
output += "&#x" + Utils.hex(charcodes[i]) + ";";
7070
} else {
7171
output += Utils.chr(charcodes[i]);

‎src/node/NodeRecipe.mjs

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ class NodeRecipe {
7979
execute(dish) {
8080
return this.opList.reduce((prev, curr) => {
8181
// CASE where opList item is op and args
82-
if (curr.hasOwnProperty("op") && curr.hasOwnProperty("args")) {
82+
if (Object.prototype.hasOwnProperty.call(curr, "op") &&
83+
Object.prototype.hasOwnProperty.call(curr, "args")) {
8384
return curr.op(prev, curr.args);
8485
}
8586
// CASE opList item is just op.

‎src/web/App.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class App {
256256

257257
for (let j = 0; j < catConf.ops.length; j++) {
258258
const opName = catConf.ops[j];
259-
if (!this.operations.hasOwnProperty(opName)) {
259+
if (!(opName in this.operations)) {
260260
log.warn(`${opName} could not be found.`);
261261
continue;
262262
}
@@ -372,7 +372,7 @@ class App {
372372
validFavourites(favourites) {
373373
const validFavs = [];
374374
for (let i = 0; i < favourites.length; i++) {
375-
if (this.operations.hasOwnProperty(favourites[i])) {
375+
if (favourites[i] in this.operations) {
376376
validFavs.push(favourites[i]);
377377
} else {
378378
this.alert(`The operation "${Utils.escapeHtml(favourites[i])}" is no longer available. ` +

‎src/web/Manager.mjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ class Manager {
321321
callback: callback.bind(scope || this)
322322
};
323323

324-
if (this.dynamicHandlers.hasOwnProperty(eventType)) {
324+
if (Object.prototype.hasOwnProperty.call(this.dynamicHandlers, eventType)) {
325325
// Listener already exists, add new handler to the appropriate list
326326
this.dynamicHandlers[eventType].push(eventConfig);
327327
} else {

‎src/web/waiters/InputWaiter.mjs

+5-4
Original file line numberDiff line numberDiff line change
@@ -219,13 +219,14 @@ class InputWaiter {
219219
handleLoaderMessage(e) {
220220
const r = e.data;
221221

222-
if (r.hasOwnProperty("progress") && r.hasOwnProperty("inputNum")) {
222+
if (Object.prototype.hasOwnProperty.call(r, "progress") &&
223+
Object.prototype.hasOwnProperty.call(r, "inputNum")) {
223224
this.manager.tabs.updateInputTabProgress(r.inputNum, r.progress, 100);
224-
} else if (r.hasOwnProperty("fileBuffer")) {
225+
} else if (Object.prototype.hasOwnProperty.call(r, "fileBuffer")) {
225226
this.manager.tabs.updateInputTabProgress(r.inputNum, 100, 100);
226227
}
227228

228-
const transferable = r.hasOwnProperty("fileBuffer") ? [r.fileBuffer] : undefined;
229+
const transferable = Object.prototype.hasOwnProperty.call(r, "fileBuffer") ? [r.fileBuffer] : undefined;
229230
this.inputWorker.postMessage({
230231
action: "loaderWorkerMessage",
231232
data: r
@@ -241,7 +242,7 @@ class InputWaiter {
241242
handleInputWorkerMessage(e) {
242243
const r = e.data;
243244

244-
if (!r.hasOwnProperty("action")) {
245+
if (!("action" in r)) {
245246
log.error("A message was received from the InputWorker with no action property. Ignoring message.");
246247
return;
247248
}

0 commit comments

Comments
 (0)