From 0c14bacea7b7218a80c59cfbb43da6d453c89665 Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Fri, 18 Jan 2019 15:07:19 +0000
Subject: [PATCH 01/24] Add button to input to allow opening of files using the
 file prompt.

---
 src/web/InputWaiter.mjs | 20 ++++++++++++++++++++
 src/web/Manager.mjs     |  1 +
 src/web/html/index.html |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/src/web/InputWaiter.mjs b/src/web/InputWaiter.mjs
index 37f1134a..245891f7 100755
--- a/src/web/InputWaiter.mjs
+++ b/src/web/InputWaiter.mjs
@@ -251,6 +251,26 @@ class InputWaiter {
         }
     }
 
+    /**
+     * Handler for open input button events
+     * Loads the opened data into the input textarea
+     *
+     * @param {event} e
+     */
+    inputOpen(e) {
+        e.preventDefault();
+
+        const file = e.srcElement.files[0];
+
+        if (file) {
+            this.closeFile();
+            this.loaderWorker = new LoaderWorker();
+            this.loaderWorker.addEventListener("message", this.handleLoaderMessage.bind(this));
+            this.loaderWorker.postMessage({"file": file});
+            this.set(file);
+        }
+    }
+
 
     /**
      * Handler for messages sent back by the LoaderWorker.
diff --git a/src/web/Manager.mjs b/src/web/Manager.mjs
index d33616a4..c446aba3 100755
--- a/src/web/Manager.mjs
+++ b/src/web/Manager.mjs
@@ -143,6 +143,7 @@ class Manager {
         this.addMultiEventListener("#input-text", "paste", this.input.inputPaste, this.input);
         document.getElementById("reset-layout").addEventListener("click", this.app.resetLayout.bind(this.app));
         document.getElementById("clr-io").addEventListener("click", this.input.clearIoClick.bind(this.input));
+        this.addListeners("#open-file", "change", this.input.inputOpen, this.input);
         this.addListeners("#input-text,#input-file", "dragover", this.input.inputDragover, this.input);
         this.addListeners("#input-text,#input-file", "dragleave", this.input.inputDragleave, this.input);
         this.addListeners("#input-text,#input-file", "drop", this.input.inputDrop, this.input);
diff --git a/src/web/html/index.html b/src/web/html/index.html
index f03590ab..cc10f4b4 100755
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -225,6 +225,10 @@
                         <div class="title no-select">
                             <label for="input-text">Input</label>
                             <span class="float-right">
+                                <button type="button" class="btn btn-primary bmd-btn-icon" id="btn-open-file" data-toggle="tooltip" title="Open file as input" onclick="document.getElementById('open-file').click();">
+                                    <i class="material-icons">folder</i>
+                                    <input type="file" id="open-file" style="display: none">
+                                </button>
                                 <button type="button" class="btn btn-primary bmd-btn-icon" id="clr-io" data-toggle="tooltip" title="Clear input and output">
                                     <i class="material-icons">delete</i>
                                 </button>

From acb8c0b5aff0322a93961f809dcf6604ad76118f Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Fri, 18 Jan 2019 15:12:03 +0000
Subject: [PATCH 02/24] Change icon from folder to input

---
 src/web/html/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/web/html/index.html b/src/web/html/index.html
index cc10f4b4..74eb0ed8 100755
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -226,7 +226,7 @@
                             <label for="input-text">Input</label>
                             <span class="float-right">
                                 <button type="button" class="btn btn-primary bmd-btn-icon" id="btn-open-file" data-toggle="tooltip" title="Open file as input" onclick="document.getElementById('open-file').click();">
-                                    <i class="material-icons">folder</i>
+                                    <i class="material-icons">input</i>
                                     <input type="file" id="open-file" style="display: none">
                                 </button>
                                 <button type="button" class="btn btn-primary bmd-btn-icon" id="clr-io" data-toggle="tooltip" title="Clear input and output">

From 3209c94622ea4f498550f5794dcf9c54c5f93c6b Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Mon, 21 Jan 2019 12:50:30 +0000
Subject: [PATCH 03/24] Fix conversion breaking when compass directions are
 used as delimiters

---
 src/core/lib/ConvertCoordinates.mjs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/core/lib/ConvertCoordinates.mjs b/src/core/lib/ConvertCoordinates.mjs
index ad592b74..af13882d 100644
--- a/src/core/lib/ConvertCoordinates.mjs
+++ b/src/core/lib/ConvertCoordinates.mjs
@@ -72,7 +72,7 @@ export function convertCoordinates (input, inFormat, inDelim, outFormat, outDeli
         if (inDelim === null) {
             throw new OperationError("Unable to detect the input delimiter automatically.");
         }
-    } else {
+    } else if (!inDelim.includes("Direction")) {
         // Convert the delimiter argument value to the actual character
         inDelim = realDelim(inDelim);
     }
@@ -89,7 +89,16 @@ export function convertCoordinates (input, inFormat, inDelim, outFormat, outDeli
     outDelim = realDelim(outDelim);
 
     if (!NO_CHANGE.includes(inFormat)) {
-        split = input.split(inDelim);
+        if (inDelim.includes("Direction")) {
+            // Split on directions
+            split = input.split(/[NnEeSsWw]/g);
+            if (split[0] === "") {
+                // Remove first element if direction preceding
+                split = split.slice(1);
+            }
+        } else {
+            split = input.split(inDelim);
+        }
         // Replace any co-ordinate symbols with spaces so we can split on them later
         for (let i = 0; i < split.length; i++) {
             split[i] = split[i].replace(/[°˝´'"]/g, " ");
@@ -196,7 +205,7 @@ export function convertCoordinates (input, inFormat, inDelim, outFormat, outDeli
     if (inFormat.includes("Degrees")) {
         // If the input string contains directions, we need to check if they're S or W.
         // If either of the directions are, we should make the decimal value negative
-        const dirs = input.match(/[NnEeSsWw]/g);
+        const dirs = input.toUpperCase().match(/[NESW]/g);
         if (dirs && dirs.length >= 1) {
             // Make positive lat/lon values with S/W directions into negative values
             if (dirs[0] === "S" || dirs[0] === "W" && latlon.lat > 0) {

From 8b44927cb60178c78f84808da164deffa7899a12 Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Thu, 31 Jan 2019 15:18:37 +0000
Subject: [PATCH 04/24] Fix XSS for To Table operation and Magic button

---
 src/core/operations/ToTable.mjs | 2 +-
 src/web/OutputWaiter.mjs        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/operations/ToTable.mjs b/src/core/operations/ToTable.mjs
index 28cd9bfe..6d10b340 100644
--- a/src/core/operations/ToTable.mjs
+++ b/src/core/operations/ToTable.mjs
@@ -57,7 +57,7 @@ class ToTable extends Operation {
         const [cellDelims, rowDelims, firstRowHeader, format] = args;
 
         // Process the input into a nested array of elements.
-        const tableData = Utils.parseCSV(input, cellDelims.split(""), rowDelims.split(""));
+        const tableData = Utils.parseCSV(Utils.escapeHtml(input), cellDelims.split(""), rowDelims.split(""));
 
         if (!tableData.length) return "";
 
diff --git a/src/web/OutputWaiter.mjs b/src/web/OutputWaiter.mjs
index 28deaffa..ed35c911 100755
--- a/src/web/OutputWaiter.mjs
+++ b/src/web/OutputWaiter.mjs
@@ -478,7 +478,7 @@ class OutputWaiter {
      */
     showMagicButton(opSequence, result, recipeConfig) {
         const magicButton = document.getElementById("magic");
-        magicButton.setAttribute("data-original-title", `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.truncate(result, 30)}"</span>`);
+        magicButton.setAttribute("data-original-title", `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.truncate(Utils.escapeHtml(result), 30)}"</span>`);
         magicButton.setAttribute("data-recipe", JSON.stringify(recipeConfig), null, "");
         magicButton.classList.remove("hidden");
     }

From 74a22bcf9c4754e3bc107579c76d39c915d95695 Mon Sep 17 00:00:00 2001
From: j433866 <j433866@gmail.com>
Date: Thu, 31 Jan 2019 15:22:25 +0000
Subject: [PATCH 05/24] Swap ordering of truncating and escaping

---
 src/web/OutputWaiter.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/web/OutputWaiter.mjs b/src/web/OutputWaiter.mjs
index ed35c911..2d93507c 100755
--- a/src/web/OutputWaiter.mjs
+++ b/src/web/OutputWaiter.mjs
@@ -478,7 +478,7 @@ class OutputWaiter {
      */
     showMagicButton(opSequence, result, recipeConfig) {
         const magicButton = document.getElementById("magic");
-        magicButton.setAttribute("data-original-title", `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.truncate(Utils.escapeHtml(result), 30)}"</span>`);
+        magicButton.setAttribute("data-original-title", `<i>${opSequence}</i> will produce <span class="data-text">"${Utils.escapeHtml(Utils.truncate(result), 30)}"</span>`);
         magicButton.setAttribute("data-recipe", JSON.stringify(recipeConfig), null, "");
         magicButton.classList.remove("hidden");
     }

From 6a099f0813117494568d04beb01e4463221a09d3 Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Wed, 6 Feb 2019 20:20:20 +0000
Subject: [PATCH 06/24] Inital Commit

---
 src/core/operations/DNSOverHTTPS.mjs | 93 ++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 src/core/operations/DNSOverHTTPS.mjs

diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
new file mode 100644
index 00000000..70b779f1
--- /dev/null
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -0,0 +1,93 @@
+/**
+ * @author h345983745 []
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+import jpath from "jsonpath";
+import Operation from "../Operation";
+import OperationError from "../errors/OperationError";
+
+/**
+ * HTTPS Over DNS operation
+ */
+class HTTPSOverDNS extends Operation {
+
+    /**
+     * HTTPSOverDNS constructor
+     */
+    constructor() {
+        super();
+
+        this.name = "DNS Over HTTPS";
+        this.module = "Code";
+        this.description = "Calls out to HTTPS Over DNS Resolvers";
+        this.infoURL = "https://en.wikipedia.org/wiki/DNS_over_HTTPS";
+        this.inputType = "string";
+        this.outputType = "JSON";
+        this.args = [
+            {
+                name: "Resolver",
+                type: "editableOption",
+                value: [
+                    {
+                        name: "Google",
+                        value: "https://dns.google.com/resolve"
+                    },
+                    {
+                        name: "Cloudflare",
+                        value: "https://cloudflare-dns.com/dns-query"
+                    }
+                ]
+            },
+            {
+                name: "Request Type",
+                type: "option",
+                value: [
+                    "A",
+                    "AAAA",
+                    "TXT",
+                    "MX"
+                ]
+            },
+            {
+                name: "Show Just Answer Data",
+                type: "boolean",
+                value: false
+            },
+            {
+                name: "Validate DNSSEC",
+                type: "boolean",
+                value: true
+            }
+        ];
+    }
+
+    /**
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {JSON}
+     */
+    run(input, args) {
+        const [resolver, requestType, justAnswer, DNSSEC] = args;
+
+        var url = new URL(resolver);
+        var params = {name:input, type:requestType, cd:DNSSEC};
+
+        url.search = new URLSearchParams(params)
+
+        console.log(url.toString())
+        
+        return fetch(url, {headers:{'accept': 'application/dns-json'}}).then(response => {return response.json()})
+        .then(data => {
+            if(justAnswer){
+                return jpath.query(data, "$.Answer[*].data")
+            }
+            return data;
+
+        }).catch(e => {throw new OperationError("Error making request to " + url + e.toString())})
+
+    }
+
+}
+
+export default HTTPSOverDNS;

From d42075072b9a1ed192ee344d09fac6c02068da7c Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Wed, 6 Feb 2019 20:54:06 +0000
Subject: [PATCH 07/24] Small Updates

---
 src/core/operations/DNSOverHTTPS.mjs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index 70b779f1..f2c7203a 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -24,6 +24,7 @@ class HTTPSOverDNS extends Operation {
         this.infoURL = "https://en.wikipedia.org/wiki/DNS_over_HTTPS";
         this.inputType = "string";
         this.outputType = "JSON";
+        this.manualBake = true;
         this.args = [
             {
                 name: "Resolver",
@@ -69,13 +70,16 @@ class HTTPSOverDNS extends Operation {
      */
     run(input, args) {
         const [resolver, requestType, justAnswer, DNSSEC] = args;
-
-        var url = new URL(resolver);
+        try{
+            var url = new URL(resolver);
+        } catch (error) {
+            throw new OperationError(error.toString() + 
+            "\n\nThis error could be caused by one of the following:\n" +
+            " - An invalid Resolver URL\n" )
+        }
         var params = {name:input, type:requestType, cd:DNSSEC};
-
         url.search = new URLSearchParams(params)
 
-        console.log(url.toString())
         
         return fetch(url, {headers:{'accept': 'application/dns-json'}}).then(response => {return response.json()})
         .then(data => {
@@ -84,7 +88,7 @@ class HTTPSOverDNS extends Operation {
             }
             return data;
 
-        }).catch(e => {throw new OperationError("Error making request to " + url + e.toString())})
+        }).catch(e => {throw new OperationError("Error making request to :" + url + e.toString())})
 
     }
 

From 3e9c75f7350b2fcda481fc05d1c61416a42c96b9 Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Wed, 6 Feb 2019 22:34:43 +0000
Subject: [PATCH 08/24] Added to Categories

---
 src/core/config/Categories.json      | 1 +
 src/core/operations/DNSOverHTTPS.mjs | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/core/config/Categories.json b/src/core/config/Categories.json
index 3da6a5e0..8235ab10 100755
--- a/src/core/config/Categories.json
+++ b/src/core/config/Categories.json
@@ -155,6 +155,7 @@
         "name": "Networking",
         "ops": [
             "HTTP request",
+            "DNS over HTTPS",
             "Strip HTTP headers",
             "Dechunk HTTP response",
             "Parse User Agent",
diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index f2c7203a..e0884430 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -18,9 +18,13 @@ class HTTPSOverDNS extends Operation {
     constructor() {
         super();
 
-        this.name = "DNS Over HTTPS";
+        this.name = "DNS over HTTPS";
         this.module = "Code";
-        this.description = "Calls out to HTTPS Over DNS Resolvers";
+        this.description = ["Takes a single domain name and performs a DNS lookup using DNS vver HTTPS.",
+        "<br><br>",
+        "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
+        "<br><br>",
+        "Can be used with any service that supports the GET paramaters <code>name</code> and <code>type</code>."].join('\n');
         this.infoURL = "https://en.wikipedia.org/wiki/DNS_over_HTTPS";
         this.inputType = "string";
         this.outputType = "JSON";

From 105090db60f2c6e83585691b0d0d2019b47052db Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Wed, 6 Feb 2019 22:50:46 +0000
Subject: [PATCH 09/24] Spelling Check

---
 src/core/operations/DNSOverHTTPS.mjs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index e0884430..06519f48 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -20,11 +20,11 @@ class HTTPSOverDNS extends Operation {
 
         this.name = "DNS over HTTPS";
         this.module = "Code";
-        this.description = ["Takes a single domain name and performs a DNS lookup using DNS vver HTTPS.",
+        this.description = ["Takes a single domain name and performs a DNS lookup using DNS over HTTPS.",
         "<br><br>",
         "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
         "<br><br>",
-        "Can be used with any service that supports the GET paramaters <code>name</code> and <code>type</code>."].join('\n');
+        "Can be used with any service that supports the GET parameters <code>name</code> and <code>type</code>."].join('\n');
         this.infoURL = "https://en.wikipedia.org/wiki/DNS_over_HTTPS";
         this.inputType = "string";
         this.outputType = "JSON";
@@ -55,7 +55,7 @@ class HTTPSOverDNS extends Operation {
                 ]
             },
             {
-                name: "Show Just Answer Data",
+                name: "Answer Data Only",
                 type: "boolean",
                 value: false
             },
@@ -92,7 +92,8 @@ class HTTPSOverDNS extends Operation {
             }
             return data;
 
-        }).catch(e => {throw new OperationError("Error making request to :" + url + e.toString())})
+        }).catch(e => {throw new OperationError("Error making request to : " + url + "\n" + 
+            "Error Message:  " + e.toString())})
 
     }
 

From 0d0a6342553091bc490f787a2dcf19c9c41468cf Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Wed, 6 Feb 2019 23:27:27 +0000
Subject: [PATCH 10/24] Added More Request Types

---
 src/core/operations/DNSOverHTTPS.mjs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index 06519f48..2a4769ee 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -51,7 +51,9 @@ class HTTPSOverDNS extends Operation {
                     "A",
                     "AAAA",
                     "TXT",
-                    "MX"
+                    "MX",
+                    "DNSKEY",
+                    "NS"
                 ]
             },
             {
@@ -82,6 +84,7 @@ class HTTPSOverDNS extends Operation {
             " - An invalid Resolver URL\n" )
         }
         var params = {name:input, type:requestType, cd:DNSSEC};
+
         url.search = new URLSearchParams(params)
 
         

From 613cbaa556f98f17391805d7b8e3d29dec8408e3 Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Thu, 7 Feb 2019 08:28:23 +0000
Subject: [PATCH 11/24] Fixing Formating Issues

---
 src/core/operations/DNSOverHTTPS.mjs | 42 +++++++++++++++-------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index 2a4769ee..178c0653 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -21,10 +21,10 @@ class HTTPSOverDNS extends Operation {
         this.name = "DNS over HTTPS";
         this.module = "Code";
         this.description = ["Takes a single domain name and performs a DNS lookup using DNS over HTTPS.",
-        "<br><br>",
-        "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
-        "<br><br>",
-        "Can be used with any service that supports the GET parameters <code>name</code> and <code>type</code>."].join('\n');
+                            "<br><br>",
+                            "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
+                            "<br><br>",
+                            "Can be used with any service that supports the GET parameters <code>name</code> and <code>type</code>."].join("\n");
         this.infoURL = "https://en.wikipedia.org/wiki/DNS_over_HTTPS";
         this.inputType = "string";
         this.outputType = "JSON";
@@ -76,27 +76,31 @@ class HTTPSOverDNS extends Operation {
      */
     run(input, args) {
         const [resolver, requestType, justAnswer, DNSSEC] = args;
-        try{
-            var url = new URL(resolver);
+        let url = URL;
+        try {
+            url = new URL(resolver);
         } catch (error) {
-            throw new OperationError(error.toString() + 
+            throw new OperationError(error.toString() +
             "\n\nThis error could be caused by one of the following:\n" +
-            " - An invalid Resolver URL\n" )
+            " - An invalid Resolver URL\n");
         }
-        var params = {name:input, type:requestType, cd:DNSSEC};
+        const params = {name: input, type: requestType, cd: DNSSEC};
 
-        url.search = new URLSearchParams(params)
+        url.search = new URLSearchParams(params);
 
-        
-        return fetch(url, {headers:{'accept': 'application/dns-json'}}).then(response => {return response.json()})
-        .then(data => {
-            if(justAnswer){
-                return jpath.query(data, "$.Answer[*].data")
-            }
-            return data;
+        return fetch(url, {headers: {"accept": "application/dns-json"}}).then(response => {
+            return response.json();
+        })
+            .then(data => {
+                if (justAnswer) {
+                    return jpath.query(data, "$.Answer[*].data");
+                }
+                return data;
 
-        }).catch(e => {throw new OperationError("Error making request to : " + url + "\n" + 
-            "Error Message:  " + e.toString())})
+            }).catch(e => {
+                throw new OperationError("Error making request to : " + url + "\n" +
+                    "Error Message:  " + e.toString());
+            });
 
     }
 

From 75a58f465c18efc67a266cb34cfe89e598c6ec47 Mon Sep 17 00:00:00 2001
From: h345983745 <owen89129@gchq.gov.uk>
Date: Thu, 7 Feb 2019 21:05:07 +0000
Subject: [PATCH 12/24] Removed jpath import

---
 src/core/operations/DNSOverHTTPS.mjs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index 178c0653..2cac79bf 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -3,7 +3,6 @@
  * @copyright Crown Copyright 2019
  * @license Apache-2.0
  */
-import jpath from "jsonpath";
 import Operation from "../Operation";
 import OperationError from "../errors/OperationError";
 
@@ -19,7 +18,7 @@ class HTTPSOverDNS extends Operation {
         super();
 
         this.name = "DNS over HTTPS";
-        this.module = "Code";
+        this.module = "Default";
         this.description = ["Takes a single domain name and performs a DNS lookup using DNS over HTTPS.",
                             "<br><br>",
                             "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
@@ -93,7 +92,7 @@ class HTTPSOverDNS extends Operation {
         })
             .then(data => {
                 if (justAnswer) {
-                    return jpath.query(data, "$.Answer[*].data");
+                    return this.extractData(data.Answer);
                 }
                 return data;
 
@@ -104,6 +103,25 @@ class HTTPSOverDNS extends Operation {
 
     }
 
+
+    /**
+     * Construct an array of just data from a DNS Answer section
+     * @private
+     * @param {JSON} data
+     * @returns {JSON}
+     */
+    extractData(data) {
+        if (typeof(data) == "undefined"){
+            return [];
+        } else {
+            const dataValues = [];
+            data.forEach(element => {
+                dataValues.push(element.data);
+            });
+            return dataValues;
+
+        }
+    }
 }
 
 export default HTTPSOverDNS;

From f1264d631065f959a37fd67b53e9381687287cb3 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 15:53:40 +0000
Subject: [PATCH 13/24] Update package-lock.json

---
 package-lock.json | 41 +++++++++++------------------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 73620cee..568b29d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5077,8 +5077,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5099,14 +5098,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5121,20 +5118,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5251,8 +5245,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5264,7 +5257,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5279,7 +5271,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5287,14 +5278,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5313,7 +5302,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5394,8 +5382,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5407,7 +5394,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5493,8 +5479,7 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5530,7 +5515,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5550,7 +5534,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5594,14 +5577,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

From f48af97ddcf70407cd66d5fb0fba5669f8387f96 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 15:53:42 +0000
Subject: [PATCH 14/24] 8.23.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 568b29d8..e2a17358 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.0",
+  "version": "8.23.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 49af6938..2f2081b4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.0",
+  "version": "8.23.1",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

From d2b4c4035700698afd50f2759f2f24d9c22d39d2 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 16:54:04 +0000
Subject: [PATCH 15/24] Fixed BigNumber/XRegExp incompatibility. CLoses #481

---
 package-lock.json                         | 31 ++++++++++++++++++-----
 package.json                              |  4 +--
 src/core/Dish.mjs                         |  4 +--
 src/core/operations/Divide.mjs            |  2 +-
 src/core/operations/Mean.mjs              |  2 +-
 src/core/operations/Median.mjs            |  2 +-
 src/core/operations/Multiply.mjs          |  2 +-
 src/core/operations/StandardDeviation.mjs |  2 +-
 src/core/operations/Subtract.mjs          |  2 +-
 src/core/operations/Sum.mjs               |  2 +-
 10 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e2a17358..9cf62951 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -766,6 +766,22 @@
         "semver": "^5.3.0"
       }
     },
+    "@babel/runtime-corejs2": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.3.1.tgz",
+      "integrity": "sha512-YpO13776h3e6Wy8dl2J8T9Qwlvopr+b4trCEhHE+yek6yIqV8sx6g3KozdHMbXeBpjosbPi+Ii5Z7X9oXFHUKA==",
+      "requires": {
+        "core-js": "^2.5.7",
+        "regenerator-runtime": "^0.12.0"
+      },
+      "dependencies": {
+        "regenerator-runtime": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz",
+          "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg=="
+        }
+      }
+    },
     "@babel/template": {
       "version": "7.2.2",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz",
@@ -2087,9 +2103,9 @@
       "dev": true
     },
     "bignumber.js": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.1.tgz",
-      "integrity": "sha512-zAySveTJXkgLYCBi0b14xzfnOs+f3G6x36I8w2a1+PFQpWk/dp0mI0F+ZZK2bu+3ELewDcSyP+Cfq++NcHX7sg=="
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.0.2.tgz",
+      "integrity": "sha512-EiuvFrnbv0jFixEQ9f58jo7X0qI2lNGIr/MxntmVzQc5JUweDSh8y8hbTCAomFtqwUPIOWcLXP0VEOSZTG7FFw=="
     },
     "binary-extensions": {
       "version": "1.12.0",
@@ -13831,9 +13847,12 @@
       "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ=="
     },
     "xregexp": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.2.0.tgz",
-      "integrity": "sha512-IyMa7SVe9FyT4WbQVW3b95mTLVceHhLEezQ02+QMvmIqDnKTxk0MLWIQPSW2MXAr1zQb+9yvwYhcyQULneh3wA=="
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.2.4.tgz",
+      "integrity": "sha512-sO0bYdYeJAJBcJA8g7MJJX7UrOZIfJPd8U2SC7B2Dd/J24U0aQNoGp33shCaBSWeb0rD5rh6VBUIXOkGal1TZA==",
+      "requires": {
+        "@babel/runtime-corejs2": "^7.2.0"
+      }
     },
     "xtend": {
       "version": "4.0.1",
diff --git a/package.json b/package.json
index 2f2081b4..d09c187a 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "babel-plugin-transform-builtin-extend": "1.1.2",
     "babel-polyfill": "^6.26.0",
     "bcryptjs": "^2.4.3",
-    "bignumber.js": "^8.0.1",
+    "bignumber.js": "^8.0.2",
     "bootstrap-colorpicker": "^2.5.3",
     "bootstrap-material-design": "^4.1.1",
     "bson": "^4.0.1",
@@ -131,7 +131,7 @@
     "vkbeautify": "^0.99.3",
     "xmldom": "^0.1.27",
     "xpath": "0.0.27",
-    "xregexp": "^4.2.0",
+    "xregexp": "^4.2.4",
     "zlibjs": "^0.3.1"
   },
   "scripts": {
diff --git a/src/core/Dish.mjs b/src/core/Dish.mjs
index 2276a36c..0635eb75 100755
--- a/src/core/Dish.mjs
+++ b/src/core/Dish.mjs
@@ -168,7 +168,7 @@ class Dish {
                     this.value = Array.prototype.slice.call(new Uint8Array(this.value));
                     break;
                 case Dish.BIG_NUMBER:
-                    this.value = this.value instanceof BigNumber ? Utils.strToByteArray(this.value.toFixed()) : [];
+                    this.value = BigNumber.isBigNumber(this.value) ? Utils.strToByteArray(this.value.toFixed()) : [];
                     break;
                 case Dish.JSON:
                     this.value = this.value ? Utils.strToByteArray(JSON.stringify(this.value, null, 4)) : [];
@@ -265,7 +265,7 @@ class Dish {
             case Dish.ARRAY_BUFFER:
                 return this.value instanceof ArrayBuffer;
             case Dish.BIG_NUMBER:
-                return this.value instanceof BigNumber;
+                return BigNumber.isBigNumber(this.value);
             case Dish.JSON:
                 // All values can be serialised in some manner, so we return true in all cases
                 return true;
diff --git a/src/core/operations/Divide.mjs b/src/core/operations/Divide.mjs
index 76f50313..5ca88be0 100644
--- a/src/core/operations/Divide.mjs
+++ b/src/core/operations/Divide.mjs
@@ -43,7 +43,7 @@ class Divide extends Operation {
      */
     run(input, args) {
         const val = div(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
     }
 
 }
diff --git a/src/core/operations/Mean.mjs b/src/core/operations/Mean.mjs
index a9bb8831..a7b110ce 100644
--- a/src/core/operations/Mean.mjs
+++ b/src/core/operations/Mean.mjs
@@ -43,7 +43,7 @@ class Mean extends Operation {
      */
     run(input, args) {
         const val = mean(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
     }
 
 }
diff --git a/src/core/operations/Median.mjs b/src/core/operations/Median.mjs
index ac75d83e..7101a403 100644
--- a/src/core/operations/Median.mjs
+++ b/src/core/operations/Median.mjs
@@ -43,7 +43,7 @@ class Median extends Operation {
      */
     run(input, args) {
         const val = median(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
     }
 
 }
diff --git a/src/core/operations/Multiply.mjs b/src/core/operations/Multiply.mjs
index f7e792e2..825078e2 100644
--- a/src/core/operations/Multiply.mjs
+++ b/src/core/operations/Multiply.mjs
@@ -44,7 +44,7 @@ class Multiply extends Operation {
      */
     run(input, args) {
         const val = multi(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
     }
 
 }
diff --git a/src/core/operations/StandardDeviation.mjs b/src/core/operations/StandardDeviation.mjs
index 8aeecd55..d02bd93c 100644
--- a/src/core/operations/StandardDeviation.mjs
+++ b/src/core/operations/StandardDeviation.mjs
@@ -44,7 +44,7 @@ class StandardDeviation extends Operation {
      */
     run(input, args) {
         const val = stdDev(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
 
     }
 
diff --git a/src/core/operations/Subtract.mjs b/src/core/operations/Subtract.mjs
index df8b1d03..10de142b 100644
--- a/src/core/operations/Subtract.mjs
+++ b/src/core/operations/Subtract.mjs
@@ -44,7 +44,7 @@ class Subtract extends Operation {
      */
     run(input, args) {
         const val = sub(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
     }
 
 }
diff --git a/src/core/operations/Sum.mjs b/src/core/operations/Sum.mjs
index ac667cf9..18504106 100644
--- a/src/core/operations/Sum.mjs
+++ b/src/core/operations/Sum.mjs
@@ -44,7 +44,7 @@ class Sum extends Operation {
      */
     run(input, args) {
         const val = sum(createNumArray(input, args[0]));
-        return val instanceof BigNumber ? val : new BigNumber(NaN);
+        return BigNumber.isBigNumber(val) ? val : new BigNumber(NaN);
     }
 
 }

From d54d66cffcbd0d7218865cce0c2359ba85d6380c Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 16:54:11 +0000
Subject: [PATCH 16/24] 8.23.2

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9cf62951..bca6ded4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.1",
+  "version": "8.23.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d09c187a..e21ac721 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.1",
+  "version": "8.23.2",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

From 7d09ba5669258df4b222841547ea189783caf7aa Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 17:06:42 +0000
Subject: [PATCH 17/24] 8.23.3

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bca6ded4..fa781acc 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.2",
+  "version": "8.23.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e21ac721..0fe588cc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.2",
+  "version": "8.23.3",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

From 3d20833d42f0bc011ff49e92d6a8dc6f276b53c5 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 17:28:10 +0000
Subject: [PATCH 18/24] Fixed populateOption HTML escape bug. Closes #490

---
 src/core/operations/RegularExpression.mjs | 2 +-
 src/web/HTMLIngredient.mjs                | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/operations/RegularExpression.mjs b/src/core/operations/RegularExpression.mjs
index cce65c63..d8411683 100644
--- a/src/core/operations/RegularExpression.mjs
+++ b/src/core/operations/RegularExpression.mjs
@@ -240,7 +240,7 @@ function regexHighlight (input, regex, displayTotal) {
         if (groups.length) {
             title += "Groups:\n";
             for (let i = 0; i < groups.length; i++) {
-                title += `\t${i+1}: ${Utils.escapeHtml(groups[i])}\n`;
+                title += `\t${i+1}: ${Utils.escapeHtml(groups[i] || "")}\n`;
             }
         }
 
diff --git a/src/web/HTMLIngredient.mjs b/src/web/HTMLIngredient.mjs
index 59b7bec7..ab7f682b 100755
--- a/src/web/HTMLIngredient.mjs
+++ b/src/web/HTMLIngredient.mjs
@@ -4,6 +4,8 @@
  * @license Apache-2.0
  */
 
+import Utils from "../core/Utils";
+
 /**
  * Object to handle the creation of operation ingredients.
  */
@@ -156,7 +158,7 @@ class HTMLIngredient {
                     } else if ((m = this.value[i].name.match(/\[\/([a-z0-9 -()^]+)\]/i))) {
                         html += "</optgroup>";
                     } else {
-                        html += `<option populate-value="${this.value[i].value}">${this.value[i].name}</option>`;
+                        html += `<option populate-value="${Utils.escapeHtml(this.value[i].value)}">${this.value[i].name}</option>`;
                     }
                 }
                 html += `</select>

From 0db0ced1ab9557b4c9077ed9cd4c4bdb21773484 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 17:28:16 +0000
Subject: [PATCH 19/24] 8.23.4

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fa781acc..76ac1ed3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.3",
+  "version": "8.23.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0fe588cc..5355b126 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.3",
+  "version": "8.23.4",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

From ab43635583d7aa0f0877c56278386e829af6a8f6 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 18:02:13 +0000
Subject: [PATCH 20/24] Tidied up 'DNS over HTTPS' operation and fixed
 manualBake flag.

---
 src/core/Operation.mjs                     | 22 ++++++
 src/core/config/scripts/generateConfig.mjs |  1 +
 src/core/operations/DNSOverHTTPS.mjs       | 82 +++++++++++-----------
 3 files changed, 63 insertions(+), 42 deletions(-)

diff --git a/src/core/Operation.mjs b/src/core/Operation.mjs
index d57f885d..c0907fe8 100755
--- a/src/core/Operation.mjs
+++ b/src/core/Operation.mjs
@@ -23,6 +23,7 @@ class Operation {
         this._breakpoint      = false;
         this._disabled        = false;
         this._flowControl     = false;
+        this._manualBake      = false;
         this._ingList         = [];
 
         // Public fields
@@ -282,6 +283,7 @@ class Operation {
         return this._flowControl;
     }
 
+
     /**
      * Set whether this Operation is a flowcontrol op.
      *
@@ -291,6 +293,26 @@ class Operation {
         this._flowControl = !!value;
     }
 
+
+    /**
+     * Returns true if this Operation should not trigger AutoBake.
+     *
+     * @returns {boolean}
+     */
+    get manualBake() {
+        return this._manualBake;
+    }
+
+
+    /**
+     * Set whether this Operation should trigger AutoBake.
+     *
+     * @param {boolean} value
+     */
+    set manualBake(value) {
+        this._manualBake = !!value;
+    }
+
 }
 
 export default Operation;
diff --git a/src/core/config/scripts/generateConfig.mjs b/src/core/config/scripts/generateConfig.mjs
index 7f0dfc59..335d47b8 100644
--- a/src/core/config/scripts/generateConfig.mjs
+++ b/src/core/config/scripts/generateConfig.mjs
@@ -41,6 +41,7 @@ for (const opObj in Ops) {
         inputType:   op.inputType,
         outputType:  op.presentType,
         flowControl: op.flowControl,
+        manualBake:  op.manualBake,
         args:        op.args
     };
 
diff --git a/src/core/operations/DNSOverHTTPS.mjs b/src/core/operations/DNSOverHTTPS.mjs
index 2cac79bf..b56feb6a 100644
--- a/src/core/operations/DNSOverHTTPS.mjs
+++ b/src/core/operations/DNSOverHTTPS.mjs
@@ -1,5 +1,5 @@
 /**
- * @author h345983745 []
+ * @author h345983745
  * @copyright Crown Copyright 2019
  * @license Apache-2.0
  */
@@ -7,24 +7,26 @@ import Operation from "../Operation";
 import OperationError from "../errors/OperationError";
 
 /**
- * HTTPS Over DNS operation
+ * DNS over HTTPS operation
  */
-class HTTPSOverDNS extends Operation {
+class DNSOverHTTPS extends Operation {
 
     /**
-     * HTTPSOverDNS constructor
+     * DNSOverHTTPS constructor
      */
     constructor() {
         super();
 
         this.name = "DNS over HTTPS";
         this.module = "Default";
-        this.description = ["Takes a single domain name and performs a DNS lookup using DNS over HTTPS.",
-                            "<br><br>",
-                            "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
-                            "<br><br>",
-                            "Can be used with any service that supports the GET parameters <code>name</code> and <code>type</code>."].join("\n");
-        this.infoURL = "https://en.wikipedia.org/wiki/DNS_over_HTTPS";
+        this.description = [
+            "Takes a single domain name and performs a DNS lookup using DNS over HTTPS.",
+            "<br><br>",
+            "By default, <a href='https://developers.cloudflare.com/1.1.1.1/dns-over-https/'>Cloudflare</a> and <a href='https://developers.google.com/speed/public-dns/docs/dns-over-https'>Google</a> DNS over HTTPS services are supported.",
+            "<br><br>",
+            "Can be used with any service that supports the GET parameters <code>name</code> and <code>type</code>."
+        ].join("\n");
+        this.infoURL = "https://wikipedia.org/wiki/DNS_over_HTTPS";
         this.inputType = "string";
         this.outputType = "JSON";
         this.manualBake = true;
@@ -89,39 +91,35 @@ class HTTPSOverDNS extends Operation {
 
         return fetch(url, {headers: {"accept": "application/dns-json"}}).then(response => {
             return response.json();
-        })
-            .then(data => {
-                if (justAnswer) {
-                    return this.extractData(data.Answer);
-                }
-                return data;
+        }).then(data => {
+            if (justAnswer) {
+                return extractData(data.Answer);
+            }
+            return data;
+        }).catch(e => {
+            throw new OperationError(`Error making request to ${url}\n${e.toString()}`);
+        });
 
-            }).catch(e => {
-                throw new OperationError("Error making request to : " + url + "\n" +
-                    "Error Message:  " + e.toString());
-            });
-
-    }
-
-
-    /**
-     * Construct an array of just data from a DNS Answer section
-     * @private
-     * @param {JSON} data
-     * @returns {JSON}
-     */
-    extractData(data) {
-        if (typeof(data) == "undefined"){
-            return [];
-        } else {
-            const dataValues = [];
-            data.forEach(element => {
-                dataValues.push(element.data);
-            });
-            return dataValues;
-
-        }
     }
 }
 
-export default HTTPSOverDNS;
+/**
+ * Construct an array of just data from a DNS Answer section
+ *
+ * @private
+ * @param {JSON} data
+ * @returns {JSON}
+ */
+function extractData(data) {
+    if (typeof(data) == "undefined"){
+        return [];
+    } else {
+        const dataValues = [];
+        data.forEach(element => {
+            dataValues.push(element.data);
+        });
+        return dataValues;
+    }
+}
+
+export default DNSOverHTTPS;

From 42826e542df71a4810922d3fade27bf24c847530 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 18:07:03 +0000
Subject: [PATCH 21/24] Updated changelog

---
 CHANGELOG.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ad915aa..2f3eca29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,10 @@
 All major and minor version changes will be documented in this file. Details of patch-level version changes can be found in [commit messages](https://github.com/gchq/CyberChef/commits/master).
 
 
-### [8.24.0] - 2019-01-18
+### [8.24.0] - 2019-02-08
+- 'DNS over HTTPS' operation added [@h345983745] | [#489]
+
+### [8.23.1] - 2019-01-18
 - 'Convert co-ordinate format' operation added [@j433866] | [#476]
 
 ### [8.23.0] - 2019-01-18
@@ -104,6 +107,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 [8.24.0]: https://github.com/gchq/CyberChef/releases/tag/v8.24.0
+[8.23.1]: https://github.com/gchq/CyberChef/releases/tag/v8.23.1
 [8.23.0]: https://github.com/gchq/CyberChef/releases/tag/v8.23.0
 [8.22.0]: https://github.com/gchq/CyberChef/releases/tag/v8.22.0
 [8.21.0]: https://github.com/gchq/CyberChef/releases/tag/v8.21.0
@@ -137,6 +141,7 @@ All major and minor version changes will be documented in this file. Details of
 [@d98762625]: https://github.com/d98762625
 [@j433866]: https://github.com/j433866
 [@GCHQ77703]: https://github.com/GCHQ77703
+[@h345983745]: https://github.com/h345983745
 [@artemisbot]: https://github.com/artemisbot
 [@picapi]: https://github.com/picapi
 [@Dachande663]: https://github.com/Dachande663
@@ -186,3 +191,4 @@ All major and minor version changes will be documented in this file. Details of
 [#467]: https://github.com/gchq/CyberChef/pull/467
 [#468]: https://github.com/gchq/CyberChef/pull/468
 [#476]: https://github.com/gchq/CyberChef/pull/476
+[#489]: https://github.com/gchq/CyberChef/pull/489

From 7a4e0301d2b61cb09a5de7ff99e089dbad7400a7 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Fri, 8 Feb 2019 18:07:10 +0000
Subject: [PATCH 22/24] 8.24.0

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 76ac1ed3..1340f4ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.4",
+  "version": "8.24.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5355b126..8cb785a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.23.4",
+  "version": "8.24.0",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",

From 13abbd2c5d6576b706b997ea00897829e3218636 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Mon, 11 Feb 2019 14:48:25 +0000
Subject: [PATCH 23/24] Abstracted out loadFile logic to separate function

---
 src/web/InputWaiter.mjs | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/web/InputWaiter.mjs b/src/web/InputWaiter.mjs
index 245891f7..17b48b6f 100755
--- a/src/web/InputWaiter.mjs
+++ b/src/web/InputWaiter.mjs
@@ -243,11 +243,7 @@ class InputWaiter {
         }
 
         if (file) {
-            this.closeFile();
-            this.loaderWorker = new LoaderWorker();
-            this.loaderWorker.addEventListener("message", this.handleLoaderMessage.bind(this));
-            this.loaderWorker.postMessage({"file": file});
-            this.set(file);
+            this.loadFile(file);
         }
     }
 
@@ -259,16 +255,8 @@ class InputWaiter {
      */
     inputOpen(e) {
         e.preventDefault();
-
         const file = e.srcElement.files[0];
-
-        if (file) {
-            this.closeFile();
-            this.loaderWorker = new LoaderWorker();
-            this.loaderWorker.addEventListener("message", this.handleLoaderMessage.bind(this));
-            this.loaderWorker.postMessage({"file": file});
-            this.set(file);
-        }
+        this.loadFile(file);
     }
 
 
@@ -326,6 +314,22 @@ class InputWaiter {
     }
 
 
+    /**
+     * Loads a file into the input.
+     *
+     * @param {File} file
+     */
+    loadFile(file) {
+        if (file) {
+            this.closeFile();
+            this.loaderWorker = new LoaderWorker();
+            this.loaderWorker.addEventListener("message", this.handleLoaderMessage.bind(this));
+            this.loaderWorker.postMessage({"file": file});
+            this.set(file);
+        }
+    }
+
+
     /**
      * Handler for clear IO events.
      * Resets the input, output and info areas.

From b5c655dd70c096e2053625a774146b80c28d3489 Mon Sep 17 00:00:00 2001
From: n1474335 <n1474335@gmail.com>
Date: Mon, 11 Feb 2019 14:48:45 +0000
Subject: [PATCH 24/24] 8.24.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1340f4ba..257745b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.24.0",
+  "version": "8.24.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8cb785a2..2828a5d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "8.24.0",
+  "version": "8.24.1",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",