@indra.ai/deva.security 0.0.62 → 0.0.64

package/feature/methods.js

@@ -21,23 +21,42 @@ export default {
   describe: Return a system id to the user from the Log Buddy.
   ***************/
   uid(packet) {
+    this.feature('security', `uid:${packet.id.uid}`);
+    this.zone('security', `uid:${packet.id.uid}`);
+
     const uid = packet.q.text ? true : false
-    this.feature('security');
     const id = this.lib.uid(uid);
-    const {key} = this.agent();
+
+    const {client} = packet.q;
+    
+    const agent = this.agent();
+    const {key} = agent;
+
+    console.log('client sha uid\n', client.sha256, '\n', id.client);
+    console.log('agent sha uid\n', agent.sha256, '\n', id.agent);
     
-    const data = [
-      '',
+    console.log('agent uid', agent);
+    const text = [
+      '→',
       `::begin:uid:${key}:${id.uid}`,
       `uid: ${id.uid}`,
-      `time: ${id.created}`,
-      `date: ${this.lib.formatDate(id.created, 'short', true)}`,
+      `time: ${id.time}`,
+      `date: ${id.date}`,
+      `agent: ${id.agent}`,
+      `client: ${id.client}`,
+      `pkg: ${id.pkg}`,
+      `machine: ${id.machine}`,
+      `warning: ${id.warning}`,
       `md5: ${id.md5}`,
       `sha256: ${id.sha256}`,
       `sha512: ${id.sha512}`,
       `::end:uid:${key}:${id.uid}`,
     ].join('\n');
-    return Promise.resolve(data);
+    return Promise.resolve({
+      text,
+      html: false,
+      data: id,
+    });
   },
 
   /**************
@@ -111,130 +130,22 @@ export default {
   },
   
 
-  async sign(key, type, packet) {
-    this.state('set', `${key}:sign:${type}:${packet.id.uid}`);
-    const transport = packet.id; // set the transport id from the packet id.
-  
-    this.zone(key, `${key}:sign:${type}:${transport.uid}`); // set the zone
-    this.feature(key, `${key}:sign:${type}:${transport.uid}`); // set the feature
-    this.context(key, `${key}:sign:${type}:${transport.uid}`); // set the agent context to proxy.
-    this.action('method', `${key}:sign:${type}:${transport.uid}`); // set the action method to proxy.
-    
-    this.state('set', `${key}:sign:${type}:uid:${transport.uid}`); //set the uid state
-    const id = this.lib.uid(true); // The UID
-    
-    this.state('set', `${key}:sign:${type}:time:${transport.uid}`); //set the time state
-    const time = Date.now(); // current timestamp
-    
-    this.state('created', `${key}:sign:${type}:created:${transport.uid}`); //set the created state
-    const created = this.lib.formatDate(time, 'long', true); // Formatted created date.
-    
-    this.state('set', `${key}:sign:${type}:concerns:${transport.uid}`); //set the concerns
-    const {concerns} = this[key](); // load the Guard profile
-    
-    this.state('set', `${key}:sign:${type}:agent:${transport.uid}`); //set the agent state
-    const agent = this.agent(); // the agent processing the proxy
-  
-    this.state('set', `${key}:sign:${type}:client:${transport.uid}`); //set the client state
-    const client = this.client(); // the client requesting the proxy
-  
-    this.state('set', `${key}:sign:${type}:expires:${transport.uid}`); //set the time state
-    const expires = time + (client.expires || agent.expires || 10000); // signature expires in milliseconds
-    
-    this.state('set', `${key}:sign:${type}:meta:${transport.uid}`); //set the meta state
-    const {meta} = packet.q; // set the meta information from the packet question.
-    
-    this.state('set', `${key}:sign:${type}:params:${transport.uid}`); //set the meta state
-    const {params} = meta; // set params from the meta information.
-    
-    this.state('set', `${key}:sign:${type}:opts:${transport.uid}`); //set the opts state
-    const opts = this.lib.copy(params); // copy the params and set as opts.
-    
-    this.state('set', `${key}:sign:${type}:command:${transport.uid}`); //set the opts state
-    const command = opts.shift(); // extract the command first array item out of opts.
-    
-    this.state('set', `${key}:sign:${type}:message:${transport.uid}`); //set the message state
-    const message = packet.q.text; // set packet.q.text as the message of the proxy.
-    
-    this.state('set', `${key}:sign:${type}:container:${transport.uid}`); //set the message state
-    const container = `OM:${key.toUpperCase()}:${transport.uid}`; // set container string.
-  
-    this.state('set', `${key}:sign:${type}:write:${transport.uid}`); //set the message state
-    const write = client.profile.write; // set write string.
-    
-    // hash the agent profile for security
-    this.state('hash', `${key}:sign:${type}:packet:sha256:${transport.uid}`);
-    const packet_hash = this.lib.hash(packet, 'sha256');
-  
-    // hash the agent profile for security
-    this.state('hash', `${key}:sign:${type}:agent:sha256:${transport.uid}`);
-    const agent_hash = this.lib.hash(agent, 'sha256');
-    
-    // hash the agent profile for security
-    this.state('hash', `${key}:sign:${type}:client:sha256:${transport.uid}`);
-    const client_hash = this.lib.hash(client, 'sha256');
-  
-    // hash the agent profile for security
-    this.state('hash', `${key}:sign:${type}:laws:sha256:${transport.uid}`);
-    const laws_hash = this.lib.hash(agent.laws || client.laws, 'sha256');
-    
-    // hash the agent profile for security
-    this.state('hash', `${key}:sign:${type}:token:${transport.uid}`);
-    const token = this.lib.hash(`${key} client:${client.profile.id} fullname:${client.profile.fullname} transport:${transport.uid}`, 'sha256');
-  
-    
-    this.state('set', `${key}:sign:${type}:write:${transport.uid}`); // set the state to set data 
-    // data packet
-    const data = {
-      id,
-      transport,
-      time,
-      expires,
-      container,
-      write,
-      message,
-      caseid: client.profile.caseid,
-      opts: opts.length? `.${opts.join('.')}` : '',
-      name: client.profile.name,
-      fullname: client.profile.fullname,
-      emojis: client.profile.emojis,
-      company: client.profile.company,
-      client: client_hash,
-      agent: agent_hash,
-      packet: packet_hash,
-      laws: laws_hash,
-      warning: client.profile.warning || agent.profile.warning || 'none',
-      token,
-      concerns,
-      meta,
-      params,
-      command,
-      created,
-      copyright: client.profile.copyright,
-    };
-    
-    this.state('hash', `${key}:sign:${type}:md5:${transport.uid}`); // set state to secure hashing
-    data.md5 = this.lib.hash(data, 'md5'); // hash data packet into md5 and inert into data.
-    
-    this.state('hash', `${key}:sign:${type}:sha256:${transport.uid}`); // set state to secure hashing
-    data.sha256 = this.lib.hash(data, 'sha256'); // hash data into sha 256 then set in data.
-    
-    this.state('hash', `${key}:sign:${type}:sha512:${transport.uid}`); // set state to secure hashing
-    data.sha512 = this.lib.hash(data, 'sha512'); // hash data into sha 512 then set in data.
-    
+  async sign(packet) {
+    console.log('client sha sign', packet.q.client.sha256);
+    console.log('agent sha sign', packet.q.agent.sha256);
+
+    const data = this.lib.sign(packet);    
     // Text data that is joined by line breaks and then trimmed.
-    this.state('set', `${key}:sign:${type}:text:${transport.uid}`); // set state to text for output formatting.
+    this.state('set', `${data.key}:${data.method}:text:${data.id.uid}`); // set state to text for output formatting.
     const text = [
-      `::::`,
+      '→',
       `::BEGIN:${data.container}`,
-      `#${key}.${type}${data.opts} ${write}? if true ${write} ${data.message}`,
+      `${data.write} #${data.key}.${data.method}${data.opts}? if true ${data.write} ${data.text}`,
       '\n---\n',
-      'Signed',
-      data.fullname,
-      data.emojis,
+      `sign:${data.fullname}${data.emojis}`,
       '\n',
-      `::begin:${key}:${type}:${transport.uid}`,
-      `transport: ${data.transport.uid}`,
+      `::begin:${data.method}:${data.key}:${data.id.uid}`,
+      `transport: ${data.id.uid}`,
       `time: ${data.time}`,
       `expires: ${data.expires}`,
       `name: ${data.name}`,
@@ -252,16 +163,15 @@ export default {
       `md5: ${data.md5}`,
       `sha256: ${data.sha256}`,
       `sha512: ${data.sha512}`,
-      `::end:${key}:${type}${data.transport.uid}`,
+      `::end:${data.method}:${data.key}:${data.id.uid}`,
       `::END:${data.container}`,
-      `::::`
     ].join('\n').trim();
     
     // send the text data to #feecting to parse and return valid text, html, and data.
-    this.action('question', `${key}:sign:${type}:write:${transport.uid}`); // action set to feecting parse 
-    const feecting = await this.question(`${this.askChr}feecting parse:${transport.uid} ${text}`); // parse with feecting agent.
+    this.action('parse', `${data.key}:${data.method}:parse:${data.id.uid}`); // action set to feecting parse 
+    const feecting = await this.question(`${this.askChr}feecting parse:${data.id.uid} ${text}`); // parse with feecting agent.
     
-    this.state('return', `${key}:sign:${type}:return:${transport.uid}`); // set the state to return proxy
+    this.action('return', `${data.key}:${data.method}:${data.id.uid}`); // set the state to return proxy
     return {
       text: feecting.a.text,
       html: feecting.a.html,

package/package.json

@@ -1,7 +1,7 @@
 {
   "id": "31477276110836980722",
   "name": "@indra.ai/deva.security",
-  "version": "0.0.62",
+  "version": "0.0.64",
   "license": "VLA:36687315706419437672 LICENSE.md",
   "author": {
     "name": "Quinn A Michaels",
@@ -42,7 +42,7 @@
   },
   "homepage": "https://deva.space/devas/security",
   "dependencies": {
-    "@indra.ai/deva": "^1.6.9"
+    "@indra.ai/deva": "^1.6.42"
   },
   "data": {
     "agent": {