update crypto version

Author: sevenbitbyte

examples/secure-config.js

@@ -0,0 +1,104 @@
+
+const Dataparty = require('../src/index')
+
+const prompt = require('prompt')
+
+
+async function main(){
+    //const memoryConfig = new Dataparty.Config.MemoryConfig({foo: 'bar'})
+
+
+    const jsonConfig = new Dataparty.Config.JsonFileConfig({
+        foo: 'bar',
+        basePath: '/tmp'
+    })
+
+
+    const secureConfig = new Dataparty.Config.SecureConfig({
+        config: jsonConfig
+    })
+
+    
+    secureConfig.on('locked', ()=>{ console.log('locked') })
+
+    secureConfig.on('unlocked', ()=>{ console.log('unlocked') })
+
+    secureConfig.on('timeout', ()=>{ console.log('timeout') })
+
+    secureConfig.on('ready', ()=>{ console.log('ready') })
+
+    secureConfig.on('blocked', async (reason)=>{
+
+        if(await secureConfig.isInitialized() && secureConfig.isLocked()){
+
+            
+
+            console.log('blocked -',reason)
+
+            const {password} = await prompt.get({
+                properties: {
+                    password: {
+                        message: 'Enter password',
+                        hidden: true
+                }
+            }})
+
+            secureConfig.unlock(password)
+        }
+        
+    
+    })
+
+    secureConfig.on('setup-required', async ()=>{
+        
+        console.log('setup-required')
+
+        let password = ''
+
+        while(1){
+            let passes = await prompt.get({
+                properties: {
+                    password1: {
+                        message: 'Set password',
+                        hidden: true
+                    },
+                    password2: {
+                        message: 'Confim password',
+                        hidden: true
+                    }
+                }
+            })
+
+            if(passes.password1 == passes.password2){
+
+                password = passes.password1
+                break
+            }
+
+            console.log("passwords don't match")
+        }
+
+        secureConfig.setPassword(password)
+
+    })
+
+    await secureConfig.start()
+
+    await secureConfig.waitForUnlocked('startup')
+
+    console.log('wait over')
+
+    //process.exit()
+}
+
+main().catch((err)=>{
+    console.error('crashed', err)  
+}).then(()=>{
+    console.log('done')
+})
+
+
+/*
+setTimeout(function () {
+    process.exit();
+}, 5000);*/

package.json

@@ -59,7 +59,7 @@
   },
   "dependencies": {
     "@dataparty/bouncer-db": "1.0.1",
-    "@dataparty/crypto": "^1.1.0",
+    "@dataparty/crypto": "^1.1.1",
     "@dataparty/tasker": "^0.0.2",
     "@diva.exchange/i2p-sam": "^4.1.8",
     "@markwylde/liferaft": "^1.3.4",
@@ -96,7 +96,6 @@
     "origin-router": "^1.6.4",
     "parse-url": "^5.0.1",
     "promisfy": "^1.2.0",
-    "prompt": "^1.0.0",
     "roslib": "^1.3.0",
     "sanitize-filename": "^1.6.3",
     "simple-peer": "9.7.2",
@@ -129,6 +128,7 @@
     "parcel": "^2.3.1",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
+    "prompt": "^1.3.0",
     "punycode": "^1.4.1",
     "querystring-es3": "^0.2.1",
     "stream-browserify": "^3.0.0",

src/config/iconfig.js

@@ -5,13 +5,13 @@ const EventEmitter = require('eventemitter3')
  * @link module.Config
  */
 class IConfig extends EventEmitter {
-    constructor(){}
+    constructor(){super()}
     async start(){ throw 'not implemented' }
     async clear(){ throw 'not implemented' }
-    readAll(){ throw 'not implemented' }
-    read(key){ throw 'not implemented' }
+    async readAll(){ throw 'not implemented' }
+    async read(key){ throw 'not implemented' }
     async write(key, data){ throw 'not implemented' }
-    exists(key){ throw 'not implemented' }
+    async exists(key){ throw 'not implemented' }
     async save(){ throw 'not implemented' }
 }
 

src/config/secure-config.js

@@ -14,15 +14,16 @@ class SecureConfig extends IConfig {
         id = 'secure-config',
         config, timeoutMs=60*10*1000, includeActivity=true
     }){
-        this.id = id
+        super()
+        this.id = id || 'secure-config'
         this.config = config
 
         this.content = null
         this.identity = null
         this.timer = null
         this.lastActivity = null
-        this.timeoutMs = timeoutMs
-        this.includeActivity = includeActivity
+        this.timeoutMs = timeoutMs || 60*10*1000
+        this.includeActivity = includeActivity || true
     }
 
     async start(){
@@ -37,10 +38,11 @@ class SecureConfig extends IConfig {
     }
 
     async isInitialized(){
-        let salt = this.config.read('salt')
-        let rounds = this.config.read('rounds')
+        let salt = await this.config.read('salt')
+        let rounds = await this.config.read('rounds')
 
-        return (salt.length == 32 && rounds > 100000)
+
+        return (salt != undefined && salt.length > 16 && rounds > 100000)
     }
 
     isLocked(){
@@ -65,34 +67,48 @@ class SecureConfig extends IConfig {
 
         await initialContent.encrypt(pwIdentity, pwIdentity.toMini())
 
-        await this.config.write('salt', salt)
+        await this.config.write('salt', salt.toString('hex'))
         await this.config.write('rounds', rounds)
         //await this.config.write('identity', pwIdentity.toJSON())
-        await this.config.write('content',{
-            enc: initialContent.enc,
-            sig: initialContent.sig
-        })
+        await this.config.write('content', initialContent.toJSON())
 
-        debug('\t', 'identity', pwIdentity.toJSON)
+        debug('\t', 'identity', pwIdentity)
+
+        debug('\t', 'content', initialContent.toJSON())
 
         await this.config.save()
 
         this.emit('ready')
+
+        const contentMsg = new dataparty_crypto.Message( initialContent )
+
+        console.log('msg', contentMsg)
+
+        //! Verify message
+        await contentMsg.decrypt(pwIdentity)
     }
 
     async waitForUnlocked(reason){
 
+        
         if(!this.isLocked()){
             return
         }
+        
+        debug('waitForUnlocked', reason)
 
         this.emit('blocked', reason)
 
-        return new Promise((resolve,reject)=>{
+        let waiting = new Promise((resolve,reject)=>{
 
-            this.once('unlocked', resolve)
+            this.once('unlocked', ()=>{
+                resolve()
+                debug('waitForUnlocked - done')
+            })
 
         })
+
+        await waiting
     }
 
     async unlock(password){
@@ -102,21 +118,32 @@ class SecureConfig extends IConfig {
             this.timer = null
         }
 
-        let salt = this.config.read('salt')
-        let rounds = this.config.read('rounds')
+        let salt = Buffer.from(await this.config.read('salt'),'hex')
+        let rounds = await this.config.read('rounds')
+
+        console.log('salt', salt)
+        console.log('rounds', rounds)
 
         let key = await dataparty_crypto.Routines.createKeyFromPassword(password, salt, rounds)
 
         const pwIdentity = new dataparty_crypto.Identity({
             key,
-            id: this.id,
+            id: this.id
         })
 
-        const contentMsg = new dataparty_crypto.Message( this.config.read('content') )
+        console.log(pwIdentity)
+
+        this.content = await this.config.read('content')
 
+        console.log('content', this.content, typeof this.content)
+
+        const contentMsg = new dataparty_crypto.Message( this.content )
+
+        console.log('msg', contentMsg)
+
+        //! Verify message
         await contentMsg.decrypt(pwIdentity)
 
-        this.content = this.config.read('content')
         this.identity = pwIdentity
 
         this.timer = setTimeout(this.onTimeout.bind(this), this.timeoutMs)
@@ -236,4 +263,6 @@ class SecureConfig extends IConfig {
             sig: this.content.sig
         })
     }
-}
+}
+
+module.exports = SecureConfig

src/index-browser.js

@@ -4,10 +4,12 @@ const Topics = require('./topics')
 
 const MemoryConfig = require('./config/memory')
 const LocalStorageConfig = require('./config/local-storage')
+const SecureConfig = require('./config/secure-config')
 
 const Config = {
   MemoryConfig,
-  LocalStorageConfig
+  LocalStorageConfig,
+  SecureConfig
 }