E2E protocol

.flowconfig

@@ -15,7 +15,6 @@
 .*/frontend/assets/.*
 .*/frontend/controller/service-worker.js
 .*/frontend/utils/blockies.js
-.*/frontend/utils/crypto.js
 .*/frontend/utils/vuexQueue.js
 .*/frontend/model/contracts/misc/flowTyper.js
 .*/historical/.*

Gruntfile.js

@@ -1,5 +1,7 @@
 'use strict'
 
+if (process.env['CI']) process.exit(1)
+
 // =======================
 // Entry point.
 //
@@ -58,12 +60,15 @@ process.env.GI_VERSION = `${packageJSON.version}@${new Date().toISOString()}`
 // We will rather load it later, and only if necessary.
 // require('@babel/register')
 
+// TODO: Change defult value for ALLOW_INSECURE_UNENCRYPTED_MESSAGES_WHEN_EKEY_NOT_FOUND
+
 const {
   CI = '',
   LIGHTWEIGHT_CLIENT = 'true',
   GI_VERSION,
   NODE_ENV = 'development',
-  EXPOSE_SBP = ''
+  EXPOSE_SBP = '',
+  ALLOW_INSECURE_UNENCRYPTED_MESSAGES_WHEN_EKEY_NOT_FOUND = 'true'
 } = process.env
 
 const backendIndex = './backend/index.js'
@@ -196,7 +201,8 @@ module.exports = (grunt) => {
         'process.env.GI_VERSION': `'${GI_VERSION}'`,
         'process.env.LIGHTWEIGHT_CLIENT': `'${LIGHTWEIGHT_CLIENT}'`,
         'process.env.NODE_ENV': `'${NODE_ENV}'`,
-        'process.env.EXPOSE_SBP': `'${EXPOSE_SBP}'`
+        'process.env.EXPOSE_SBP': `'${EXPOSE_SBP}'`,
+        'process.env.ALLOW_INSECURE_UNENCRYPTED_MESSAGES_WHEN_EKEY_NOT_FOUND': `'${ALLOW_INSECURE_UNENCRYPTED_MESSAGES_WHEN_EKEY_NOT_FOUND}'`
       },
       external: ['crypto', '*.eot', '*.ttf', '*.woff', '*.woff2'],
       format: 'esm',

backend/database.js

@@ -52,7 +52,7 @@ sbp('sbp/selectors/register', {
           const json = `"${strToB64(entry.serialize())}"`
           if (currentHEAD !== hash) {
             this.push(prefix + json)
-            currentHEAD = entry.message().previousHEAD
+            currentHEAD = entry.head().previousHEAD
             prefix = ','
           } else {
             this.push(prefix + json + ']')
@@ -88,7 +88,7 @@ sbp('sbp/selectors/register', {
             this.push(prefix + json)
             prefix = ','
             limit--
-            currentHEAD = entry.message().previousHEAD
+            currentHEAD = entry.head().previousHEAD
           }
         } catch (e) {
           // TODO: properly return an error to caller, see https://nodejs.org/api/stream.html#errors-while-reading
@@ -123,7 +123,7 @@ sbp('sbp/selectors/register', {
             offset--
           }
 
-          currentHEAD = entry.message().previousHEAD
+          currentHEAD = entry.head().previousHEAD
           if (!currentHEAD || (isMet && !offset)) {
             this.push(']')
             this.push(null)

backend/routes.js

@@ -9,6 +9,7 @@ import { SERVER_INSTANCE } from './instance-keys.js'
 import path from 'path'
 import chalk from 'chalk'
 import './database.js'
+import { registrationKey, register, getChallenge, getContractSalt, updateContractSalt } from './zkppSalt.js'
 
 const Boom = require('@hapi/boom')
 const Joi = require('@hapi/joi')
@@ -255,3 +256,107 @@ route.GET(staticServeConfig.routePath, {}, {
 route.GET('/', {}, function (req, h) {
   return h.redirect(staticServeConfig.redirect)
 })
+
+route.POST('/zkpp/register/{contract}', {
+  validate: {
+    payload: Joi.alternatives([
+      {
+        // what b is
+        b: Joi.string().required()
+      },
+      {
+        r: Joi.string().required(), // what r is
+        s: Joi.string().required(), // what s is
+        sig: Joi.string().required(),
+        Eh: Joi.string().required()
+      }
+    ])
+  }
+}, async function (req, h) {
+  try {
+    if (req.payload['b']) {
+      const result = await registrationKey(req.params['contract'], req.payload['b'])
+
+      if (result) {
+        return result
+      }
+    } else {
+      const result = await register(req.params['contract'], req.payload['r'], req.payload['s'], req.payload['sig'], req.payload['Eh'])
+
+      if (result) {
+        return result
+      }
+    }
+  } catch (e) {
+    const ip = req.info.remoteAddress
+    console.error('Error at POST /zkpp/{contract}: ' + e.message, { ip })
+  }
+
+  return Boom.internal('internal error')
+})
+
+route.GET('/zkpp/{contract}/auth_hash', {
+  validate: {
+    query: Joi.object({ b: Joi.string().required() })
+  }
+}, async function (req, h) {
+  try {
+    const challenge = await getChallenge(req.params['contract'], req.query['b'])
+
+    return challenge || Boom.notFound()
+  } catch (e) {
+    const ip = req.info.remoteAddress
+    console.error('Error at GET /zkpp/{contract}/auth_hash: ' + e.message, { ip })
+  }
+
+  return Boom.internal('internal error')
+})
+
+route.GET('/zkpp/{contract}/contract_hash', {
+  validate: {
+    query: Joi.object({
+      r: Joi.string().required(),
+      s: Joi.string().required(),
+      sig: Joi.string().required(),
+      hc: Joi.string().required()
+    })
+  }
+}, async function (req, h) {
+  try {
+    const salt = await getContractSalt(req.params['contract'], req.query['r'], req.query['s'], req.query['sig'], req.query['hc'])
+
+    if (salt) {
+      return salt
+    }
+  } catch (e) {
+    const ip = req.info.remoteAddress
+    console.error('Error at GET /zkpp/{contract}/contract_hash: ' + e.message, { ip })
+  }
+
+  return Boom.internal('internal error')
+})
+
+route.POST('/zkpp/updatePasswordHash/{contract}', {
+  validate: {
+    payload: Joi.object({
+      r: Joi.string().required(),
+      s: Joi.string().required(),
+      sig: Joi.string().required(),
+      hc: Joi.string().required(),
+      Ea: Joi.string().required()
+    })
+  }
+}, async function (req, h) {
+  try {
+    const result = await updateContractSalt(req.params['contract'], req.payload['r'], req.payload['s'], req.payload['sig'], req.payload['hc'], req.payload['Ea'])
+
+    if (result) {
+      return result
+    }
+  } catch (e) {
+    const ip = req.info.remoteAddress
+    console.error('Error at POST /zkpp/updatePasswordHash/{contract}: ' + e.message, { ip })
+  }
+
+  return Boom.internal('internal error')
+})