secrez 1.1.0 → 1.1.2

package/src/utils/Fido2Client.js

@@ -1,108 +1,118 @@
-const path = require('path')
-const {Crypto} = require('@secrez/core')
-const {execAsync} = require('@secrez/utils')
-const _ = require('lodash')
+const path = require("path");
+const { Crypto } = require("@secrez/core");
+const { execAsync } = require("@secrez/utils");
+const _ = require("lodash");
 
 class Fido2Client {
-
   constructor(secrez) {
-    this.keys = {}
-    this.secrez = secrez
-    this.scriptsPath = path.resolve(__dirname, '../../scripts')
+    this.keys = {};
+    this.secrez = secrez;
+    this.scriptsPath = path.resolve(__dirname, "../../scripts");
   }
 
   async updateConf() {
-    const conf = await this.secrez.readConf()
-    this.keys = {}
+    const conf = await this.secrez.readConf();
+    this.keys = {};
     if (conf.data.keys) {
-      let keys = conf.data.keys
+      let keys = conf.data.keys;
       for (let authenticator in keys) {
-        if (keys[authenticator].type === this.secrez.config.sharedKeys.FIDO2_KEY) {
-          let key = this.keys[authenticator] = _.clone(keys[authenticator])
-          key.id = this.secrez.preDecryptData(key.id)
-          key.salt = this.secrez.preDecryptData(key.salt)
-          key.credential = this.secrez.preDecryptData(key.credential)
+        if (
+          keys[authenticator].type === this.secrez.config.sharedKeys.FIDO2_KEY
+        ) {
+          let key = (this.keys[authenticator] = _.clone(keys[authenticator]));
+          key.id = this.secrez.preDecryptData(key.id);
+          key.salt = this.secrez.preDecryptData(key.salt);
+          key.credential = this.secrez.preDecryptData(key.credential);
         }
       }
     }
   }
 
   async getKeys(asAList) {
-    await this.updateConf()
+    await this.updateConf();
     if (asAList) {
-      let list = []
+      let list = [];
       for (let authenticator in this.keys) {
-        list.push([authenticator, this.keys[authenticator].type])
+        list.push([authenticator, this.keys[authenticator].type]);
       }
-      return list
+      return list;
     } else {
-      return this.keys
+      return this.keys;
     }
   }
 
   setParams(options) {
     let params = [
-      options.credential ? 'hmac_secret.py' : 'fido2_credential.py',
-      '-n', options.authenticator,
-      '-i', options.id
-    ]
+      options.credential ? "hmac_secret.py" : "fido2_credential.py",
+      "-n",
+      options.authenticator,
+      "-i",
+      options.id,
+    ];
     if (options.credential) {
-      params.push('-c', options.credential)
+      params.push("-c", options.credential);
     }
     if (options.salt) {
-      params.push('-s', options.salt)
+      params.push("-s", options.salt);
     }
-    return params
+    return params;
   }
 
   async checkIfReady() {
-    let result = await execAsync('which', __dirname, ['python'])
-    if (result.code !== 0 || typeof result.message === 'undefined') {
-      throw new Error('The Fido2 module requires Python. Please install it on your computer.')
+    let result = await execAsync("which", __dirname, ["python"]);
+    if (result.code !== 0 || typeof result.message === "undefined") {
+      throw new Error(
+        "The Fido2 module requires Python. Please install it on your computer."
+      );
     }
-    result = await execAsync('python', this.scriptsPath, ['is_fido2_ready.py'])
-    if (result.message !== 'Ready') {
-      throw new Error('Python-fido2 is required. Install it with "pip install fido2"')
+    result = await execAsync("python", this.scriptsPath, ["is_fido2_ready.py"]);
+    if (result.message !== "Ready") {
+      throw new Error(
+        'Python-fido2 is required. Install it with "pip install fido2"'
+      );
     }
   }
 
   async setCredential(options) {
-    return await execAsync('python', this.scriptsPath, this.setParams(options))
+    return await execAsync("python", this.scriptsPath, this.setParams(options));
   }
 
   async getSecret(options) {
-    return await execAsync('python', this.scriptsPath, this.setParams(options))
+    return await execAsync("python", this.scriptsPath, this.setParams(options));
   }
 
   async verifySecret(authenticator) {
-    await this.updateConf()
-    let key = this.keys[authenticator]
+    await this.updateConf();
+    let key = this.keys[authenticator];
     let fido2Options = {
       id: key.id,
       authenticator,
       salt: key.salt,
-      credential: key.credential
-    }
-    let result = await this.getSecret(fido2Options)
-    this.checkErrorCode(result, 1)
+      credential: key.credential,
+    };
+    let result = await this.getSecret(fido2Options);
+    this.checkErrorCode(result, 1);
     if (Crypto.b58Hash(result.message) === key.hash) {
-      return result.message
+      return result.message;
     } else {
-      throw new Error(`You used a different key for ${authenticator}`)
+      throw new Error(`You used a different key for ${authenticator}`);
     }
   }
 
   checkErrorCode(result, num) {
     if (result.code !== 0) {
-      let err = 'No Authenticator with the HmacSecret extension found!'
+      let err = "No Authenticator with the HmacSecret extension found!";
       if (result.error === err) {
-        throw new Error(err)
+        throw new Error(err);
       } else {
-        throw new Error(num === 1 ? 'Fido2 authenticator device not found' : 'Something went wrong')
+        throw new Error(
+          num === 1
+            ? "Fido2 authenticator device not found"
+            : "Something went wrong"
+        );
       }
     }
   }
-
 }
 
-module.exports = Fido2Client
+module.exports = Fido2Client;

package/src/utils/HelpProto.js

@@ -1,191 +1,204 @@
-const chalk = require('chalk')
-const {getCols} = require('@secrez/utils')
-const Logger = require('./Logger')
-
+const chalk = require("chalk");
+const { getCols } = require("@secrez/utils");
+const Logger = require("./Logger");
 
 class HelpProto {
-
   constructor(options = {}) {
-    this.options = options
+    this.options = options;
   }
 
   help() {
     if (!this.options.helpDescription) {
-      this.options.helpDescription = ['Available commands:']
-      let maxSize = 0
-      let commands = Object.keys(this.options.cliConfig[this.options.completionObj || 'completion'].help)
+      this.options.helpDescription = ["Available commands:"];
+      let maxSize = 0;
+      let commands = Object.keys(
+        this.options.cliConfig[this.options.completionObj || "completion"].help
+      );
       for (let command of commands) {
-        maxSize = Math.max(maxSize, command.length)
+        maxSize = Math.max(maxSize, command.length);
       }
-      let done = false
+      let done = false;
       for (let command of commands) {
-        if (!done && command > 'help') {
-          this.options.helpDescription.push(`help${' '.repeat(1 + maxSize - 'help'.length)} This help.`)
-          done = true
+        if (!done && command > "help") {
+          this.options.helpDescription.push(
+            `help${" ".repeat(1 + maxSize - "help".length)} This help.`
+          );
+          done = true;
         }
-        let help = this.options.prompt.commands[command].help()
-        this.options.helpDescription.push(`${command}${' '.repeat(1 + maxSize - command.length)} ${help.description[0]}`)
+        let help = this.options.prompt.commands[command].help();
+        this.options.helpDescription.push(
+          `${command}${" ".repeat(1 + maxSize - command.length)} ${
+            help.description[0]
+          }`
+        );
       }
-      this.options.helpDescription.push('\nTo get help about single commands, specify the command, or use the -h option.')
+      this.options.helpDescription.push(
+        "\nTo get help about single commands, specify the command, or use the -h option."
+      );
     }
     return {
       description: this.options.helpDescription,
-      examples: [
-        'help touch',
-        'import -h'
-      ],
-      completion: this.options.completion
-    }
+      examples: ["help touch", "import -h"],
+      completion: this.options.completion,
+    };
   }
 
   format(data, command) {
-    let spacer = '  '
+    let spacer = "  ";
     if (!Array.isArray(data.description)) {
-      data.description = [data.description]
+      data.description = [data.description];
     }
-    console.info()
-    Logger.reset(data.description[0])
+    console.info();
+    Logger.reset(data.description[0]);
     if (data.description[1]) {
-      data.description.slice(1).map(e => Logger.reset(`  ${e}`))
+      data.description.slice(1).map((e) => Logger.reset(`  ${e}`));
     }
     if (command) {
-      let optionDefinitions = this.options.prompt.commands[command].optionDefinitions
-      let commandNames = optionDefinitions.map(e => e.name)
+      let optionDefinitions =
+        this.options.prompt.commands[command].optionDefinitions;
+      let commandNames = optionDefinitions.map((e) => e.name);
       if (commandNames.length) {
-        console.info()
-        Logger.reset('Available options:')
-        let max = 0
+        console.info();
+        Logger.reset("Available options:");
+        let max = 0;
         for (let c of commandNames) {
-          max = Math.max(max, c.length)
+          max = Math.max(max, c.length);
         }
         for (let c of optionDefinitions) {
-          let type = c.type === Boolean ? 'Boolean' : c.type === Number ? 'Number' : 'String'
-          let space = c.multiple ? '[] ' : '   '
+          let type =
+            c.type === Boolean
+              ? "Boolean"
+              : c.type === Number
+              ? "Number"
+              : "String";
+          let space = c.multiple ? "[] " : "   ";
           Logger.log(
-              'reset',
-              spacer +
-              (c.alias ? '-' + c.alias + ', ' : '')
-              + '--' + c.name + ' '.repeat(max - c.name.length + 3) +
-              (c.alias ? '' : '    '),
-              'grey',
-              type + space + (type !== 'Boolean' ? ' ' : '') + (
-                  c.defaultOption
-                      ? '(default)'
-                      : '         '
-              ),
-              'grey',
-              c.hint ? ' (' + c.hint + ')' : ''
-          )
+            "reset",
+            spacer +
+              (c.alias ? "-" + c.alias + ", " : "") +
+              "--" +
+              c.name +
+              " ".repeat(max - c.name.length + 3) +
+              (c.alias ? "" : "    "),
+            "grey",
+            type +
+              space +
+              (type !== "Boolean" ? " " : "") +
+              (c.defaultOption ? "(default)" : "         "),
+            "grey",
+            c.hint ? " (" + c.hint + ")" : ""
+          );
         }
       }
     }
     if (data.examples.length) {
-      Logger.reset('\nExamples:')
-      let max = 0
-      const cols = getCols()
+      Logger.reset("\nExamples:");
+      let max = 0;
+      const cols = getCols();
 
-      let MAX = parseInt(cols * 2 / 6)
+      let MAX = parseInt((cols * 2) / 6);
       for (let e of data.examples) {
         if (Array.isArray(e)) {
-          e = e[0]
+          e = e[0];
         }
-        max = Math.max(max, e.length)
+        max = Math.max(max, e.length);
         if (max > MAX) {
-          max = MAX
-          break
+          max = MAX;
+          break;
         }
       }
 
       const formatExample = (example, ...hint) => {
-        hint = hint.length ? `(${hint.join(' ')})` : undefined
-        let str = []
-        let i = 0
-        let tot = (2 * spacer.length) + max
-        let x = 0
-        let j = -1
-        let elem
-        for (; ;) {
-          let m = max - x
+        hint = hint.length ? `(${hint.join(" ")})` : undefined;
+        let str = [];
+        let i = 0;
+        let tot = 2 * spacer.length + max;
+        let x = 0;
+        let j = -1;
+        let elem;
+        for (;;) {
+          let m = max - x;
           if (example.length <= m) {
-            elem = spacer + ' '.repeat(x) + example
-            str.push(elem + ' '.repeat(tot > elem.length ? tot - elem.length : 3))
-            break
+            elem = spacer + " ".repeat(x) + example;
+            str.push(
+              elem + " ".repeat(tot > elem.length ? tot - elem.length : 3)
+            );
+            break;
           } else {
-            j = -1
-            let partial = example.substring(0, m)
-            let li = partial.lastIndexOf(' ')
+            j = -1;
+            let partial = example.substring(0, m);
+            let li = partial.lastIndexOf(" ");
             if (li === -1) {
-              j = i
-              li = example.lastIndexOf(' ')
+              j = i;
+              li = example.lastIndexOf(" ");
               if (li === -1) {
-                elem = spacer + ' '.repeat(x) + example
-                str.push(elem)
-                break
+                elem = spacer + " ".repeat(x) + example;
+                str.push(elem);
+                break;
               }
             }
-            let good = example.substring(0, li)
-            elem = spacer + ' '.repeat(x) + good
-            str.push(elem + ' '.repeat(tot > elem.length ? tot - elem.length : 3))
-            example = example.substring(li + 1)
-            i++
+            let good = example.substring(0, li);
+            elem = spacer + " ".repeat(x) + good;
+            str.push(
+              elem + " ".repeat(tot > elem.length ? tot - elem.length : 3)
+            );
+            example = example.substring(li + 1);
+            i++;
             // console.log(i, example)
           }
-          x = 2
+          x = 2;
         }
-        let len = str[0].length
+        let len = str[0].length;
         if (hint && i === j) {
-          i++
-          str[i] = ' '.repeat(len)
+          i++;
+          str[i] = " ".repeat(len);
         }
-        let xam = cols - len
-        x = 0
+        let xam = cols - len;
+        x = 0;
         if (hint) {
-          for (; ;) {
+          for (;;) {
             if (!str[i]) {
-              str[i] = ' '.repeat(len)
+              str[i] = " ".repeat(len);
             }
-            let m = xam - x
+            let m = xam - x;
             if (hint.length <= m) {
-              str[i] += ' '.repeat(x) + chalk.grey(hint)
-              break
+              str[i] += " ".repeat(x) + chalk.grey(hint);
+              break;
             }
-            let partial = hint.substring(0, m)
-            let li = partial.lastIndexOf(' ')
+            let partial = hint.substring(0, m);
+            let li = partial.lastIndexOf(" ");
             if (li === -1) {
-              j = i
-              li = hint.lastIndexOf(' ')
+              j = i;
+              li = hint.lastIndexOf(" ");
               if (li === -1) {
-                elem = ' '.repeat(x) + hint
-                str[i] += chalk.grey(elem)
-                break
+                elem = " ".repeat(x) + hint;
+                str[i] += chalk.grey(elem);
+                break;
               }
             }
 
-            let good = hint.substring(0, li)
-            str[i] += ' '.repeat(x) + chalk.grey(good)
-            hint = hint.substring(li + 1)
-            i++
-            x = 2
+            let good = hint.substring(0, li);
+            str[i] += " ".repeat(x) + chalk.grey(good);
+            hint = hint.substring(li + 1);
+            i++;
+            x = 2;
           }
         }
-        console.info(str.join('\n'))
-      }
+        console.info(str.join("\n"));
+      };
 
       for (let e of data.examples) {
-        if (typeof e === 'string') {
-          e = [e]
+        if (typeof e === "string") {
+          e = [e];
         }
         if (!Array.isArray(e)) {
-          e = [e]
+          e = [e];
         }
-        formatExample(...e)
+        formatExample(...e);
       }
     }
-    console.info()
+    console.info();
   }
-
 }
 
-module.exports = HelpProto
-
-
+module.exports = HelpProto;

package/src/utils/Logger.js

@@ -1,113 +1,111 @@
-const chalk = require('chalk')
-const fs = require('fs-extra')
-const path = require('path')
+const chalk = require("chalk");
+const fs = require("fs-extra");
+const path = require("path");
 
-let jsonIndent = 0
+let jsonIndent = 0;
 
-chalk.blu = str => {
-  return chalk.rgb(40, 160, 210).dim(str)
-}
+chalk.blu = (str) => {
+  return chalk.rgb(40, 160, 210).dim(str);
+};
 
-chalk.agua = str => {
-  return chalk.rgb(40, 210, 160).dim(str)
-}
+chalk.agua = (str) => {
+  return chalk.rgb(40, 210, 160).dim(str);
+};
 
-chalk.pink = str => {
-  return chalk.rgb(210, 40, 40).dim(str)
-}
+chalk.pink = (str) => {
+  return chalk.rgb(210, 40, 40).dim(str);
+};
 
 class Logger {
-
   static red(str) {
-    Logger.log('red', str)
+    Logger.log("red", str);
   }
 
   static redWithSuggestion(str) {
-    Logger.log('red', `${str}\n>>`, 'grey', 'Press TAB for suggestions.')
+    Logger.log("red", `${str}\n>>`, "grey", "Press TAB for suggestions.");
   }
 
   static yellow(str) {
-    Logger.log('yellow', str)
+    Logger.log("yellow", str);
   }
 
   static grey(str) {
-    Logger.log('grey', str)
+    Logger.log("grey", str);
   }
 
   static green(str) {
-    Logger.log('green', str)
+    Logger.log("green", str);
   }
 
   static agua(str) {
-    Logger.log('agua', str)
+    Logger.log("agua", str);
   }
 
   static pink(str) {
-    Logger.log('pink', str)
+    Logger.log("pink", str);
   }
 
   static blue(str) {
-    Logger.log('blue', str)
+    Logger.log("blue", str);
   }
 
   static cyan(str) {
-    Logger.log('cyan', str)
+    Logger.log("cyan", str);
   }
 
   static dim(str) {
-    Logger.log('dim', str)
+    Logger.log("dim", str);
   }
 
   static reset(str) {
-    Logger.log('reset', str)
+    Logger.log("reset", str);
   }
 
   static bold(str) {
-    Logger.log('bold', str)
+    Logger.log("bold", str);
   }
 
   static blu(str) {
-    Logger.log('blu', str)
+    Logger.log("blu", str);
   }
 
   static format(data) {
-    if (typeof data === 'object') {
-      return JSON.stringify(data, null, jsonIndent)
+    if (typeof data === "object") {
+      return JSON.stringify(data, null, jsonIndent);
     } else {
-      return data
+      return data;
     }
   }
 
   static log(...data) {
-    let message = ''
-    let prev
+    let message = "";
+    let prev;
     if (data.length === 1) {
-      data = ['dim', data[0]]
+      data = ["dim", data[0]];
     }
     for (let i = 0; i < data.length; i += 2) {
-      if (typeof data[i + 1] === 'undefined') {
-        break
+      if (typeof data[i + 1] === "undefined") {
+        break;
       }
-      let sep = prev ? ' ' : ''
-      data[i + 1] = Logger.format(data[i + 1])
-      if (prev && ['bold', 'italic', 'dim', 'underline'].includes(data[i])) {
-        message += sep + chalk[prev][data[i] || 'reset'](data[i + 1])
+      let sep = prev ? " " : "";
+      data[i + 1] = Logger.format(data[i + 1]);
+      if (prev && ["bold", "italic", "dim", "underline"].includes(data[i])) {
+        message += sep + chalk[prev][data[i] || "reset"](data[i + 1]);
       } else {
-        message += sep + chalk[data[i] || 'reset'](data[i + 1])
+        message += sep + chalk[data[i] || "reset"](data[i + 1]);
       }
-      prev = data[i]
+      prev = data[i];
     }
-    console.info(message)
+    console.info(message);
   }
-
 }
 
-module.exports = Logger
+module.exports = Logger;
 module.exports.debug = (...data) => {
-  fs.appendFileSync(path.resolve(__dirname, '../../tmp/tmp.log'), '\n' + data.join(' '))
-}
-
-module.exports.chalk = chalk
-
-
+  fs.appendFileSync(
+    path.resolve(__dirname, "../../tmp/tmp.log"),
+    "\n" + data.join(" ")
+  );
+};
 
+module.exports.chalk = chalk;