9.21.5

Gonna monch this commit once i know it works

.github/workflows/main.yml

@@ -0,0 +1,59 @@
+name: Test & Deploy
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set node version
+      uses: actions/setup-node@v1
+      with:
+        node-version: '10.x'
+
+    - name: Install
+      run: |
+        npm install
+        export NODE_OPTIONS=--max_old_space_size=2048
+
+    - name: Lint
+      run: npx grunt lint
+
+    - name: Unit Tests
+      run: |
+        npm test
+        npx grunt testnodeconsumer
+
+    - name: Production Build
+      run: npx grunt prod
+
+    - name: Generate sitemap
+      run: npx grunt exec:sitemap
+
+    - name: UI Tests
+      run: xvfb-run --server-args="-screen 0 1200x800x24" npx grunt testui
+
+    - name: Prepare for GitHub Pages
+      run: npx grunt copy:ghPages
+
+    - name: Deploy to GitHub Pages
+      if: success() && github.ref == 'refs/heads/master'
+      uses: crazy-max/ghaction-github-pages@v2
+      with:
+        target_branch: gh-pages
+        build_dir: ./build/prod
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    #- name: Deploy to NPM
+    #    run: |
+    #      npm config set //registry.npmjs.org/:_authToken=$NPM_TOKEN
+    #      npm publish || true
+    #    env:
+    # Add NPM publish token to the repo secrets
+    #      NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} 

Gruntfile.js

@@ -242,10 +242,6 @@ module.exports = function (grunt) {
                     entry: Object.assign({
                         main: "./src/web/index.js"
                     }, moduleEntryPoints),
-                    output: {
-                        publicPath: "",
-                        globalObject: "this"
-                    },
                     resolve: {
                         alias: {
                             "./config/modules/OpModules.mjs": "./config/modules/Default.mjs"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.21.3",
+  "version": "9.21.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.21.3",
+  "version": "9.21.5",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -172,7 +172,7 @@
     "testui": "grunt testui",
     "testuidev": "npx nightwatch --env=dev",
     "lint": "grunt lint",
-    "postinstall": "find ./node_modules/crypto-api/src/ \\( -type d -name .git -prune \\) -o -type f -print0 | xargs -0 sed -i '' -e '/\\.mjs/!s/\\(from \"\\.[^\"]*\\)\";/\\1.mjs\";/g'",
+    "postinstall": "bash postinstall.sh",
     "newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs"
   }
 }

postinstall.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Add file extensions to Crypto-Api imports
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  find ./node_modules/crypto-api/src/ \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i '' -e '/\.mjs/!s/\(from "\.[^"]*\)";/\1.mjs";/g'
+else
+  find ./node_modules/crypto-api/src/ \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i -e '/\.mjs/!s/\(from "\.[^"]*\)";/\1.mjs";/g'
+fi

src/core/operations/GeneratePGPKeyPair.mjs

@@ -33,7 +33,7 @@ class GeneratePGPKeyPair extends Operation {
             {
                 "name": "Key type",
                 "type": "option",
-                "value": ["RSA-1024", "RSA-2048", "RSA-4096", "ECC-256", "ECC-384"]
+                "value": ["RSA-1024", "RSA-2048", "RSA-4096", "ECC-256", "ECC-384", "ECC-521"]
             },
             {
                 "name": "Password (optional)",
@@ -59,12 +59,15 @@ class GeneratePGPKeyPair extends Operation {
      * @returns {string}
      */
     async run(input, args) {
-        const [keyType, keySize] = args[0].split("-"),
-            password = args[1],
+        let [keyType, keySize] = args[0].split("-");
+        const password = args[1],
             name = args[2],
             email = args[3];
         let userIdentifier = "";
 
+        keyType = keyType.toLowerCase();
+        keySize = parseInt(keySize, 10);
+
         if (name) userIdentifier += name;
         if (email) userIdentifier += ` <${email}>`;
 

src/core/operations/HaversineDistance.mjs

@@ -41,8 +41,8 @@ class HaversineDistance extends Operation {
 
         const lat1 = parseFloat(values[1]);
         const lng1 = parseFloat(values[3]);
-        const lat2 = parseFloat(values[6]);
-        const lng2 = parseFloat(values[8]);
+        const lat2 = parseFloat(values[5]);
+        const lng2 = parseFloat(values[7]);
 
         const TO_RAD = Math.PI / 180;
         const dLat = (lat2-lat1) * TO_RAD;

tests/browser/ops.js

@@ -392,11 +392,22 @@ function testOp(browser, opName, input, output, args=[]) {
         .useCss()
         .click("#clr-recipe")
         .click("#clr-io")
+        .waitForElementNotPresent("#rec-list li.operation")
+        .expect.element("#input-text").to.have.value.that.equals("");
+
+    browser
         .urlHash("recipe=" + recipeConfig)
         .setValue("#input-text", input)
+        .waitForElementPresent("#rec-list li.operation")
+        .expect.element("#input-text").to.have.value.that.equals(input);
+
+    browser
+        .waitForElementVisible("#stale-indicator", 5000)
         .pause(100)
         .click("#bake")
-        .waitForElementPresent("#stale-indicator.hidden", 1000);
+        .pause(100)
+        .waitForElementPresent("#stale-indicator.hidden", 5000)
+        .waitForElementNotVisible("#output-loader", 5000);
 
     if (typeof output === "string") {
         browser.expect.element("#output-text").to.have.value.that.equals(output);

tests/node/tests/operations.mjs

@@ -588,7 +588,7 @@ Password: 034148`;
         const result = await chef.generatePGPKeyPair("Back To the Drawing Board", {
             keyType: "ECC-256",
         });
-        assert.strictEqual(result.toString().length, 2007);
+        assert.strictEqual(result.toString().length, 2560);
     }),
 
     it("Generate UUID", () => {

tests/operations/tests/HaversineDistance.mjs

@@ -11,7 +11,18 @@ TestRegister.addTests([
     {
         name: "Haversine distance",
         input: "51.487263,-0.124323, 38.9517,-77.1467",
-        expectedOutput: "5619355.701829259",
+        expectedOutput: "5902542.836307819",
+        recipeConfig: [
+            {
+                "op": "Haversine distance",
+                "args": []
+            }
+        ],
+    },
+    {
+        name: "Haversine distance, zero distance",
+        input: "51.487263,-0.124323, 51.487263,-0.124323",
+        expectedOutput: "0",
         recipeConfig: [
             {
                 "op": "Haversine distance",

webpack.config.js

@@ -34,6 +34,10 @@ const banner = `/**
 
 
 module.exports = {
+    output: {
+        publicPath: "",
+        globalObject: "this"
+    },
     plugins: [
         new webpack.ProvidePlugin({
             $: "jquery",