secrez 2.1.0 → 2.1.2

package/README.md

@@ -369,6 +369,15 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**2.1.2**
+
+- disable `copy` command when in headless shells
+
+**2.1.1**
+
+- manage missing clipboard when in headless shells
+- fix bug in creating a `totp` when the target Yaml file is empty
+
 **2.0.1**
 
 - fix commands to change password and number of iterations
@@ -839,25 +848,25 @@ Thank you for any contributions! 😉
 ## Test coverage
 
 ```
-  148 passing (15s)
+  148 passing (16s)
   1 pending
 
 --------------------|---------|----------|---------|---------|--------------------------------------
 File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
 --------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   81.16 |    67.69 |   81.02 |   81.05 |                                      
+All files           |   81.09 |    67.71 |   81.15 |   80.99 |                                      
  src                |   57.84 |    53.62 |   52.63 |   58.41 |                                      
   Command.js        |   79.66 |    78.72 |   76.92 |   81.03 | 32,55-62,73,80,119                   
   PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97                                 
   cliConfig.js      |     100 |      100 |     100 |     100 |                                      
- src/commands       |   83.82 |    69.19 |   90.54 |   83.71 |                                      
+ src/commands       |   83.73 |     69.2 |   90.64 |   83.61 |                                      
   Alias.js          |   90.54 |    77.35 |     100 |   90.41 | 101,112,139,169,173,180,190          
   Bash.js           |      75 |        0 |   66.66 |      75 | 18-19                                
   Cat.js            |    98.9 |    88.88 |     100 |    98.9 | 152                                  
   Cd.js             |   96.42 |    86.66 |     100 |   96.42 | 44                                   
   Conf.js           |    9.09 |        0 |      20 |    9.09 | 98-500                               
   Contacts.js       |   87.17 |    74.32 |     100 |   87.06 | ...5-141,145,165,172,184,237,250,260 
-  Copy.js           |   94.87 |     74.5 |     100 |    94.8 | 111,162,179,204                      
+  Copy.js           |   92.94 |    74.54 |     100 |   92.85 | 114,165,182,200,216-217              
   Ds.js             |   92.53 |    82.05 |     100 |   92.42 | 99,108-113,125                       
   Edit.js           |   13.58 |        0 |      40 |   13.58 | 88-214                               
   Export.js         |   88.11 |    70.58 |     100 |   88.11 | ...0-175,185,197-201,206,218,227,230 
@@ -879,7 +888,7 @@ All files           |   81.16 |    67.69 |   81.02 |   81.05 |
   Show.js           |      72 |    45.45 |   57.14 |   73.46 | ...8,100,106-114,117,123-126,132,143 
   Ssh.js            |      25 |        0 |      40 |      25 | 72-120                               
   Tag.js            |   98.03 |     92.3 |     100 |   98.01 | 122,171                              
-  Totp.js           |   96.47 |    74.46 |     100 |   96.47 | 188-189,235                          
+  Totp.js           |   94.56 |    73.58 |     100 |   94.56 | 188-189,229,239,277                  
   Touch.js          |   95.91 |    81.48 |     100 |   95.83 | 152,202                              
   Use.js            |   96.77 |    89.47 |     100 |   96.77 | 68                                   
   Ver.js            |      90 |    66.66 |     100 |      90 | 25                                   
@@ -895,7 +904,7 @@ All files           |   81.16 |    67.69 |   81.02 |   81.05 |
   Logger.js         |   63.63 |    56.25 |   36.84 |   62.79 | ...25,37-49,57,65-69,74,84,88,93,105 
 --------------------|---------|----------|---------|---------|--------------------------------------
 
-> secrez@2.1.0 posttest /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.2 posttest /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
 > nyc check-coverage --statements 65 --branches 50 --functions 65 --lines 65
 
 

package/coverage.report

@@ -1,5 +1,5 @@
 
-> secrez@2.1.0 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.2 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
 > cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text mocha test/*.test.js test/**/*.test.js test/**/**/*.js --exit
 
 
@@ -29,10 +29,10 @@
   #Cat
     ✓ should return the help
     ✓ should show the content of a file
-    ✓ should show either one or all the versions of a file (1036ms)
+    ✓ should show either one or all the versions of a file (1017ms)
     ✓ should throw if entry is not a file or file does not exist
     ✓ should throw if trying to cat a binary file
-    ✓ should show the content of a Yaml file (1029ms)
+    ✓ should show the content of a Yaml file (1031ms)
 
   #Cd
     ✓ should return the help
@@ -51,10 +51,10 @@
 
   #Copy
     ✓ should return the help
-    ✓ should copy a file to the clipboard (380ms)
-    ✓ should copy a string to the clipboard (230ms)
-    ✓ should copy a card to the clipboard (866ms)
-    ✓ should return an error if the file does not exist or is a folder
+    ✓ should copy a file to the clipboard (488ms)
+    ✓ should copy a string to the clipboard (271ms)
+    ✓ should copy a card to the clipboard (1040ms)
+    ✓ should return an error if the file does not exist or is a folder (60ms)
     ✓ should throw if copying to clipboard a binary files
 
   #Ds
@@ -71,12 +71,12 @@
     ✓ should export an encrypted file to the current local folder
     ✓ should export a file and delete it after 1 second (1205ms)
     ✓ should return an error if the file does not exist or is a folder
-    ✓ should export a keystore json file if a private_key exists in the entry (672ms)
+    ✓ should export a keystore json file if a private_key exists in the entry (685ms)
     ✓ should export a cryptoenv file if a private_key exists in the entry
 
   #Find
     ✓ should return the help
-    ✓ should show find a string in the tree (1018ms)
+    ✓ should show find a string in the tree (1020ms)
     ✓ should find no result without parameters
     ✓ should skip binary files from search
 
@@ -141,7 +141,7 @@
 
   #Mv
     ✓ should return the help
-    ✓ should rename a file (1015ms)
+    ✓ should rename a file (1014ms)
     ✓ should move a file to another folder
     ✓ should move many files to another folder
     ✓ should move a file to another subfolder
@@ -150,14 +150,14 @@
     ✓ should move file to another dataset using wildcards
     ✓ should move file managing duplicates
     ✓ should throw if parameters are missed or wrong
-    ✓ should move files from and to other datasets (1030ms)
+    ✓ should move files from and to other datasets (1033ms)
     ✓ should move the results of a find
 
   #Paste
     ✓ should return the help
-    ✓ should paste the clipboard content to a new file (55ms)
-    ✓ should paste the clipboard content to an existent file (61ms)
-    ✓ should paste a single field to a yml card
+    ✓ should paste the clipboard content to a new file (52ms)
+    ✓ should paste the clipboard content to an existent file (76ms)
+    ✓ should paste a single field to a yml card (39ms)
 
   #Pwd
     ✓ should return the help
@@ -171,7 +171,7 @@
     ✓ should delete a file with one version
     ✓ should delete many files usign wildcards
     ✓ should return errors if wrong parameters
-    ✓ should delete some versions of a file (1012ms)
+    ✓ should delete some versions of a file (1014ms)
 
   #Shell
     ✓ should return the help
@@ -191,13 +191,13 @@
 
   #Totp
     ✓ should return the help
-    ✓ should totp a file to the clipboard (347ms)
-    ✓ should read a totp secret from an image and add the totp field to the card (39ms)
+    ✓ should totp a file to the clipboard (421ms)
+    ✓ should read a totp secret from an image and add the totp field to the card (40ms)
     ✓ should read a totp secret from an image and return the secret
     ✓ should throw if bad image
     ✓ should throw if missing parameters
     ✓ should throw if the yaml is malformed
-    ✓ should read a totp secret from the clipboard (275ms)
+    ✓ should read a totp secret from the clipboard (215ms)
 
   #Touch
     ✓ should return the help
@@ -223,25 +223,25 @@ New file "/folder2/file1" created.
     ✓ should see who am I
 
 
-  148 passing (15s)
+  148 passing (16s)
   1 pending
 
 --------------------|---------|----------|---------|---------|--------------------------------------
 File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
 --------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   81.16 |    67.69 |   81.02 |   81.05 |                                      
+All files           |   81.09 |    67.71 |   81.15 |   80.99 |                                      
  src                |   57.84 |    53.62 |   52.63 |   58.41 |                                      
   Command.js        |   79.66 |    78.72 |   76.92 |   81.03 | 32,55-62,73,80,119                   
   PreCommand.js     |    8.82 |        0 |       0 |    8.82 | 6-97                                 
   cliConfig.js      |     100 |      100 |     100 |     100 |                                      
- src/commands       |   83.82 |    69.19 |   90.54 |   83.71 |                                      
+ src/commands       |   83.73 |     69.2 |   90.64 |   83.61 |                                      
   Alias.js          |   90.54 |    77.35 |     100 |   90.41 | 101,112,139,169,173,180,190          
   Bash.js           |      75 |        0 |   66.66 |      75 | 18-19                                
   Cat.js            |    98.9 |    88.88 |     100 |    98.9 | 152                                  
   Cd.js             |   96.42 |    86.66 |     100 |   96.42 | 44                                   
   Conf.js           |    9.09 |        0 |      20 |    9.09 | 98-500                               
   Contacts.js       |   87.17 |    74.32 |     100 |   87.06 | ...5-141,145,165,172,184,237,250,260 
-  Copy.js           |   94.87 |     74.5 |     100 |    94.8 | 111,162,179,204                      
+  Copy.js           |   92.94 |    74.54 |     100 |   92.85 | 114,165,182,200,216-217              
   Ds.js             |   92.53 |    82.05 |     100 |   92.42 | 99,108-113,125                       
   Edit.js           |   13.58 |        0 |      40 |   13.58 | 88-214                               
   Export.js         |   88.11 |    70.58 |     100 |   88.11 | ...0-175,185,197-201,206,218,227,230 
@@ -263,7 +263,7 @@ All files           |   81.16 |    67.69 |   81.02 |   81.05 |
   Show.js           |      72 |    45.45 |   57.14 |   73.46 | ...8,100,106-114,117,123-126,132,143 
   Ssh.js            |      25 |        0 |      40 |      25 | 72-120                               
   Tag.js            |   98.03 |     92.3 |     100 |   98.01 | 122,171                              
-  Totp.js           |   96.47 |    74.46 |     100 |   96.47 | 188-189,235                          
+  Totp.js           |   94.56 |    73.58 |     100 |   94.56 | 188-189,229,239,277                  
   Touch.js          |   95.91 |    81.48 |     100 |   95.83 | 152,202                              
   Use.js            |   96.77 |    89.47 |     100 |   96.77 | 68                                   
   Ver.js            |      90 |    66.66 |     100 |      90 | 25                                   
@@ -279,6 +279,6 @@ All files           |   81.16 |    67.69 |   81.02 |   81.05 |
   Logger.js         |   63.63 |    56.25 |   36.84 |   62.79 | ...25,37-49,57,65-69,74,84,88,93,105 
 --------------------|---------|----------|---------|---------|--------------------------------------
 
-> secrez@2.1.0 posttest /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.2 posttest /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
 > nyc check-coverage --statements 65 --branches 50 --functions 65 --lines 65
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "secrez",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "license": "MIT",
   "nyc": {
     "include": "src",

package/src/commands/Copy.js

@@ -2,6 +2,7 @@ const path = require("path");
 const clipboardy = require("clipboardy");
 const { isYaml, yamlParse, TRUE, sleep, playMp3 } = require("@secrez/utils");
 const { Node } = require("@secrez/fs");
+const { execSync } = require("child_process");
 
 class Copy extends require("../Command") {
   setHelpAndCompletion() {
@@ -67,7 +68,9 @@ class Copy extends require("../Command") {
 
   help() {
     return {
-      description: ["Copy a text file to the clipboard."],
+      description: [
+        "Copy a text file to the clipboard. It won't work in headless shells.",
+      ],
       examples: [
         [
           "copy ethKeys",
@@ -189,6 +192,15 @@ class Copy extends require("../Command") {
     }
   }
 
+  isMacGuiSession() {
+    try {
+      execSync("echo test | pbcopy", { stdio: "ignore" });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   async write(content, options, counter) {
     let duration = options.duration
       ? options.duration.map((e) => 1000 * e)
@@ -201,19 +213,25 @@ class Copy extends require("../Command") {
         let wait = i ? duration[1] : duration[0];
         await this.writeAndWait(content[i], wait, counter);
         if (this.counter === counter && !options.noBeep) {
-          await playMp3(path.resolve(__dirname, "../../sounds/ding.mp3"));
+          try {
+            await playMp3(path.resolve(__dirname, "../../sounds/ding.mp3"));
+          } catch (e) {
+            // Ignore the error
+          }
         }
       }
     }
   }
 
   async writeAndWait(content, wait, counter) {
-    let previousContent = await clipboardy.read();
-    if (this.counter === counter) {
-      await clipboardy.write(content);
-      await sleep(wait);
-      if (this.counter === counter && content === (await clipboardy.read())) {
-        await clipboardy.write(previousContent);
+    if (this.isMacGuiSession()) {
+      let previousContent = await clipboardy.read();
+      if (this.counter === counter) {
+        await clipboardy.write(content);
+        await sleep(wait);
+        if (this.counter === counter && content === (await clipboardy.read())) {
+          await clipboardy.write(previousContent);
+        }
       }
     }
   }
@@ -224,7 +242,7 @@ class Copy extends require("../Command") {
     }
     try {
       /* istanbul ignore if  */
-      if (!this.clipboardyVerified) {
+      if (this.isMacGuiSession() && !this.clipboardyVerified) {
         await clipboardy.read();
       }
       this.validate(options);

package/src/commands/Totp.js

@@ -77,7 +77,7 @@ class Totp extends require("../Command") {
       examples: [
         [
           "totp coinbase.yml",
-          "prints a totp code and copies it to the clipboard for 5 seconds",
+          "prints a totp code and copies it to the clipboard for 5 seconds if not in a headless shell",
         ],
         [
           'totp coinbase.yml -s "9syh 34rd ge6s hey3 u874"',
@@ -225,10 +225,14 @@ class Totp extends require("../Command") {
         let { content } = entry;
         if (isYaml(p) && !options.allFile) {
           let parsed;
-          try {
-            parsed = yamlParse(content);
-          } catch (e) {
-            throw new Error("The yml is malformed");
+          if (content === undefined) {
+            parsed = {};
+          } else {
+            try {
+              parsed = yamlParse(content);
+            } catch (e) {
+              throw new Error("The yml is malformed");
+            }
           }
           if (secret) {
             if (parsed.totp && !options.force) {
@@ -249,11 +253,13 @@ class Totp extends require("../Command") {
             if (totp) {
               totp = totp.replace(/\s/g, "");
               const token = authenticator.generate(totp);
-              this.prompt.commands.copy.copy({
-                thisString: token,
-                duration: [options.duration || this.defaults.duration],
-                noBeep: options.noBeep,
-              });
+              if (this.isMacGuiSession()) {
+                this.prompt.commands.copy.copy({
+                  thisString: token,
+                  duration: [options.duration || this.defaults.duration],
+                  noBeep: options.noBeep,
+                });
+              }
               return token;
             }
           }
@@ -263,6 +269,15 @@ class Totp extends require("../Command") {
     throw new Error(err);
   }
 
+  isMacGuiSession() {
+    try {
+      execSync("echo test | pbcopy", { stdio: "ignore" });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   async exec(options = {}) {
     if (options.help) {
       return this.showHelp();
@@ -273,10 +288,10 @@ class Totp extends require("../Command") {
       if (options.fromImage || options.fromClipboard) {
         this.Logger.grey(token);
       } else {
-        this.Logger.grey("TOTP token: " + this.chalk.bold.black(token));
-        if (!options.test) {
+        this.Logger.grey("TOTP token: " + this.chalk.bold(token));
+        if (!options.test && this.isMacGuiSession()) {
           this.Logger.grey(
-            `It will stay in the clipboard for ${
+            `Copied to the clipboard. It will stay in it for ${
               options.duration || this.defaults.duration
             } seconds`
           );