secrez 2.1.4 → 2.1.6

package/README.md

@@ -369,6 +369,14 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**2.1.6**
+
+- export and encrypt, with option `--crypto-env`, the entire content of an item
+
+**2.1.5**
+
+- duplicate files using `touch <newfile> --from <file>` to copy the file from the source to the destination
+
 **2.1.4**
 
 - uses clipboard only on macOS

package/coverage.report

@@ -1,5 +1,5 @@
 
-> secrez@2.1.3 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@2.1.6 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 (1020ms)
+    ✓ should show either one or all the versions of a file (1012ms)
     ✓ 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 (1031ms)
+    ✓ should show the content of a Yaml file (1018ms)
 
   #Cd
     ✓ should return the help
@@ -51,25 +51,222 @@
 
   #Copy
     ✓ should return the help
+    ✓ should copy a file to the clipboard (416ms)
+    ✓ should copy a string to the clipboard (321ms)
+    ✓ should copy a card to the clipboard (943ms)
+    ✓ should return an error if the file does not exist or is a folder (50ms)
+    ✓ should throw if copying to clipboard a binary files
+
+  #Ds
+    ✓ should return the help
+    ✓ should list all datasets
+    ✓ should create a new dataset
+    ✓ should rename a dataset
+    ✓ should delete a dataset
+
+  #Export
+    ✓ should return the help
+    1) should export a file to the current local folder
+    ✓ should export a file encrypted only for the user itself
+    ✓ should export a binary file to the current local folder
+    ✓ should export an encrypted file to the current local folder
+    ✓ should export a file and delete it after 1 second (1204ms)
+    ✓ 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 (753ms)
+    ✓ should export a cryptoenv file if a private_key exists in the entry
+    ✓ should export a cryptoenv file with entire content when no private_key fields exist and user confirms
+    ✓ should throw error when no private_key fields exist and user declines
+    ✓ should throw error when no private_key fields exist and keystore option is used
+
+  #Find
+    ✓ should return the help
+    ✓ should show find a string in the tree (1033ms)
+    ✓ should find no result without parameters
+    ✓ should skip binary files from search
+
+  #Help
+    ✓ should return the help
+    ✓ #execAsync and format
+    ✓ should throw if wrong command
+    ✓ -- to complete coverage
+
+  #Import
+    ✓ should return the help
+    ✓ should import a file in the current folder
+    ✓ should import an encrypted file
+    ✓ should import an encrypted file encrypted for myself
+    ✓ should import an encrypted binary file and export it again verifying it is fine
+    ✓ should import files recursively
+    ✓ should read a folder and import the only text file
+    ✓ should read a folder and import text and binary files
+    ✓ should simulate the import of two files
+    ✓ should move the imported file
+    ✓ should import a backup from another software spanning the data among folders and files
+    ✓ should import a backup from another software but saving the tags as tags
+    ✓ should import a backup from another software using tags to prefix the paths
+    ✓ should import using tags to prefix the paths, ignoring the tags
+    ✓ should import from a LastPass-like csv setting the path from "grouping" and "name"
+    ✓ should import from a json
+    ✓ should throw importing a malformed backup
+    ✓ should throw importing a CSV indicating wrong fields to generate the path
+
+  #Lcat
+    ✓ should return the help
+    ✓ cat a file
+    ✓ return en error if trying to cat a binary file
+
+  #Lcd
+    ✓ should return the help
+    ✓ change to a folder
+    ✓ return en error if changing to a file
+
+  #Lls
+    ✓ should return the help
+    ✓ should list a folder
+    ✓ return en error if lls-ing a not existing path
+    ✓ return a message if no files are found
+
+  #Lpwd
+    ✓ should return the help
+    ✓ change to a folder
+
+  #Ls
+    ✓ should return the help
+    ✓ should return all the datasets
+    ✓ should list folders and files
+    ✓ should list folders and files using wildcards
+
+  #Mkdir
+    ✓ should return the help
+    ✓ should create a folder
+    ✓ should create a nested folder
+    ✓ should throw if trying to create a child of a file
+    ✓ should throw if wrong parameters
+
+  #Mv
+    ✓ should return the help
+    ✓ should rename a file (1011ms)
+    ✓ should move a file to another folder
+    ✓ should move many files to another folder
+    ✓ should move a file to another subfolder
+    ✓ should move and rename file to another folder
+    ✓ should move file to another folder using wildcards
+    ✓ 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 (1018ms)
+    ✓ should move the results of a find
+
+  #Paste
+    ✓ should return the help
+    ✓ should paste the clipboard content to a new file (46ms)
+    ✓ should paste the clipboard content to an existent file (79ms)
+    ✓ should paste a single field to a yml card (38ms)
+
+  #Pwd
+    ✓ should return the help
+    ✓ should show the working folder
+
+  #Quit
+    ✓ should show the content of an external file via bash
+
+  #Rm
+    ✓ should return the help
+    ✓ 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 (1010ms)
+
+  #Shell
+    ✓ should return the help
+    ✓ should show the content of an external file via shell
+
+  #Show
+    ✓ should return the help
+    ✓ should show the field password of a card
+
+  #Tag
+    ✓ should return the help
+    ✓ should tag a file
+    ✓ should remove a tag
+    ✓ should list all the tags
+    ✓ should show the file tagged as
+    ✓ should show very long file tagged as
+
+  #Totp
+    ✓ should return the help
+    ✓ should totp a file to the clipboard (395ms)
+    ✓ should read a totp secret from an image and add the totp field to the card (46ms)
+    ✓ 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 (269ms)
+
+  #Touch
+    ✓ should return the help
+    ✓ should create a file
+    ✓ should create a file with content
+    ✓ should duplicate a file
+    ✓ should throw if trying to duplicate a non existing file
+    ✓ should throw if trying to duplicate a folder
+    ✓ should throw if trying to create a child of a file
+    ✓ should throw if wrong parameters
+    ✓ should create a file and generate a wallet
+New file "/folder2/file1" created.
+    ✓ should generate 5 prefixed wallet (65ms)
+New file "/folder2/file1" created.
+    ✓ should generate a wallet with mnemonic and 2 keys
+
+  #Use
+    ✓ should return the help
+    ✓ should use a new dataset, creating it if does not exist
+
+  #Ver
+    ✓ should show the current version
+
+  #Whoami
+    ✓ should return the help
+    ✓ should see who am I
+
+
+  154 passing (16s)
+  1 pending
+  1 failing
+
+  1) #Export
+       should export a file to the current local folder:
+
+      AssertionError: expected 'file.2' to equal 'file'
+      + expected - actual
+
+      -file.2
+      +file
+      
+      at assertConsole (/Users/francescosullo/Projects/Secrez/secrez/packages/test-helpers/src/index.js:121:16)
+      at Context.<anonymous> (test/commands/Export.test.js:94:5)
+
+
+
 --------------------|---------|----------|---------|---------|--------------------------------------
 File                | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                    
 --------------------|---------|----------|---------|---------|--------------------------------------
-All files           |   77.54 |     63.7 |   79.71 |   77.44 |                                      
+All files           |   81.01 |    67.81 |   81.15 |   80.91 |                                      
  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       |   79.46 |    64.42 |   88.66 |   79.36 |                                      
+ src/commands       |   83.77 |    69.39 |   90.64 |   83.66 |                                      
   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           |   15.55 |      3.5 |      50 |   15.73 | 108-191,198-241,252-267              
+  Copy.js           |    91.2 |    71.92 |     100 |   91.11 | 115,166,183,205-210,225-226,253      
   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 
+  Export.js         |   89.71 |    75.67 |     100 |   89.71 | ...5-190,201,213-217,222,234,243,246 
   Find.js           |   93.58 |    86.66 |     100 |   93.42 | 101,164,200-203,209                  
   Help.js           |     100 |       80 |     100 |     100 | 29                                   
   Import.js         |    93.2 |    85.48 |     100 |   93.13 | ...5,365,367,387,393,441,456-463,490 
@@ -88,19 +285,19 @@ All files           |   77.54 |     63.7 |   79.71 |   77.44 |
   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           |   84.21 |    56.36 |     100 |   84.21 | ...9,229,239,257-263,275-286,299-301 
-  Touch.js          |   95.91 |    81.48 |     100 |   95.83 | 152,202                              
+  Totp.js           |   93.75 |    72.72 |     100 |   93.75 | 189-190,230,240,282-287              
+  Touch.js          |      96 |    81.48 |     100 |   95.91 | 164,231                              
   Use.js            |   96.77 |    89.47 |     100 |   96.77 | 68                                   
   Ver.js            |      90 |    66.66 |     100 |      90 | 25                                   
   Whoami.js         |   83.33 |       60 |      80 |   83.33 | 27,35,48                             
   index.js          |    87.5 |       50 |     100 |   86.95 | 15,22,31                             
  src/prompts        |     100 |      100 |      50 |     100 |                                      
   MainPromptMock.js |     100 |      100 |      50 |     100 |                                      
- src/utils          |   70.04 |    63.28 |   56.25 |   69.67 |                                      
+ src/utils          |   68.82 |     62.5 |   56.25 |   68.44 |                                      
   AliasManager.js   |     100 |    91.66 |     100 |     100 | 47                                   
   ContactManager.js |   73.33 |       60 |   85.71 |   73.33 | 12,34-36                             
   Fido2Client.js    |   15.38 |        0 |   11.11 |   15.38 | 14-108                               
-  HelpProto.js      |   91.59 |    84.05 |     100 |   91.45 | 49,153-154,171-176,195               
+  HelpProto.js      |   89.07 |     82.6 |     100 |   88.88 | 49,135-137,153-154,171-176,195       
   Logger.js         |   63.63 |    56.25 |   36.84 |   62.79 | ...25,37-49,57,65-69,74,84,88,93,105 
 --------------------|---------|----------|---------|---------|--------------------------------------
  ELIFECYCLE  Test failed. See above for more details.

package/package.json

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

package/src/commands/Export.js

@@ -162,19 +162,35 @@ class Export extends require("../Command") {
             pks.push(k);
           }
         }
+        let shouldEncryptAll = false;
         if (!pks.length) {
-          throw new Error("The entry does not contain any private key");
+          if (options.cryptoEnv) {
+            shouldEncryptAll = await this.useInput({
+              type: "confirm",
+              message:
+                "No private_key fields found. Would you like to encrypt the entire content instead?",
+              default: false,
+            });
+          }
+          if (!shouldEncryptAll) {
+            throw new Error("The entry does not contain any private key");
+          }
         }
-        let privateKey = card[pks[0]];
-        if (pks.length > 1) {
-          let pk = await this.useInput({
-            type: "list",
-            message: "Which private key do you want to export?",
-            choices: pks,
-          });
-          privateKey = card[pk];
+        let privateKey;
+        if (shouldEncryptAll) {
+          privateKey = content;
+        } else {
+          privateKey = card[pks[0]];
+          if (pks.length > 1) {
+            let pk = await this.useInput({
+              type: "list",
+              message: "Which private key do you want to export?",
+              choices: pks,
+            });
+            privateKey = card[pk];
+          }
         }
-        let fileType = options.keystore ? "keystore" : "crypto-env";
+        let fileType = options.cryptoEnv ? "crypto-env" : "keystore";
         let pwd =
           options.password ||
           (await this.useInput({
@@ -184,12 +200,12 @@ class Export extends require("../Command") {
         if (!pwd) {
           throw new Error("Operation canceled");
         }
-        if (options.keystore) {
-          content = await encryptPrivateKeyAsKeystoreJson(privateKey, pwd);
-          name = name.replace(/\.[^.]+$/, ".keystore.json");
-        } else {
+        if (options.cryptoEnv) {
           content = await Crypto.encrypt(privateKey, Crypto.SHA3(pwd));
           name = name.replace(/\.[^.]+$/, ".crypto.env");
+        } else {
+          content = await encryptPrivateKeyAsKeystoreJson(privateKey, pwd);
+          name = name.replace(/\.[^.]+$/, ".keystore.json");
         }
       } else if (options.encrypt) {
         const myPublicKey = this.secrez.getPublicKey();

package/src/commands/Touch.js

@@ -1,6 +1,7 @@
 const { config, Entry } = require("@secrez/core");
 const { yamlStringify } = require("@secrez/utils");
 const { newWallet, getWalletFromMnemonic } = require("@secrez/eth");
+const { Node } = require("@secrez/fs");
 
 class Touch extends require("../Command") {
   setHelpAndCompletion() {
@@ -62,6 +63,11 @@ class Touch extends require("../Command") {
         alias: "v",
         type: Boolean,
       },
+      {
+        name: "from",
+        type: String,
+        completionType: "file",
+      },
     ];
   }
 
@@ -77,8 +83,10 @@ class Touch extends require("../Command") {
           "touch somefile",
           "If the the file exists, it create 'somefile.2', 'somefile.3', etc.",
         ],
-        'touch -p afile --content "Password: 1432874565"',
-        'touch ether -c "Private Key: eweiu34y23h4y23ih4uy23hiu4y234i23y4iuh3"',
+        [
+          'touch -p afile --content "Password: 1432874565"',
+          "Save the specified content in 'afile'.",
+        ],
         [
           "touch sample.txt -w",
           "Prompt the user to type the content of the file. The text cannot contain newlines. It will cut at the first one, if so. If '-w' and '-c' are both present, '-c' will be ignored.",
@@ -107,6 +115,10 @@ class Touch extends require("../Command") {
           "touch new-wallets.yaml -gi",
           "Includes the mnemonic. In this case, it will also add the fields 'mnemonic' (mnemonic phrase) and 'derived_path' (path used to generate the keys). ",
         ],
+        [
+          "touch wallet2.yml --from wallet.yaml",
+          "Creates the new file 'wallet2.yml' duplicating 'wallet.yml'.",
+        ],
       ],
     };
   }
@@ -193,6 +205,23 @@ class Touch extends require("../Command") {
           } else {
             throw new Error("Command canceled");
           }
+        } else if (options.from) {
+          let data = await this.internalFs.getTreeIndexAndPath(options.from);
+          let tree = data.tree;
+          let p = tree.getNormalizedPath(data.path);
+          let node;
+          try {
+            node = tree.root.getChildFromPath(p);
+          } catch (e) {
+            throw new Error(`File "${options.from}" not found.`);
+          }
+          if (Node.isFile(node)) {
+            console.log("is file");
+            let details = await tree.getEntryDetails(node);
+            options.content = details.content;
+          } else {
+            throw new Error(`"${options.from}" is not a file.`);
+          }
         }
       }
       let newFile = await this.touch(options);