merge 8.0.1 release -> node-lib

src/core/operations/Diff.mjs

@@ -47,9 +47,10 @@ class Diff extends Operation {
                 "value": true
             },
             {
-                "name": "Ignore whitespace (relevant for word and line)",
+                "name": "Ignore whitespace",
                 "type": "boolean",
-                "value": false
+                "value": false,
+                "hint": "Relevant for word and line"
             }
         ];
     }

src/core/operations/Entropy.mjs

@@ -20,7 +20,7 @@ class Entropy extends Operation {
 
         this.name = "Entropy";
         this.module = "Default";
-        this.description = "Calculates the Shannon entropy of the input data which gives an idea of its randomness. 8 is the maximum.";
+        this.description = "Shannon Entropy, in the context of information theory, is a measure of the rate at which information is produced by a source of data. It can be used, in a broad sense, to detect whether data is likely to be structured or unstructured. 8 is the maximum, representing highly unstructured, 'random' data. English language text usually falls somewhere between 3.5 and 5. Properly encrypted or compressed data should have an entropy of over 7.5.";
         this.inputType = "byteArray";
         this.outputType = "number";
         this.presentType = "html";

src/core/operations/FromHexdump.mjs

@@ -26,7 +26,7 @@ class FromHexdump extends Operation {
         this.args = [];
         this.patterns = [
             {
-                match: "^(?:(?:[\\dA-F]{4,16}h?:?)?[ \\t]*((?:[\\dA-F]{2} ){1,8}(?:[ \\t]|[\\dA-F]{2}-)(?:[\\dA-F]{2} ){1,8}|(?:[\\dA-F]{4} )*[\\dA-F]{4}|(?:[\\dA-F]{2} )*[\\dA-F]{2})[^\\n]*\\n?)+$",
+                match: "^(?:(?:[\\dA-F]{4,16}h?:?)?[ \\t]*((?:[\\dA-F]{2} ){1,8}(?:[ \\t]|[\\dA-F]{2}-)(?:[\\dA-F]{2} ){1,8}|(?:[\\dA-F]{4} )*[\\dA-F]{4}|(?:[\\dA-F]{2} )*[\\dA-F]{2})[^\\n]*\\n?){2,}$",
                 flags: "i",
                 args: []
             },

src/core/operations/HaversineDistance.mjs

@@ -0,0 +1,58 @@
+/**
+ * @author Dachande663 [dachande663@gmail.com]
+ * @copyright Crown Copyright 2018
+ * @license Apache-2.0
+ */
+
+import Operation from "../Operation";
+import OperationError from "../errors/OperationError";
+
+/**
+ * HaversineDistance operation
+ */
+class HaversineDistance extends Operation {
+
+    /**
+     * HaversineDistance constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "Haversine distance";
+        this.module = "Default";
+        this.description = "Returns the distance between two pairs of GPS latitude and longitude co-ordinates in metres.<br><br>e.g. <code>51.487263,-0.124323, 38.9517,-77.1467</code>";
+        this.inputType = "string";
+        this.outputType = "number";
+        this.args = [];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    run(input, args) {
+
+        const values = input.match(/^(-?\d+(\.\d+)?), ?(-?\d+(\.\d+)?), ?(-?\d+(\.\d+)?), ?(-?\d+(\.\d+)?)$/);
+        if (!values) {
+            throw new OperationError("Input must in the format lat1, lng1, lat2, lng2");
+        }
+
+        const lat1 = parseFloat(values[1]);
+        const lng1 = parseFloat(values[3]);
+        const lat2 = parseFloat(values[6]);
+        const lng2 = parseFloat(values[8]);
+
+        const TO_RAD = Math.PI / 180;
+        const dLat = (lat2-lat1) * TO_RAD;
+        const dLng = (lng2-lng1) * TO_RAD;
+        const a = Math.sin(dLat/2) * Math.sin(dLat/2) + Math.cos(lat1 * TO_RAD) * Math.cos(lat2 * TO_RAD) * Math.sin(dLng/2) * Math.sin(dLng/2);
+        const metres = 6371000 * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+
+        return metres;
+
+    }
+
+}
+
+export default HaversineDistance;

src/core/operations/Magic.mjs

@@ -23,7 +23,7 @@ class Magic extends Operation {
         this.name = "Magic";
         this.flowControl = true;
         this.module = "Default";
-        this.description = "The Magic operation attempts to detect various properties of the input data and suggests which operations could help to make more sense of it.<br><br><b>Options</b><br><u>Depth:</u> If an operation appears to match the data, it will be run and the result will be analysed further. This argument controls the maximum number of levels of recursion.<br><br><u>Intensive mode:</u> When this is turned on, various operations like XOR, bit rotates, and character encodings are brute-forced to attempt to detect valid data underneath. To improve performance, only the first 100 bytes of the data is brute-forced.<br><br><u>Extensive language support:</u> At each stage, the relative byte frequencies of the data will be compared to average frequencies for a number of languages. The default set consists of ~40 of the most commonly used languages on the Internet. The extensive list consists of 284 languages and can result in many languages matching the data if their byte frequencies are similar.";
+        this.description = "The Magic operation attempts to detect various properties of the input data and suggests which operations could help to make more sense of it.<br><br><b>Options</b><br><u>Depth:</u> If an operation appears to match the data, it will be run and the result will be analysed further. This argument controls the maximum number of levels of recursion.<br><br><u>Intensive mode:</u> When this is turned on, various operations like XOR, bit rotates, and character encodings are brute-forced to attempt to detect valid data underneath. To improve performance, only the first 100 bytes of the data is brute-forced.<br><br><u>Extensive language support:</u> At each stage, the relative byte frequencies of the data will be compared to average frequencies for a number of languages. The default set consists of ~40 of the most commonly used languages on the Internet. The extensive list consists of 284 languages and can result in many languages matching the data if their byte frequencies are similar.<br><br>A technical explanation of the Magic operation can be found <a href='https://github.com/gchq/CyberChef/wiki/Automatic-detection-of-encoded-data-using-CyberChef-Magic'>here</a>.";
         this.inputType = "ArrayBuffer";
         this.outputType = "JSON";
         this.presentType = "html";
@@ -77,7 +77,7 @@ class Magic extends Operation {
         const currentRecipeConfig = this.state.opList.map(op => op.config);
 
         let output = `<table
-                class='table table-hover table-condensed table-bordered'
+                class='table table-hover table-sm table-bordered'
                 style='table-layout: fixed;'>
             <tr>
                 <th>Recipe (click to load)</th>

src/core/operations/ParseColourCode.mjs

@@ -113,7 +113,7 @@ CMYK: ${cmyk}
         document.getElementById('input-text').value = 'rgba(' +
             color.r + ', ' + color.g + ', ' + color.b + ', ' + color.a + ')';
         window.app.autoBake();
-    });
+    }).children(".colorpicker").removeClass('dropdown-menu');
 </script>`;
     }
 

src/core/operations/ParseDateTime.mjs

@@ -7,7 +7,6 @@
 import Operation from "../Operation";
 import moment from "moment-timezone";
 import {DATETIME_FORMATS, FORMAT_EXAMPLES} from "../lib/DateTime";
-import OperationError from "../errors/OperationError";
 
 /**
  * Parse DateTime operation
@@ -60,7 +59,7 @@ class ParseDateTime extends Operation {
             date = moment.tz(input, inputFormat, inputTimezone);
             if (!date || date.format() === "Invalid date") throw Error;
         } catch (err) {
-            throw new OperationError(`Invalid format.\n\n${FORMAT_EXAMPLES}`);
+            return `Invalid format.\n\n${FORMAT_EXAMPLES}`;
         }
 
         output += "Date: " + date.format("dddd Do MMMM YYYY") +

src/core/operations/ParseIPv4Header.mjs

@@ -97,7 +97,7 @@ class ParseIPv4Header extends Operation {
             checksumResult = givenChecksum + " (incorrect, should be " + correctChecksum + ")";
         }
 
-        output = `<table class='table table-hover table-condensed table-bordered table-nonfluid'><tr><th>Field</th><th>Value</th></tr>
+        output = `<table class='table table-hover table-sm table-bordered table-nonfluid'><tr><th>Field</th><th>Value</th></tr>
 <tr><td>Version</td><td>${version}</td></tr>
 <tr><td>Internet Header Length (IHL)</td><td>${ihl} (${ihl * 4} bytes)</td></tr>
 <tr><td>Differentiated Services Code Point (DSCP)</td><td>${dscp}</td></tr>

src/core/operations/RenderImage.mjs

@@ -26,7 +26,8 @@ class RenderImage extends Operation {
         this.module = "Image";
         this.description = "Displays the input as an image. Supports the following formats:<br><br><ul><li>jpg/jpeg</li><li>png</li><li>gif</li><li>webp</li><li>bmp</li><li>ico</li></ul>";
         this.inputType = "string";
-        this.outputType = "html";
+        this.outputType = "byteArray";
+        this.presentType = "html";
         this.args = [
             {
                 "name": "Input format",
@@ -51,9 +52,8 @@ class RenderImage extends Operation {
      */
     run(input, args) {
         const inputFormat = args[0];
-        let dataURI = "data:";
 
-        if (!input.length) return "";
+        if (!input.length) return [];
 
         // Convert input to raw bytes
         switch (inputFormat) {
@@ -73,6 +73,26 @@ class RenderImage extends Operation {
 
         // Determine file type
         const type = Magic.magicFileType(input);
+        if (!(type && type.mime.indexOf("image") === 0)) {
+            throw new OperationError("Invalid file type");
+        }
+
+        return input;
+    }
+
+    /**
+     * Displays the image using HTML for web apps.
+     *
+     * @param {byteArray} data
+     * @returns {html}
+     */
+    async present(data) {
+        if (!data.length) return "";
+
+        let dataURI = "data:";
+
+        // Determine file type
+        const type = Magic.magicFileType(data);
         if (type && type.mime.indexOf("image") === 0) {
             dataURI += type.mime + ";";
         } else {
@@ -80,7 +100,7 @@ class RenderImage extends Operation {
         }
 
         // Add image data to URI
-        dataURI += "base64," + toBase64(input);
+        dataURI += "base64," + toBase64(data);
 
         return "<img src='" + dataURI + "'>";
     }

src/core/operations/ToTable.mjs

@@ -147,12 +147,12 @@ class ToTable extends Operation {
          */
         function htmlOutput(tableData) {
             // Start the HTML output with suitable classes for styling.
-            let output = "<table class='table table-hover table-condensed table-bordered table-nonfluid'>";
+            let output = "<table class='table table-hover table-sm table-bordered table-nonfluid'>";
 
             // If the first row is a header then put it in <thead> with <th> cells.
             if (firstRowHeader) {
                 const row = tableData.shift();
-                output += "<thead>";
+                output += "<thead class='thead-light'>";
                 output += outputRow(row, "th");
                 output += "</thead>";
             }

src/core/operations/TranslateDateTimeFormat.mjs

@@ -7,7 +7,6 @@
 import Operation from "../Operation";
 import moment from "moment-timezone";
 import {DATETIME_FORMATS, FORMAT_EXAMPLES} from "../lib/DateTime";
-import OperationError from "../errors/OperationError";
 
 /**
  * Translate DateTime Format operation
@@ -68,7 +67,7 @@ class TranslateDateTimeFormat extends Operation {
             date = moment.tz(input, inputFormat, inputTimezone);
             if (!date || date.format() === "Invalid date") throw Error;
         } catch (err) {
-            throw new OperationError(`Invalid format.\n\n${FORMAT_EXAMPLES}`);
+            return `Invalid format.\n\n${FORMAT_EXAMPLES}`;
         }
 
         return date.tz(outputTimezone).format(outputFormat);