Mirror
/
CyberChef
mirror of https://github.com/gchq/CyberChef.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linted to satisfy new rules

This commit is contained in:
n1474335 2019-07-05 12:36:15 +01:00
parent e4e32a9c56
commit b272d3b32f
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/web/waiters/InputWaiter.mjs
View File

@ -219,13 +219,14 @@ class InputWaiter {
handleLoaderMessage(e) { handleLoaderMessage(e) {
const r = e.data; 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); 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); 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({ this.inputWorker.postMessage({
action: "loaderWorkerMessage", action: "loaderWorkerMessage",
data: r data: r
@ -241,7 +242,7 @@ class InputWaiter {
handleInputWorkerMessage(e) { handleInputWorkerMessage(e) {
const r = e.data; 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."); log.error("A message was received from the InputWorker with no action property. Ignoring message.");
return; return;
} }

4
src/web/waiters/OutputWaiter.mjs
View File

@ -651,12 +651,12 @@ class OutputWaiter {
*/ */
handleZipWorkerMessage(e) { handleZipWorkerMessage(e) {
const r = e.data; const r = e.data;
if (!r.hasOwnProperty("zippedFile")) { if (!("zippedFile" in r)) {
log.error("No zipped file was sent in the message."); log.error("No zipped file was sent in the message.");
this.terminateZipWorker(); this.terminateZipWorker();
return; return;
} }
if (!r.hasOwnProperty("filename")) { if (!("filename" in r)) {
log.error("No filename was sent in the message."); log.error("No filename was sent in the message.");
this.terminateZipWorker(); this.terminateZipWorker();
return; return;

4
src/web/waiters/WorkerWaiter.mjs
View File

@ -178,7 +178,7 @@ class WorkerWaiter {
let inputNum = 0; let inputNum = 0;
log.debug(`Receiving ${r.action} from ChefWorker.`); log.debug(`Receiving ${r.action} from ChefWorker.`);
if (r.data.hasOwnProperty("inputNum")) { if ("inputNum" in r.data) {
inputNum = r.data.inputNum; inputNum = r.data.inputNum;
} }
@ -440,7 +440,7 @@ class WorkerWaiter {
// Remove all breakpoints from the recipe up to progress // Remove all breakpoints from the recipe up to progress
if (nextInput.progress !== false) { if (nextInput.progress !== false) {
for (let i = 0; i < nextInput.progress; i++) { for (let i = 0; i < nextInput.progress; i++) {
if (recipeConfig[i].hasOwnProperty("breakpoint")) { if ("breakpoint" in recipeConfig[i]) {
delete recipeConfig[i].breakpoint; delete recipeConfig[i].breakpoint;
} }
} }

10
src/web/workers/InputWorker.mjs
View File

@ -30,7 +30,7 @@ self.loadingInputs = 0;
*/ */
self.addEventListener("message", function(e) { self.addEventListener("message", function(e) {
const r = e.data; const r = e.data;
if (!r.hasOwnProperty("action")) { if (!("action" in r)) {
log.error("No action"); log.error("No action");
return; return;
} }
@ -639,11 +639,11 @@ self.loaderWorkerReady = function(workerData) {
self.handleLoaderMessage = function(r) { self.handleLoaderMessage = function(r) {
let inputNum = 0; let inputNum = 0;
if (r.hasOwnProperty("inputNum")) { if ("inputNum" in r) {
inputNum = r.inputNum; inputNum = r.inputNum;
} }
if (r.hasOwnProperty("error")) { if ("error" in r) {
self.updateInputProgress(r.inputNum, 0); self.updateInputProgress(r.inputNum, 0);
self.updateInputStatus(r.inputNum, "error"); self.updateInputStatus(r.inputNum, "error");
@ -657,7 +657,7 @@ self.handleLoaderMessage = function(r) {
return; return;
} }
if (r.hasOwnProperty("fileBuffer")) { if ("fileBuffer" in r) {
log.debug(`Input file ${inputNum} loaded.`); log.debug(`Input file ${inputNum} loaded.`);
self.loadingInputs--; self.loadingInputs--;
self.updateInputValue({ self.updateInputValue({
@ -667,7 +667,7 @@ self.handleLoaderMessage = function(r) {
const idx = self.getLoaderWorkerIdx(r.id); const idx = self.getLoaderWorkerIdx(r.id);
self.loadNextFile(idx); self.loadNextFile(idx);
} else if (r.hasOwnProperty("progress")) { } else if ("progress" in r) {
self.updateInputProgress(r); self.updateInputProgress(r);
} }
}; };

4
src/web/workers/ZipWorker.mjs
View File

@ -18,11 +18,11 @@ const Zlib = zip.Zlib;
*/ */
self.addEventListener("message", function(e) { self.addEventListener("message", function(e) {
const r = e.data; const r = e.data;
if (!r.hasOwnProperty("outputs")) { if (!("outputs" in r)) {
log.error("No files were passed to the ZipWorker."); log.error("No files were passed to the ZipWorker.");
return; return;
} }
if (!r.hasOwnProperty("filename")) { if (!("filename" in r)) {
log.error("No filename was passed to the ZipWorker"); log.error("No filename was passed to the ZipWorker");
return; return;
} }