7.7.4

Merge branch 'sitemap'
Added dynamically generated sitemap and robots.txt file to prevent crawling of inline version
2026-02-21 17:21:44 +01:00 · 2018-02-20 17:04:47 +00:00 · 2018-02-20 17:04:34 +00:00 · 2018-02-20 16:52:27 +00:00 · 2018-02-16 13:33:41 +00:00 · 2018-02-16 13:33:33 +00:00
20 changed files with 288 additions and 116 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,6 +51,7 @@
            "mode": "minimum"
        }],
        "indent": ["error", 4, {
+            "ignoreComments": true,
            "ArrayExpression": "first",
            "SwitchCase": 1
        }],
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ script:
  - grunt node
  - grunt prod --msg="$COMPILE_MSG"
 before_deploy:
+  - grunt exec:sitemap
  - grunt copy:ghPages
 deploy:
  - provider: pages
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -218,7 +218,8 @@ module.exports = function (grunt) {
            web: {
                target: "web",
                entry: Object.assign({
-                    main: "./src/web/index.js"
+                    main: "./src/web/index.js",
+                    sitemap: "./src/web/static/sitemap.js"
                }, moduleEntryPoints),
                output: {
                    path: __dirname + "/build/prod"
@@ -377,6 +378,10 @@ module.exports = function (grunt) {
                        expand: true,
                        src: "docs/**",
                        dest: "build/prod/"
+                    },
+                    {
+                        src: "src/web/static/robots.txt",
+                        dest: "build/prod/"
                    }
                ]
            }
@@ -406,6 +411,9 @@ module.exports = function (grunt) {
            cleanGit: {
                command: "git gc --prune=now --aggressive"
            },
+            sitemap: {
+                command: "node build/prod/sitemap.js > build/prod/sitemap.xml"
+            }
        },
        execute: {
            test: "build/test/index.js"
--- a/README.md
+++ b/README.md
@@ -103,4 +103,4 @@ CyberChef is released under the [Apache 2.0 Licence](https://www.apache.org/lice
  [8]: https://gchq.github.io/CyberChef/#recipe=Fork('%5C%5Cn','%5C%5Cn',false)Conditional_Jump('1',false,'base64',10)To_Hex('Space')Return()Label('base64')To_Base64('A-Za-z0-9%2B/%3D')&input=U29tZSBkYXRhIHdpdGggYSAxIGluIGl0ClNvbWUgZGF0YSB3aXRoIGEgMiBpbiBpdA
  [9]: https://gchq.github.io/CyberChef/#recipe=Register('key%3D(%5B%5C%5Cda-f%5D*)',true,false)Find_/_Replace(%7B'option':'Regex','string':'.*data%3D(.*)'%7D,'$1',true,false,true)RC4(%7B'option':'Hex','string':'$R0'%7D,'Hex','Latin1')&input=aHR0cDovL21hbHdhcmV6LmJpei9iZWFjb24ucGhwP2tleT0wZTkzMmE1YyZkYXRhPThkYjdkNWViZTM4NjYzYTU0ZWNiYjMzNGUzZGIxMQ
  [10]: https://gchq.github.io/CyberChef/#recipe=Register('(.%7B32%7D)',true,false)Drop_bytes(0,32,false)AES_Decrypt(%7B'option':'Hex','string':'1748e7179bd56570d51fa4ba287cc3e5'%7D,%7B'option':'Hex','string':'$R0'%7D,'CTR','Hex','Raw',%7B'option':'Hex','string':''%7D)&input=NTFlMjAxZDQ2MzY5OGVmNWY3MTdmNzFmNWI0NzEyYWYyMGJlNjc0YjNiZmY1M2QzODU0NjM5NmVlNjFkYWFjNDkwOGUzMTljYTNmY2Y3MDg5YmZiNmIzOGVhOTllNzgxZDI2ZTU3N2JhOWRkNmYzMTFhMzk0MjBiODk3OGU5MzAxNGIwNDJkNDQ3MjZjYWVkZjU0MzZlYWY2NTI0MjljMGRmOTRiNTIxNjc2YzdjMmNlODEyMDk3YzI3NzI3M2M3YzcyY2Q4OWFlYzhkOWZiNGEyNzU4NmNjZjZhYTBhZWUyMjRjMzRiYTNiZmRmN2FlYjFkZGQ0Nzc2MjJiOTFlNzJjOWU3MDlhYjYwZjhkYWY3MzFlYzBjYzg1Y2UwZjc0NmZmMTU1NGE1YTNlYzI5MWNhNDBmOWU2MjlhODcyNTkyZDk4OGZkZDgzNDUzNGFiYTc5YzFhZDE2NzY3NjlhN2MwMTBiZjA0NzM5ZWNkYjY1ZDk1MzAyMzcxZDYyOWQ5ZTM3ZTdiNGEzNjFkYTQ2OGYxZWQ1MzU4OTIyZDJlYTc1MmRkMTFjMzY2ZjMwMTdiMTRhYTAxMWQyYWYwM2M0NGY5NTU3OTA5OGExNWUzY2Y5YjQ0ODZmOGZmZTljMjM5ZjM0ZGU3MTUxZjZjYTY1MDBmZTRiODUwYzNmMWMwMmU4MDFjYWYzYTI0NDY0NjE0ZTQyODAxNjE1YjhmZmFhMDdhYzgyNTE0OTNmZmRhN2RlNWRkZjMzNjg4ODBjMmI5NWIwMzBmNDFmOGYxNTA2NmFkZDA3MWE2NmNmNjBlNWY0NmYzYTIzMGQzOTdiNjUyOTYzYTIxYTUzZg
-  [11]: https://gchq.github.io/CyberChef/#recipe=XOR(%7B'option':'Hex','string':'3a'%7D,'',false)To_Hexdump(16,false,false)&input=VGhlIGFuc3dlciB0byB0aGUgdWx0aW1hdGUgcXVlc3Rpb24gb2YgbGlmZSwgdGhlIFVuaXZlcnNlLCBhbmQgZXZlcnl0aGluZyBpcyA0Mi4
+  [11]: https://gchq.github.io/CyberChef/#recipe=XOR(%7B'option':'Hex','string':'3a'%7D,'Standard',false)To_Hexdump(16,false,false)&input=VGhlIGFuc3dlciB0byB0aGUgdWx0aW1hdGUgcXVlc3Rpb24gb2YgbGlmZSwgdGhlIFVuaXZlcnNlLCBhbmQgZXZlcnl0aGluZyBpcyA0Mi4
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "cyberchef",
-  "version": "7.6.3",
+  "version": "7.7.4",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1454,6 +1454,12 @@
        "supports-color": "2.0.0"
      }
    },
+    "chardet": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
+      "integrity": "sha1-tUc7M9yXxCTl2Y3IfVXU2KKci/I=",
+      "dev": true
+    },
    "chokidar": {
      "version": "1.7.0",
      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
@@ -2354,13 +2360,12 @@
      }
    },
    "doctrine": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz",
-      "integrity": "sha1-xz2NKQnSIpHhoAejlYBNqLZl/mM=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
      "dev": true,
      "requires": {
-        "esutils": "2.0.2",
-        "isarray": "1.0.0"
+        "esutils": "2.0.2"
      }
    },
    "dom-converter": {
@@ -2715,33 +2720,33 @@
      }
    },
    "eslint": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.8.0.tgz",
-      "integrity": "sha1-Ip7w41Tg5h2DfHqA/fuoJeGZgV4=",
+      "version": "4.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.17.0.tgz",
+      "integrity": "sha512-AyxBUCANU/o/xC0ijGMKavo5Ls3oK6xykiOITlMdjFjrKOsqLrA7Nf5cnrDgcKrHzBirclAZt63XO7YZlVUPwA==",
      "dev": true,
      "requires": {
-        "ajv": "5.2.3",
+        "ajv": "5.5.2",
        "babel-code-frame": "6.26.0",
-        "chalk": "2.1.0",
+        "chalk": "2.3.1",
        "concat-stream": "1.6.0",
        "cross-spawn": "5.1.0",
        "debug": "3.1.0",
-        "doctrine": "2.0.0",
+        "doctrine": "2.1.0",
        "eslint-scope": "3.7.1",
-        "espree": "3.5.1",
+        "eslint-visitor-keys": "1.0.0",
+        "espree": "3.5.3",
        "esquery": "1.0.0",
-        "estraverse": "4.2.0",
        "esutils": "2.0.2",
        "file-entry-cache": "2.0.0",
        "functional-red-black-tree": "1.0.1",
        "glob": "7.1.2",
-        "globals": "9.18.0",
-        "ignore": "3.3.5",
+        "globals": "11.3.0",
+        "ignore": "3.3.7",
        "imurmurhash": "0.1.4",
        "inquirer": "3.3.0",
-        "is-resolvable": "1.0.0",
+        "is-resolvable": "1.1.0",
        "js-yaml": "3.10.0",
-        "json-stable-stringify": "1.0.1",
+        "json-stable-stringify-without-jsonify": "1.0.1",
        "levn": "0.3.0",
        "lodash": "4.17.4",
        "minimatch": "3.0.4",
@@ -2759,6 +2764,18 @@
        "text-table": "0.2.0"
      },
      "dependencies": {
+        "ajv": {
+          "version": "5.5.2",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+          "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "fast-json-stable-stringify": "2.0.0",
+            "json-schema-traverse": "0.3.1"
+          }
+        },
        "ansi-regex": {
          "version": "3.0.0",
          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
@@ -2775,14 +2792,14 @@
          }
        },
        "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+          "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
          "dev": true,
          "requires": {
            "ansi-styles": "3.2.0",
            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "5.2.0"
          }
        },
        "debug": {
@@ -2808,10 +2825,16 @@
            "path-is-absolute": "1.0.1"
          }
        },
+        "globals": {
+          "version": "11.3.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-11.3.0.tgz",
+          "integrity": "sha512-kkpcKNlmQan9Z5ZmgqKH/SMbSmjxQ7QjyNqfXVc8VJcoBV2UEg+sxQD15GQofGRh2hfpwUb70VC31DR7Rq5Hdw==",
+          "dev": true
+        },
        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
          "dev": true
        },
        "js-yaml": {
@@ -2840,12 +2863,12 @@
          }
        },
        "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+          "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
          "dev": true,
          "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
          }
        }
      }
@@ -2860,6 +2883,12 @@
        "estraverse": "4.2.0"
      }
    },
+    "eslint-visitor-keys": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz",
+      "integrity": "sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==",
+      "dev": true
+    },
    "esmangle": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz",
@@ -2944,19 +2973,19 @@
      }
    },
    "espree": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.1.tgz",
-      "integrity": "sha1-DJiLirRttTEAoZVK5LqZXd0n2H4=",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.5.3.tgz",
+      "integrity": "sha512-Zy3tAJDORxQZLl2baguiRU1syPERAIg0L+JB2MWorORgTu/CplzvxS9WWA7Xh4+Q+eOQihNs/1o1Xep8cvCxWQ==",
      "dev": true,
      "requires": {
-        "acorn": "5.1.2",
+        "acorn": "5.4.1",
        "acorn-jsx": "3.0.1"
      },
      "dependencies": {
        "acorn": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
-          "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
+          "version": "5.4.1",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.4.1.tgz",
+          "integrity": "sha512-XLmq3H/BVvW6/GbxKryGxWORz1ebilSsUDlyC27bXhWGWAZWkGwS6FLHjOlwFXNFoWFQEO/Df4u0YYd0K3BQgQ==",
          "dev": true
        }
      }
@@ -3181,13 +3210,13 @@
      }
    },
    "external-editor": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.5.tgz",
-      "integrity": "sha512-Msjo64WT5W+NhOpQXh0nOHm+n0RfU1QUwDnKYvJ8dEJ8zlwLrqXNTv5mSUTJpepf41PDJGyhueTw2vNZW+Fr/w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.1.0.tgz",
+      "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==",
      "dev": true,
      "requires": {
+        "chardet": "0.4.2",
        "iconv-lite": "0.4.19",
-        "jschardet": "1.5.1",
        "tmp": "0.0.33"
      }
    },
@@ -3262,6 +3291,12 @@
      "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=",
      "dev": true
    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
    "fast-levenshtein": {
      "version": "2.0.6",
      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -4674,7 +4709,7 @@
      "dev": true,
      "requires": {
        "chalk": "2.1.0",
-        "eslint": "4.8.0"
+        "eslint": "4.17.0"
      },
      "dependencies": {
        "ansi-styles": {
@@ -5339,9 +5374,9 @@
      "dev": true
    },
    "ignore": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.5.tgz",
-      "integrity": "sha512-JLH93mL8amZQhh/p6mfQgVBH3M6epNq3DfsXsTSuSrInVjwyYlFE1nv2AgfRCC8PoOhM0jwQ5v8s9LgbK7yGDw==",
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz",
+      "integrity": "sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==",
      "dev": true
    },
    "image-size": {
@@ -5437,10 +5472,10 @@
      "dev": true,
      "requires": {
        "ansi-escapes": "3.0.0",
-        "chalk": "2.1.0",
+        "chalk": "2.3.1",
        "cli-cursor": "2.1.0",
        "cli-width": "2.2.0",
-        "external-editor": "2.0.5",
+        "external-editor": "2.1.0",
        "figures": "2.0.0",
        "lodash": "4.17.4",
        "mute-stream": "0.0.7",
@@ -5468,20 +5503,20 @@
          }
        },
        "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+          "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
          "dev": true,
          "requires": {
            "ansi-styles": "3.2.0",
            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "5.2.0"
          }
        },
        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
          "dev": true
        },
        "strip-ansi": {
@@ -5494,12 +5529,12 @@
          }
        },
        "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+          "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
          "dev": true,
          "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
          }
        }
      }
@@ -5800,13 +5835,10 @@
      }
    },
    "is-resolvable": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz",
-      "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=",
-      "dev": true,
-      "requires": {
-        "tryit": "1.0.3"
-      }
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
+      "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
+      "dev": true
    },
    "is-stream": {
      "version": "1.1.0",
@@ -5976,12 +6008,6 @@
      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
      "integrity": "sha1-sBMHyym2GKHtJux56RH4A8TaAEA="
    },
-    "jschardet": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.1.tgz",
-      "integrity": "sha512-vE2hT1D0HLZCLLclfBSfkfTTedhVj0fubHpJBHKwwUWX0nSbhPAfk+SG9rTX95BYNmau8rGFfCeaT6T5OW1C2A==",
-      "dev": true
-    },
    "jsdoc": {
      "version": "3.5.5",
      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
@@ -6094,6 +6120,12 @@
        "jsonify": "0.0.0"
      }
    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+      "dev": true
+    },
    "json-stringify-safe": {
      "version": "5.0.1",
      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -9534,6 +9566,16 @@
      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
      "dev": true
    },
+    "sitemap": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-1.13.0.tgz",
+      "integrity": "sha1-Vpy+IYAgKSamKiZs094Jyc60P4M=",
+      "dev": true,
+      "requires": {
+        "underscore": "1.7.0",
+        "url-join": "1.1.0"
+      }
+    },
    "sladex-blowfish": {
      "version": "0.8.1",
      "resolved": "https://registry.npmjs.org/sladex-blowfish/-/sladex-blowfish-0.8.1.tgz",
@@ -10157,7 +10199,7 @@
      "requires": {
        "ajv": "5.2.3",
        "ajv-keywords": "2.1.0",
-        "chalk": "2.1.0",
+        "chalk": "2.3.1",
        "lodash": "4.17.4",
        "slice-ansi": "1.0.0",
        "string-width": "2.1.1"
@@ -10173,29 +10215,29 @@
          }
        },
        "chalk": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-          "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz",
+          "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==",
          "dev": true,
          "requires": {
            "ansi-styles": "3.2.0",
            "escape-string-regexp": "1.0.5",
-            "supports-color": "4.4.0"
+            "supports-color": "5.2.0"
          }
        },
        "has-flag": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
-          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
          "dev": true
        },
        "supports-color": {
-          "version": "4.4.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-          "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+          "version": "5.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz",
+          "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==",
          "dev": true,
          "requires": {
-            "has-flag": "2.0.0"
+            "has-flag": "3.0.0"
          }
        }
      }
@@ -10429,12 +10471,6 @@
      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
      "dev": true
    },
-    "tryit": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz",
-      "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=",
-      "dev": true
-    },
    "tty-browserify": {
      "version": "0.0.0",
      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
@@ -10700,6 +10736,12 @@
        }
      }
    },
+    "url-join": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-1.1.0.tgz",
+      "integrity": "sha1-dBxsL0WWxIMNZxhGCSDQySIC3Hg=",
+      "dev": true
+    },
    "url-loader": {
      "version": "0.6.2",
      "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.6.2.tgz",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cyberchef",
-  "version": "7.6.3",
+  "version": "7.7.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",
@@ -34,6 +34,7 @@
    "babel-loader": "^7.1.2",
    "babel-preset-env": "^1.6.1",
    "css-loader": "^0.28.9",
+    "eslint": "^4.17.0",
    "exports-loader": "^0.6.4",
    "extract-text-webpack-plugin": "^3.0.2",
    "file-loader": "^1.1.6",
@@ -57,6 +58,7 @@
    "postcss-css-variables": "^0.8.0",
    "postcss-import": "^11.0.0",
    "postcss-loader": "^2.0.10",
+    "sitemap": "^1.13.0",
    "style-loader": "^0.19.1",
    "url-loader": "^0.6.2",
    "val-loader": "^1.1.0",
--- a/src/core/config/Categories.js
+++ b/src/core/config/Categories.js
@@ -326,6 +326,7 @@ const Categories = [
            "Remove EXIF",
            "Extract EXIF",
            "Numberwang",
+            "XKCD Random Number",
        ]
    },
    {
--- a/src/core/config/OperationConfig.js
+++ b/src/core/config/OperationConfig.js
@@ -3966,6 +3966,13 @@ const OperationConfig = {
                value: StrUtils.HAMMING_INPUT_TYPE
            }
        ]
+    },
+    "XKCD Random Number": {
+        module: "Default",
+        description: "RFC 1149.5 specifies 4 as the standard IEEE-vetted random number.<br><br><a href='https://xkcd.com/221/'>XKCD #221</a>",
+        inputType: "string",
+        outputType: "number",
+        args: []
    }
 };

--- a/src/core/config/modules/Default.js
+++ b/src/core/config/modules/Default.js
@@ -29,6 +29,8 @@ import StrUtils from "../../operations/StrUtils.js";
 import Tidy from "../../operations/Tidy.js";
 import Unicode from "../../operations/Unicode.js";
 import UUID from "../../operations/UUID.js";
+import XKCD from "../../operations/XKCD.js";
+

 /**
 * Default module.
@@ -90,7 +92,7 @@ OpModules.Default = {
    "Bit shift right":      BitwiseOp.runBitShiftRight,
    "XOR":                  BitwiseOp.runXor,
    "XOR Brute Force":      BitwiseOp.runXorBrute,
-    "OR":                   BitwiseOp.runXor,
+    "OR":                   BitwiseOp.runOr,
    "NOT":                  BitwiseOp.runNot,
    "AND":                  BitwiseOp.runAnd,
    "ADD":                  BitwiseOp.runAdd,
@@ -161,6 +163,7 @@ OpModules.Default = {
    "Standard Deviation":   Arithmetic.runStdDev,
    "Windows Filetime to UNIX Timestamp": Filetime.runFromFiletimeToUnix,
    "UNIX Timestamp to Windows Filetime": Filetime.runToFiletimeFromUnix,
+    "XKCD Random Number":  XKCD.runRandomNumber,


    /*
--- a/src/core/operations/Unicode.js
+++ b/src/core/operations/Unicode.js
@@ -27,7 +27,7 @@ const Unicode = {
     */
    runUnescape: function(input, args) {
        let prefix = Unicode._prefixToRegex[args[0]],
-            regex = new RegExp(prefix+"([a-f\\d]{4,6})", "ig"),
+            regex = new RegExp(prefix+"([a-f\\d]{4})", "ig"),
            output = "",
            m,
            i = 0;
--- a/src/core/operations/XKCD.js
+++ b/src/core/operations/XKCD.js
@@ -0,0 +1,26 @@
+/**
+ * XKCD operations.
+ *
+ * @author n1474335 [n1474335@gmail.com]
+ * @copyright Crown Copyright 2018
+ * @license Apache-2.0
+ *
+ * @namespace
+ */
+const XKCD = {
+
+    /**
+     * XKCD Random Number operation.
+     *
+     * @param {string} input
+     * @param {Object[]} args
+     * @returns {number}
+     */
+    runRandomNumber: function(input, args) {
+        return 4; // chosen by fair dice roll.
+                  // guaranteed to be random.
+    },
+
+};
+
+export default XKCD;
--- a/src/web/App.js
+++ b/src/web/App.js
@@ -377,6 +377,7 @@ App.prototype.loadURIParams = function() {
        window.location.href.split("#")[1] ||
        window.location.hash;
    this.uriParams = Utils.parseURIParams(params);
+    this.autoBakePause = true;

    // Read in recipe from URI params
    if (this.uriParams.recipe) {
@@ -387,35 +388,29 @@ App.prototype.loadURIParams = function() {
    } else if (this.uriParams.op) {
        // If there's no recipe, look for single operations
        this.manager.recipe.clearRecipe();
-        try {
-            this.manager.recipe.addOperation(this.uriParams.op);
-        } catch (err) {
-            // If no exact match, search for nearest match and add that
-            const matchedOps = this.manager.ops.filterOperations(this.uriParams.op, false);
-            if (matchedOps.length) {
-                this.manager.recipe.addOperation(matchedOps[0].name);
-            }

-            // Populate search with the string
-            const search = document.getElementById("search");
-
-            search.value = this.uriParams.op;
-            search.dispatchEvent(new Event("search"));
+        // Search for nearest match and add it
+        const matchedOps = this.manager.ops.filterOperations(this.uriParams.op, false);
+        if (matchedOps.length) {
+            this.manager.recipe.addOperation(matchedOps[0].name);
        }
+
+        // Populate search with the string
+        const search = document.getElementById("search");
+
+        search.value = this.uriParams.op;
+        search.dispatchEvent(new Event("search"));
    }

    // Read in input data from URI params
    if (this.uriParams.input) {
-        this.autoBakePause = true;
        try {
            const inputData = Utils.fromBase64(this.uriParams.input);
            this.setInput(inputData);
-        } catch (err) {
-        } finally {
-            this.autoBakePause = false;
-        }
+        } catch (err) {}
    }

+    this.autoBakePause = false;
    this.autoBake();
 };

--- a/src/web/HTMLOperation.js
+++ b/src/web/HTMLOperation.js
@@ -110,6 +110,15 @@ HTMLOperation.prototype.highlightSearchString = function(searchStr, namePos, des
    }

    if (this.description && descPos >= 0) {
+        // Find HTML tag offsets
+        const re = /<[^>]+>/g;
+        let match;
+        while ((match = re.exec(this.description))) {
+            // If the search string occurs within an HTML tag, return without highlighting it.
+            if (descPos >= match.index && descPos <= (match.index + match[0].length))
+                return;
+        }
+
        this.description = this.description.slice(0, descPos) + "<b><u>" +
            this.description.slice(descPos, descPos + searchStr.length) + "</u></b>" +
            this.description.slice(descPos + searchStr.length);
--- a/src/web/InputWaiter.js
+++ b/src/web/InputWaiter.js
@@ -1,4 +1,5 @@
 import LoaderWorker from "worker-loader?inline&fallback=false!./LoaderWorker.js";
+import Utils from "../core/Utils.js";


 /**
@@ -263,11 +264,28 @@ InputWaiter.prototype.handleLoaderMessage = function(e) {
    if (r.hasOwnProperty("fileBuffer")) {
        log.debug("Input file loaded");
        this.fileBuffer = r.fileBuffer;
+        this.displayFilePreview();
        window.dispatchEvent(this.manager.statechange);
    }
 };


+/**
+ * Shows a chunk of the file in the input behind the file overlay.
+ */
+InputWaiter.prototype.displayFilePreview = function() {
+    const inputText = document.getElementById("input-text"),
+        fileSlice = this.fileBuffer.slice(0, 4096);
+
+    inputText.style.overflow = "hidden";
+    inputText.classList.add("blur");
+    inputText.value = Utils.printable(Utils.arrayBufferToStr(fileSlice));
+    if (this.fileBuffer.byteLength > 4096) {
+        inputText.value += "[truncated]...";
+    }
+};
+
+
 /**
 * Handler for file close events.
 */
@@ -275,6 +293,9 @@ InputWaiter.prototype.closeFile = function() {
    if (this.loaderWorker) this.loaderWorker.terminate();
    this.fileBuffer = null;
    document.getElementById("input-file").style.display = "none";
+    const inputText = document.getElementById("input-text");
+    inputText.style.overflow = "auto";
+    inputText.classList.remove("blur");
 };


--- a/src/web/LoaderWorker.js
+++ b/src/web/LoaderWorker.js
@@ -47,7 +47,7 @@ self.loadFile = function(file) {
    };

    reader.onerror = function(e) {
-        self.postMessage({"error": file.error.message});
+        self.postMessage({"error": reader.error.message});
    };

    seek();
--- a/src/web/OutputWaiter.js
+++ b/src/web/OutputWaiter.js
@@ -128,6 +128,13 @@ OutputWaiter.prototype.setFile = function(buf) {

    fileOverlay.style.display = "block";
    fileSize.textContent = file.size.toLocaleString() + " bytes";
+
+    // Display preview slice in the background
+    const outputText = document.getElementById("output-text"),
+        fileSlice = this.dishBuffer.slice(0, 4096);
+
+    outputText.classList.add("blur");
+    outputText.value = Utils.printable(Utils.arrayBufferToStr(fileSlice));
 };


@@ -137,6 +144,7 @@ OutputWaiter.prototype.setFile = function(buf) {
 OutputWaiter.prototype.closeFile = function() {
    this.dishBuffer = null;
    document.getElementById("output-file").style.display = "none";
+    document.getElementById("output-text").classList.remove("blur");
 };


@@ -163,6 +171,7 @@ OutputWaiter.prototype.displayFileSlice = function() {
        sliceTo = parseInt(sliceToEl.value, 10),
        str = Utils.arrayBufferToStr(this.dishBuffer.slice(sliceFrom, sliceTo));

+    document.getElementById("output-text").classList.remove("blur");
    showFileOverlay.style.display = "block";
    this.set(str, "string", new Date().getTime() - startTime, true);
 };
@@ -177,6 +186,7 @@ OutputWaiter.prototype.showFileOverlayClick = function(e) {
    const outputFile = document.getElementById("output-file"),
        showFileOverlay = e.target;

+    document.getElementById("output-text").classList.add("blur");
    outputFile.style.display = "block";
    showFileOverlay.style.display = "none";
    this.setOutputInfo(this.dishBuffer.byteLength, null, 0);
--- a/src/web/html/index.html
+++ b/src/web/html/index.html
@@ -183,8 +183,9 @@
                        </div>
                        <div class="textarea-wrapper no-select">
                            <div id="input-highlighter" class="no-select"></div>
-                            <textarea id="input-text"></textarea>
+                            <textarea id="input-text" spellcheck="false"></textarea>
                            <div id="input-file">
+                                <div class="file-overlay"></div>
                                <div style="position: relative; height: 100%;">
                                    <div class="card">
                                        <img aria-hidden="true" src="<%- require('../static/images/file-128x128.png') %>" alt="File icon"/>
@@ -218,9 +219,10 @@
                        <div class="textarea-wrapper">
                            <div id="output-highlighter" class="no-select"></div>
                            <div id="output-html"></div>
-                            <textarea id="output-text" readonly="readonly"></textarea>
+                            <textarea id="output-text" readonly="readonly" spellcheck="false"></textarea>
                            <img id="show-file-overlay" aria-hidden="true" src="<%- require('../static/images/file-32x32.png') %>" alt="Show file overlay" title="Show file overlay"/>
                            <div id="output-file">
+                                <div class="file-overlay"></div>
                                <div style="position: relative; height: 100%;">
                                    <div class="card">
                                        <img aria-hidden="true" src="<%- require('../static/images/file-128x128.png') %>" alt="File icon"/>
@@ -233,7 +235,7 @@
                                                </span>
                                                <input type="number" class="form-control" id="output-file-slice-from" placeholder="From" value="0" step="1024" min="0">
                                                <div class="input-group-addon">to</div>
-                                                <input type="number" class="form-control" id="output-file-slice-to" placeholder="To" value="1024" step="1024" min="0">
+                                                <input type="number" class="form-control" id="output-file-slice-to" placeholder="To" value="2048" step="1024" min="0">
                                            </div>
                                        </div>
                                    </div>
--- a/src/web/static/robots.txt
+++ b/src/web/static/robots.txt
@@ -0,0 +1,4 @@
+user-agent: *
+disallow: /cyberchef.htm
+
+sitemap: https://gchq.github.io/CyberChef/sitemap.xml
--- a/src/web/static/sitemap.js
+++ b/src/web/static/sitemap.js
@@ -0,0 +1,33 @@
+import sm from "sitemap";
+import OperationConfig from "../../core/config/MetaConfig.js";
+
+
+/**
+ * Generates an XML sitemap for all CyberChef operations and a number of recipes.
+ *
+ * @author n1474335 [n1474335@gmail.com]
+ * @copyright Crown Copyright 2018
+ * @license Apache-2.0
+ */
+
+const sitemap = sm.createSitemap({
+    hostname: "https://gchq.github.io/CyberChef",
+});
+
+sitemap.add({
+    url: "/",
+    changefreq: "weekly",
+    priority: 1.0
+});
+
+for (let op in OperationConfig) {
+    sitemap.add({
+        url: `/op=${encodeURIComponent(op)}`,
+        changeFreq: "yearly",
+        priority: 0.5
+    });
+}
+
+const xml = sitemap.toString();
+
+console.log(xml); // eslint-disable-line no-console
--- a/src/web/stylesheets/layout/_io.css
+++ b/src/web/stylesheets/layout/_io.css
@@ -84,10 +84,17 @@
    top: 0;
    width: 100%;
    height: 100%;
-    background-color: var(--title-background-colour);
    display: none;
 }

+.file-overlay {
+    position: absolute;
+    opacity: 0.8;
+    background-color: var(--title-background-colour);
+    width: 100%;
+    height: 100%;
+}
+
 #show-file-overlay {
    position: absolute;
    right: 15px;
Author	SHA1	Message	Date
n1474335	d491e95d1c	7.7.4	2018-02-20 17:04:47 +00:00
n1474335	881523ce54	Merge branch 'sitemap'	2018-02-20 17:04:34 +00:00
n1474335	502a9fbb92	Added dynamically generated sitemap and robots.txt file to prevent crawling of inline version	2018-02-20 16:52:27 +00:00
n1474335	cc44fe6557	7.7.3	2018-02-16 13:33:41 +00:00
n1474335	5b1ac3de18	Reduced byte length in 'Unescape Unicode Characters'	2018-02-16 13:33:33 +00:00
n1474335	5a2a649d8e	7.7.2	2018-02-15 13:41:17 +00:00
n1474335	1aef193b40	Fixed file loading error message	2018-02-15 13:41:13 +00:00
n1474335	750fa45c04	7.7.1	2018-02-14 10:34:14 +00:00
n1474335	50f2819699	OR now calls the correct function instead of duplicating XOR. Closes #243 .	2018-02-14 10:34:08 +00:00
n1474335	ab55b91da1	7.7.0	2018-02-13 15:51:45 +00:00
n1474335	59f7774964	Merge branch 'feature-xkcd-rand'	2018-02-13 15:51:02 +00:00
n1474335	b5eb44af9f	When highlighting operation descriptions in search results, HTML tags are now ignored.	2018-02-13 15:43:55 +00:00
n1474335	8518fa67f2	Added 'XKCD Random Number' operation	2018-02-13 15:05:55 +00:00
n1474335	f6b68f9880	Increased file overlay slice to 4096 for larger screen support	2018-02-12 13:57:01 +00:00
n1474335	f6b2783f8b	File overlays now show a blurred representation of the file in the background.	2018-02-09 16:26:39 +00:00