test encrypted responses

sevenbitbyte · sevenbitbyte · commit ee89096eb31c · 2020-06-21T16:46:22.000-07:00
diff --git a/public/app.js b/public/app.js
@@ -66,7 +66,7 @@ async function main(){
     callTime2.start()
 
     const echoReply2 = await party.comms.call('secure-echo', {t:(new Date()).getTime()}, {
-      expectClearTextReply: true,
+      expectClearTextReply: false,
       sendClearTextRequest: false,
       useSessions: false
     })
@@ -75,10 +75,11 @@ async function main(){
     complete++
 
     const text = `call deltaMs=<i>${callTime2.deltaMs}</i>ms complete ${complete}` 
-    document.getElementById("console").innerHTML = text    
+    document.getElementById("secure-echo-speed").innerHTML = text    
 
-  }, 150)
+  }, 250)
 
+  
   setInterval(async ()=>{
     //console.log('send')
 
@@ -97,9 +98,9 @@ async function main(){
     complete++
 
     const text = `call deltaMs=<i>${callTime2.deltaMs}</i>ms complete ${complete}` 
-    document.getElementById("console").innerHTML = text    
+    document.getElementById("echo-speed").innerHTML = text    
 
-  }, 75)
+  }, 100)
   
 }
 
diff --git a/public/crypto-test.html b/public/crypto-test.html
@@ -6,6 +6,12 @@
 
 
   <body>
-    <p id="console"></p>
+    <div>
+      <i>/echo</i> <p id="echo-speed"></p>
+    </div>
+    <br/>
+    <div>
+      <i>/secure-echo</i> <p id="secure-echo-speed"></p>
+    </div>
   </body>
 </html>
diff --git a/src/service/endpoints/secure-echo.js b/src/service/endpoints/secure-echo.js
@@ -23,7 +23,7 @@ module.exports = class SecureEchoEndpoint extends IEndpoint {
         validate: Joi.object().keys(null).description('any input allowed'),
       },
       post: {
-        encrypt: false,
+        encrypt: true,
         validate: Joi.object().keys(null).description('any output allowed')
       }
     }
diff --git a/src/service/middleware/post/encrypt.js b/src/service/middleware/post/encrypt.js
@@ -1,6 +1,6 @@
 const Joi = require('@hapi/joi')
 const Hoek = require('@hapi/hoek')
-const {Message, Routines} = require('@dataparty/crypto')
+const {Message, Identity} = require('@dataparty/crypto')
 const debug = require('debug')('dataparty.middleware.post.encrypt')
 
 const IMiddleware = require('../../imiddleware')
@@ -27,25 +27,20 @@ module.exports = class Encrypt extends IMiddleware {
     
   }
 
-  static async run(context){
+  static async run(ctx){
 
-    if (!Hoek.reach(context, 'endpoint.MiddlewareConfig.post.encrypt', false)){
-      return
-    }
+    if (!Config){ return }
   
 
-    const msg = new Message(context.input)
-    const jsonContent = await msg.decrpyt(this.serviceParty.privateIdentity)
-    const publicKeys = Routines.extractPublicKeys(msg.enc)
+    const senderStr = JSON.stringify({key: ctx.senderKey})
 
-    context.setInputSession(jsonContent.session)
+    const reply = new Message({msg: ctx.output})
+    const sender = Identity.fromString(senderStr)
+
+    const payload = await reply.encrypt(ctx.party.privateIdentity, sender.key)
+
+    ctx.debug('setting payload', payload)
+    ctx.setOutput(payload)
 
-    return {
-      input: Hoek.reach(content, 'data'),
-      sender: {
-        type: 'ecdsa',
-        public: publicKeys
-      }
-    }
   }
 }
diff --git a/src/service/service-runner.js b/src/service/service-runner.js
@@ -164,9 +164,10 @@ class ServiceRunner {
 
         await this.runMiddleware(middlewareCfg, context, 'post')
 
-        debug('result', result)
+        /*debug('ctx.log', context._debugContent)*/
+        debug('result', context.output)
 
-        context.res.send(result)
+        context.res.send(context.output)
 
       }
       catch(err){

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ module.exports = class SecureEchoEndpoint extends IEndpoint {`
`23`	`23`	`validate: Joi.object().keys(null).description('any input allowed'),`
`24`	`24`	`},`
`25`	`25`	`post: {`
`26`		`- encrypt: false,`
	`26`	`+ encrypt: true,`
`27`	`27`	`validate: Joi.object().keys(null).description('any output allowed')`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,10 @@ class ServiceRunner {`
`164`	`164`
`165`	`165`	`await this.runMiddleware(middlewareCfg, context, 'post')`
`166`	`166`
`167`		`- debug('result', result)`
	`167`	`+ /debug('ctx.log', context._debugContent)/`
	`168`	`+ debug('result', context.output)`
`168`	`169`
`169`		`- context.res.send(result)`
	`170`	`+ context.res.send(context.output)`
`170`	`171`
`171`	`172`	`}`
`172`	`173`	`catch(err){`