WIP: Implemented RGPM Interface and other fixes

.dockerignore

@@ -0,0 +1 @@
+.gitignore

.travis.yml

@@ -3,8 +3,11 @@ language: minimal
 services:
   - docker
 
+install:
+  - make
+
 before_install:
-  - docker build . --tag rgpm
+  - make build
 
 script:
-  - docker run --rm rgpm
+  - make test

Dockerfile

@@ -1,5 +1,7 @@
 FROM node:12-slim
 
+RUN apt-get update && apt-get install -y wget gnupg2
+
 # Install chrome for puppeteer tests
 # From https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-in-docker
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
@@ -24,7 +26,7 @@ RUN yarn install
 
 COPY src /app/src/
 COPY test /app/test/
-
+RUN chown -R test:test ./
 USER test
 
 ENTRYPOINT ["yarn", "test"]

Makefile

@@ -15,7 +15,7 @@ clean:
 	rm -rf .build-tmp
 
 clean-docker:
-	docker rmim rgpm:core-test
+	docker rmi rgpm:core-test
 
 clean-all: clean clean-docker
 

package.json

@@ -1,25 +1,25 @@
 {
-  "name": "rgpmcore",
-  "version": "1.0.0",
+  "name": "@rgpm/core",
+  "version": "1.3.0",
   "main": "index.js",
   "repository": "[email protected]:rgpm/core.git",
   "author": "Kevin Schmittle <[email protected]>",
   "license": "LGPL-3.0-only",
   "devDependencies": {
-    "electron": "^4.1.3",
+    "electron": "^7.1.7",
     "express": "^4.17.1",
     "jest": "^24.9.0",
     "jest-cli": "^24.9.0",
-    "jest-puppeteer": "^4.3.0",
-    "puppeteer": "^1.19.0",
-    "webpack": "^4.39.3",
-    "webpack-dev-middleware": "^3.7.1"
+    "jest-puppeteer": "^4.4.0",
+    "puppeteer": "^2.0.0",
+    "webpack": "^4.41.5",
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-node-externals": "^1.7.2"
   },
   "scripts": {
     "serve": "node test/server.js",
     "test": "jest"
   },
-  "dependencies": {},
   "jest": {
     "projects": [
       {
@@ -33,5 +33,9 @@
         }
       }
     ]
+  },
+  "dependencies": {
+    "@rgpm/storage-integrations": "^0.1.2",
+    "uuid": "^3.3.3"
   }
 }

src/browserCrypto.js

@@ -22,20 +22,20 @@ class BrowserCrypto extends Crypto {
      * https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest and
      * adapted to not require the async keyword
      * @param {string} input UTF-8 encoded string
-     * @returns {Array} The result of the hash
+     * @returns {ArrayBuffer} The result of the hash
      */
     async digest(input) {
       const msgUint8 = new TextEncoder().encode(input);                                    // encode as (utf-8) Uint8Array
       return await crypto.subtle.digest('sha-512', msgUint8).then(function(hashBuffer) {   // hash the message
-        return Array.from(new Uint8Array(hashBuffer));                                     // convert buffer to byte array
+        return new Uint8Array(hashBuffer);
       });           
     }
 
     /**
      * Generate keyed hash (HMAC-SHA512)
      * @param {string} key The key to use
      * @param {string} message The message to hash
-     * @returns {Array} The result of the hash
+     * @returns {ArrayBuffer} The result of the hash
      */
     async hmac(key, message) {
       // Create the key (https://github.com/danharper/hmac-examples#javascript-es6)
@@ -49,9 +49,7 @@ class BrowserCrypto extends Crypto {
 
         // Sign the data with the key
         return crypto.subtle.sign({ "name": "HMAC" }, cryptoKey, messageBytes).then(async function(hmac) {
-
-          //Return in a format consistent with everything else
-          return Array.from(new Uint8Array(hmac));
+          return new Uint8Array(hmac);
         });
       });
     }

src/crypto.js

@@ -23,12 +23,15 @@ class Crypto {
         throw new NotImplementedError(`The method 'hmac' has not been implemented. This is more of an error of inproper subclassing.`);
     }
 
-    null_concat() {
-        throw new NotImplementedError("null_concat has not been implemented yet");
-    }
-
-    verify() { 
-        throw new NotImplementedError("verify has not been implemented yet");
+    /**
+     * The NULL-CONCAT(...) function returns a byte sequence created by
+     * concatenating its inputs with null bytes between, as done by Yee and
+     * Sitaker (2006). ~ Schmittle, 2018
+     * @param {Array} args A list of string arguments to concat together 
+     * @returns {Array} The result of the concat operation as a string
+     */
+    null_concat(... args) {
+        return args.join('\0');
     }
 
     /**
@@ -42,11 +45,11 @@ class Crypto {
     /**
      * Converts a buffer to the hex representation
      * https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/digest
-     * @param {Array} buffer 
+     * @param {Uint8Array} buffer 
      * @returns {String} The hex representation
      */
     toHex(buffer) {
-        return buffer.map(b => b.toString(16).padStart(2, '0')).join('');        // convert bytes to hex string
+        return Array.from(buffer).map(b => b.toString(16).padStart(2, '0')).join(''); // convert bytes to hex string
     }
 }
 

src/nodeCrypto.js

@@ -20,24 +20,36 @@ class NodeCrypto extends Crypto {
     /**
      * Generate the cryptographic hash (SHA512) of the input string
      * @param {string} input UTF-8 encoded string
-     * @returns {Array} The result of the hash
+     * @returns {ArrayBuffer} The result of the hash
      */
     async digest(input) {
       const hash = this.crypto.createHash("sha512");
       hash.update(input);
-      return Array.from(hash.digest());
+      return new Uint8Array(hash.digest());
     }
 
     /**
      * Generate keyed hash (HMAC-SHA512)
      * @param {string} key The key to use
      * @param {string} message The message to hash
-     * @returns {Array} The result of the hash
+     * @returns {ArrayBuffer} The result of the hash
      */
     async hmac(key, message) {
       const hmac = this.crypto.createHmac('sha512', key)
       hmac.update(message);
-      return Array.from(hmac.digest());
+      return new Uint8Array(hmac.digest());
+    }
+
+    /**
+     * Convert a buffer to an arraybuffer
+     * @param {Buffer} buf 
+     */
+    toArrayBuffer(buf) {
+      let ret = new ArrayBuffer(buf.length);
+      for(var i = 0; i < buf.length; i++) {
+        ret[i] = buf[i];
+      }
+      return ret;
     }
 
     /**