Merge branch 'master' into feature-async-ops

.gitignore

@@ -1,8 +1,6 @@
 node_modules
 npm-debug.log
-build/dev
-build/test
-build/node
+build
 docs/*
 !docs/*.conf.json
 !docs/*.ico

.travis.yml

@@ -0,0 +1,32 @@
+language: node_js
+node_js:
+  - node
+install: npm install
+before_script:
+  - npm install -g grunt
+script:
+  - grunt lint
+  - grunt test
+  - grunt docs
+  - grunt node
+  - grunt prod
+before_deploy:
+  - grunt copy:ghPages
+deploy:
+  - provider: pages
+    skip_cleanup: true
+    github_token: $GITHUB_TOKEN
+    local_dir: build/prod/
+    target_branch: gh-pages
+    on:
+      branch: master
+  - provider: releases
+    skip_cleaup: true
+    api_key:
+      secure: Lbya9e1a6bUeJLKsjuqRaNF/BNr7iqSjV0/9rhWbTCc5d1cd+A6DGnDqvw47S2x/+8b08XR5Umas5dS6KU4lLAZQ5DFJgKEuOqUDqz7fOfIZyaRKe8HBTrUn3c1zaqpbrIDQHAOwwEMSx3W+SXmFuniIHRkBFALfK/luyHb4u6e1vq9AsX59A6ICOl5fpGD8kHDtdFZtgCrrZ5tkX5wweiRUbro+LBNlfBCaXeuUwnigU0chAGx8wJWeSvHrndGoPPFEXc0MT4QPlI+q6R3AiO/mwS2/nLhEIGt4jrWUtyFQD9gFLZXg7Z6GC5pKqyf2EQXzgC8Kggybmbg5/MiWj1ns0d1XMK26r50bHD/9K7Kzlh5vq8Sum4DYWtuT4AsWgL/PfUEvB1FbF4InRJoIlbT3pWj9zNFKTyBNcvUchPk1uBE1Ldn5yPPZoSgdKO0ZiGjn/Qx0ByaDMGJbM5KMg3ALewJmaCiCbnvAaVvAm2UY6GrVK15JiGVn08GhliSzsx6E48ZcFtNJBwHK8MAimbTRyHR6aStJbEYIgoNiAjVv5m0twee/XknDvhULG2tor9chwhnqKb4kvaYPqbVuHNPyDT8VkLsHcpgeD2MKxGTq81NBgPz3rP3T1yWMxsuvhxoH91tIT8mU1jo8/e3BJYogKyRZXxwIHaF7ScDQZ4c=
+    file:
+      - build/prod/cyberchef.htm
+      - build/node/CyberChef.js
+    on:
+      repo: gchq/CyberChef
+      tags: true

Gruntfile.js

@@ -26,11 +26,7 @@ module.exports = function (grunt) {
 
     grunt.registerTask("prod",
         "Creates a production-ready build. Use the --msg flag to add a compile message.",
-        ["eslint", "test", "clean:prod", "clean:docs", "jsdoc", "webpack:webProd", "inline", "chmod"]);
-
-    grunt.registerTask("release",
-        "Prepares and deploys a production version of CyberChef to the gh-pages branch.",
-        ["copy:ghPages", "exec:deployGhPages"]);
+        ["eslint", "clean:prod", "webpack:webProd", "inline", "chmod"]);
 
     grunt.registerTask("default",
         "Lints the code base",
@@ -295,7 +291,7 @@ module.exports = function (grunt) {
                     process: function (content, srcpath) {
                         // Add Google Analytics code to index.html
                         content = content.replace("</body></html>",
-                            grunt.file.read("src/static/ga.html") + "</body></html>");
+                            grunt.file.read("src/web/static/ga.html") + "</body></html>");
                         return grunt.template.process(content);
                     }
                 },
@@ -328,16 +324,6 @@ module.exports = function (grunt) {
             cleanGit: {
                 command: "git gc --prune=now --aggressive"
             },
-            deployGhPages: {
-                command: [
-                    "git add build/prod/index.html -v",
-                    "COMMIT_HASH=$(git rev-parse HEAD)",
-                    "git commit -m \"GitHub Pages release for ${COMMIT_HASH}\"",
-                    "git push origin `git subtree split --prefix build/prod master`:gh-pages --force",
-                    "git reset HEAD~",
-                    "git checkout build/prod/index.html"
-                ].join(";")
-            }
         },
         execute: {
             test: "build/test/index.js"

README.md

@@ -13,7 +13,6 @@ CyberChef is still under active development. As a result, it shouldn't be consid
 Cryptographic operations in CyberChef should not be relied upon to provide security in any situation. No guarantee is offered for their correctness.
 
 [A live demo can be found here][1] - have fun!
-Note: Use Chrome or Firefox, see the Browser Support section below for details.
 
 
 ## How it works
@@ -63,11 +62,7 @@ You can use as many operations as you like in simple or complex ways. Some examp
 
 ## Browser support
 
-CyberChef works well in modern versions of Google Chrome and Mozilla Firefox.
-
-To aid in the efficient development of new features and operations, there has been no attempt to maintain support for any version of Microsoft Internet Explorer.
-
-Microsoft Edge is currently unsupported, but if anyone would like to contribute compatibility fixes, they would be appreciated.
+CyberChef is built to support Google Chrome 40+, Mozilla Firefox 35+ and Microsoft Edge 14+.
 
 
 ## Contributing

build/prod/.htaccess

@@ -1,50 +0,0 @@
-# Serve up .htm files as binary files rather than text/html.
-# This allows cyberchef.htm to be downloaded rather than opened in the browser.
-AddType application/octet-stream .htm
-
-# Fix Apache bug #45023 where "-gzip" is appended to all ETags, preventing 304 responses
-<IfModule mod_headers.c>
-    RequestHeader edit "If-None-Match" "^\"(.*)-gzip\"$" "\"$1\""
-    Header edit "ETag" "^\"(.*[^g][^z][^i][^p])\"$" "\"$1-gzip\""
-</IfModule>
-
-# Set gzip compression on all resources that support it
-<IfModule mod_deflate.c>
-    SetOutputFilter DEFLATE
-</IfModule>
-
-# Set Expires headers on various resources
-<IfModule mod_expires.c>
-    ExpiresActive On
-    
-    # 10 minutes
-    ExpiresDefault "access plus 600 seconds"
-    
-    # 30 days
-    ExpiresByType image/x-icon "access plus 2592000 seconds"
-    ExpiresByType image/jpeg "access plus 2592000 seconds"
-    ExpiresByType image/png "access plus 2592000 seconds"
-    ExpiresByType image/gif "access plus 2592000 seconds"
-    
-    # 7 days
-    ExpiresByType text/css "access plus 604800 seconds"
-    ExpiresByType text/javascript "access plus 604800 seconds"
-    ExpiresByType application/javascript "access plus 604800 seconds"
-    ExpiresByType text/html "access plus 604800 seconds"
-</IfModule>
-
-# Set Cache-Control headers on various resources
-<IfModule mod_headers.c>
-    <FilesMatch "\\.(ico|jpe?g|png|gif)$">
-        Header set Cache-Control "max-age=2592000, public"
-    </FilesMatch>
-    <FilesMatch "\\.(css)$">
-        Header set Cache-Control "max-age=600, public"
-    </FilesMatch>
-    <FilesMatch "\\.(js)$">
-        Header set Cache-Control "max-age=600, private, must-revalidate"
-    </FilesMatch>
-    <FilesMatch "\\.(x?html?)$">
-        Header set Cache-Control "max-age=600, private, must-revalidate"
-    </FilesMatch>
-</IfModule>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "description": "CyberChef is a simple, intuitive web app for analysing and decoding data within a web browser.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -76,5 +76,10 @@
     "xmldom": "^0.1.27",
     "xpath": "0.0.24",
     "zlibjs": "^0.2.0"
+  },
+  "scripts": {
+    "build": "grunt prod",
+    "test": "grunt test",
+    "docs": "grunt docs"
   }
 }

src/core/operations/URL.js

@@ -61,7 +61,7 @@ const URL_ = {
         if (!document) {
             throw "This operation only works in a browser.";
         }
-        
+
         var a = document.createElement("a");
 
         // Overwrite base href which will be the current CyberChef URL to reduce confusion.