remove keyPair fn

index.js

@@ -5,8 +5,6 @@ const os = require('os')
 const mkdirp = require('mkdirp')
 const crypto = require('cobox-crypto')
 const constants = require('cobox-constants')
-const { loadParentKey, saveParentKey } = require('./lib/keys')
-const sodium = require('sodium-native')
 
 const CONFIG_FILE = 'config.yml'
 
@@ -42,14 +40,6 @@ class CoBoxConfig {
       this.load()
     }
 
-    this.deriveKeyPair = (id, context) => {
-      var parentKey = loadParentKey(this.root) || crypto.masterKey()
-      saveParentKey(this.root, parentKey)
-      var keyPair = crypto.keyPair(parentKey, id, context)
-      sodium.sodium_memzero(parentKey)
-      return keyPair
-    }
-
     this.groups = KeyHandler(this._groups)
     this.replicators = KeyHandler(this._replicators)
     this.devices = KeyHandler(this._devices)

lib/keys.js

@@ -1,27 +0,0 @@
-const mkdirp = require('mkdirp')
-const fs = require('fs')
-const path = require('path')
-const assert = require('assert')
-
-function saveParentKey (storage, encryptionKey) {
-  var keyPath = path.join(storage, 'parent_key')
-  if (!fs.existsSync(keyPath)) {
-    mkdirp.sync(path.dirname(keyPath))
-    fs.writeFileSync(keyPath, encryptionKey, {
-      mode: fs.constants.S_IRUSR
-    })
-  }
-
-  assert(fs.existsSync(keyPath), 'failed to store parent_key')
-}
-
-function loadParentKey (storage) {
-  try { return fs.readFileSync(path.join(storage, 'parent_key')) }
-  catch (err) { return }
-}
-
-module.exports = {
-  loadParentKey,
-  saveParentKey
-}
-

package.json

@@ -16,7 +16,6 @@
     "pino": "^5.13.2",
     "proxyquire": "^2.1.3",
     "sinon": "^8.1.1",
-    "sodium-native": "^2.4.9",
     "urlsafe-base64": "^1.0.0"
   },
   "devDependencies": {

test/index.test.js

@@ -21,55 +21,55 @@ describe('load', (context) => {
   })
 })
 
-describe('parent_key', (context) => {
-  context('constructor() - generates and saves new parent_key', (assert, next) => {
-    var storage = tmp()
-    var spy = sinon.spy(crypto)
-    var saveStub = sinon.stub().returns(true)
+// describe('parent_key', (context) => {
+//   context('constructor() - generates and saves new parent_key', (assert, next) => {
+//     var storage = tmp()
+//     var spy = sinon.spy(crypto)
+//     var saveStub = sinon.stub().returns(true)
 
-    var ProxyConfig = proxyquire('../', {
-      'cobox-crypto': spy,
-      './lib/keys': { saveParentKey: saveStub }
-    })
+//     var ProxyConfig = proxyquire('../', {
+//       'cobox-crypto': spy,
+//       './lib/keys': { saveParentKey: saveStub }
+//     })
 
-    var config = ProxyConfig(storage)
+//     var config = ProxyConfig(storage)
 
-    assert.ok(config, 'config created')
+//     assert.ok(config, 'config created')
 
-    config.deriveKeyPair(1, 'hello')
+//     config.deriveKeyPair(1, 'hello')
 
-    assert.ok(spy.masterKey.calledOnce, 'calls crypto.masterKey()')
-    assert.ok(saveStub.calledOnce, 'saves parent key')
+//     assert.ok(spy.masterKey.calledOnce, 'calls crypto.masterKey()')
+//     assert.ok(saveStub.calledOnce, 'saves parent key')
 
-    cleanup(storage, next)
-  })
+//     cleanup(storage, next)
+//   })
 
-  context('constructor() - loads parent_key from path', (assert, next) => {
-    var storage = tmp()
-    var address = crypto.address()
-    var parentKey = crypto.masterKey()
+//   context('constructor() - loads parent_key from path', (assert, next) => {
+//     var storage = tmp()
+//     var address = crypto.address()
+//     var parentKey = crypto.masterKey()
 
-    var keyPath = path.join(storage, 'parent_key')
-    mkdirp.sync(path.dirname(keyPath))
-    fs.writeFileSync(keyPath, parentKey, { mode: fs.constants.S_IRUSR })
+//     var keyPath = path.join(storage, 'parent_key')
+//     mkdirp.sync(path.dirname(keyPath))
+//     fs.writeFileSync(keyPath, parentKey, { mode: fs.constants.S_IRUSR })
 
-    var loadStub = sinon.stub().returns(parentKey)
-    var saveStub = sinon.stub().returns(true)
+//     var loadStub = sinon.stub().returns(parentKey)
+//     var saveStub = sinon.stub().returns(true)
 
-    var ProxyConfig = proxyquire('../', { './lib/keys': {
-      loadParentKey: loadStub,
-      saveParentKey: saveStub
-    }
-    })
+//     var ProxyConfig = proxyquire('../', { './lib/keys': {
+//       loadParentKey: loadStub,
+//       saveParentKey: saveStub
+//     }
+//     })
 
-    var config = ProxyConfig(storage, address)
-    config.deriveKeyPair(1, 'hello')
+//     var config = ProxyConfig(storage, address)
+//     config.deriveKeyPair(1, 'hello')
 
-    assert.ok(loadStub.calledWith(storage), 'key is loaded')
-    assert.ok(saveStub.calledWith(storage, parentKey), 'key is saved')
-    cleanup(storage, next)
-  })
-})
+//     assert.ok(loadStub.calledWith(storage), 'key is loaded')
+//     assert.ok(saveStub.calledWith(storage, parentKey), 'key is saved')
+//     cleanup(storage, next)
+//   })
+// })
 
 describe('options', (context) => {
   context('reload', (assert, next) => {

yarn.lock

@@ -1492,15 +1492,6 @@ sodium-native@^2.0.0, sodium-native@^2.4.2:
     nan "^2.14.0"
     node-gyp-build "^4.1.0"
 
-sodium-native@^2.4.9:
-  version "2.4.9"
-  resolved "https://registry.yarnpkg.com/sodium-native/-/sodium-native-2.4.9.tgz#7a7beb997efdbd2c773a385fb959f0cead5f5162"
-  integrity sha512-mbkiyA2clyfwAyOFIzMvsV6ny2KrKEIhFVASJxWfsmgfUEymgLIS2MLHHcGIQMkrcKhPErRaMR5Dzv0EEn+BWg==
-  dependencies:
-    ini "^1.3.5"
-    nan "^2.14.0"
-    node-gyp-build "^4.1.0"
-
 sodium-universal@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sodium-universal/-/sodium-universal-2.0.0.tgz#cfb4e1a9c4afece4382b2c23c53439b443bd2af3"