secrez 1.1.5 → 1.1.6

package/README.md

@@ -371,6 +371,10 @@ Secrez is not intended to compete with password managers, so do not expect it to
 
 ## History
 
+**1.1.6**
+
+- add support for cryptoEnv format to `export` (look at https://github.com/secrez/cryptoenv for details about CryptoEnv)
+
 **1.1.5**
 
 - fix touch's help showing wrong, temporary options, changed during the development :-(
@@ -832,73 +836,73 @@ Thank you for any contributions! 😉
   1 pending
 
 -----------------------|---------|----------|---------|---------|-----------------------------------
-File                   | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                 
+File                   | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
 -----------------------|---------|----------|---------|---------|-----------------------------------
-All files              |   71.22 |    58.41 |   71.25 |   71.11 |                                   
- src                   |   59.63 |    54.79 |      55 |   60.19 |                                   
-  Command.js           |   79.66 |    78.72 |   76.92 |   81.03 | 32,55-62,73,80,119                
-  PreCommand.js        |   21.95 |    11.54 |   14.29 |   21.95 | 8-99,116                          
-  cliConfig.js         |     100 |      100 |     100 |     100 |                                   
- src/commands          |   81.53 |       67 |   89.95 |    81.4 |                                   
-  Alias.js             |   90.54 |    77.36 |     100 |   90.41 | 101,112,139,169,173,180,190       
-  Bash.js              |      75 |        0 |   66.67 |      75 | 18-19                             
-  Cat.js               |    98.9 |    88.89 |     100 |    98.9 | 152                               
-  Cd.js                |   96.43 |    86.67 |     100 |   96.43 | 44                                
-  Chat.js              |   19.51 |        0 |   16.67 |   19.51 | 23-144                            
-  Conf.js              |   10.45 |        0 |      25 |   10.45 | 134-499                           
-  Contacts.js          |   74.67 |    65.98 |   92.86 |    74.5 | ...90-214,240,247,259,315,328,338 
-  Copy.js              |   94.87 |    74.51 |     100 |   94.81 | 111,162,179,204                   
-  Courier.js           |   63.54 |    41.86 |   85.71 |   63.83 | ...37,152-171,188,200-203,215-221 
-  Ds.js                |   92.54 |    82.05 |     100 |   92.42 | 99,108-113,125                    
-  Edit.js              |   13.58 |        0 |      40 |   13.58 | 88-214                            
-  Export.js            |   87.63 |    67.74 |     100 |   87.63 | ...66,175,182-186,191,203,212,215 
-  Find.js              |   93.59 |    86.67 |     100 |   93.42 | 101,164,200-203,209               
-  Help.js              |     100 |       80 |     100 |     100 | 29                                
-  Import.js            |    93.2 |    85.48 |     100 |   93.14 | ...65,367,387,393,441,456-463,490 
-  Lcat.js              |     100 |    85.71 |     100 |     100 | 54                                
-  Lcd.js               |   95.65 |    81.82 |     100 |   95.65 | 50                                
-  Lls.js               |   95.45 |    72.73 |     100 |   95.45 | 97                                
-  Lpwd.js              |   92.31 |      100 |     100 |   92.31 | 36                                
-  Ls.js                |    91.3 |       75 |     100 |   90.77 | 103,114-116,130,181               
-  Mkdir.js             |     100 |    66.67 |     100 |     100 | 38-44                             
-  Mv.js                |   88.04 |    73.21 |     100 |   87.78 | 93-99,133,155,165-172             
-  Paste.js             |   87.23 |       75 |     100 |   87.23 | 72,78,81,89,113,129               
-  Pwd.js               |   92.31 |      100 |     100 |   92.31 | 33                                
-  Quit.js              |      90 |       50 |     100 |      90 | 27                                
-  Rm.js                |      94 |    80.95 |     100 |   93.88 | 63,126,134                        
-  Shell.js             |   88.24 |       60 |     100 |   88.24 | 38,55                             
-  Ssh.js               |      25 |        0 |      40 |      25 | 72-120                            
-  Tag.js               |   98.04 |    92.31 |     100 |   98.02 | 122,171                           
-  Totp.js              |   96.47 |    74.47 |     100 |   96.47 | 188-189,235                       
-  Touch.js             |   95.92 |    81.48 |     100 |   95.83 | 152,202                           
-  Use.js               |   96.77 |    89.47 |     100 |   96.77 | 68                                
-  Ver.js               |      90 |    66.67 |     100 |      90 | 25                                
-  Whoami.js            |    93.1 |    63.64 |      80 |    93.1 | 29,64                             
-  chat.js              |   85.37 |    53.85 |     100 |   85.37 | 105,117-130,136,142               
-  index.js             |   91.67 |       60 |     100 |    91.3 | 22,31                             
- src/commands/chat     |   79.44 |    63.29 |   92.31 |   79.33 |                                   
-  Contacts.js          |      80 |    42.86 |      80 |      80 | 54,65,69,81                       
-  Help.js              |   86.67 |       60 |     100 |   86.67 | 37-38                             
-  Join.js              |   95.65 |    82.61 |     100 |   95.56 | 43,110                            
-  Leave.js             |     100 |       60 |     100 |     100 | 24,28                             
-  Quit.js              |     100 |       75 |     100 |     100 | 24                                
-  Send.js              |   67.65 |    46.67 |     100 |   67.65 | 37,41,44,77,86-95                 
-  Show.js              |   68.75 |    70.59 |     100 |   68.75 | 74-78,87,102-108                  
-  Whoami.js            |   42.86 |        0 |      60 |   42.86 | 22,30-39                          
- src/prompts           |   14.72 |        0 |   13.43 |   14.85 |                                   
-  ChatPrompt.js        |     6.1 |        0 |       0 |     6.1 | 8-164                             
-  ChatPromptMock.js    |     100 |      100 |   66.67 |     100 |                                   
-  CommandPrompt.js     |     9.8 |        0 |       0 |    9.93 | 24-318                            
-  Completion.js        |    4.41 |        0 |       0 |    4.48 | 6-103                             
-  MainPromptMock.js    |     100 |      100 |   66.67 |     100 |                                   
-  MultiEditorPrompt.js |      25 |        0 |       0 |      25 | 7-36                              
-  SigintManager.js     |      25 |        0 |      20 |      25 | 10-36                             
- src/utils             |   69.92 |    63.28 |   56.25 |   69.55 |                                   
-  AliasManager.js      |     100 |    91.67 |     100 |     100 | 47                                
-  ContactManager.js    |   71.43 |       60 |   85.71 |   71.43 | 12,35-37                          
-  Fido2Client.js       |   15.38 |        0 |   11.11 |   15.38 | 14-108                            
-  HelpProto.js         |    91.6 |    84.06 |     100 |   91.45 | 49,153-154,171-176,195            
-  Logger.js            |   63.64 |    56.25 |   36.84 |   62.79 | ...37-49,57,65-69,74,84,88,93,105 
+All files              |   71.22 |    58.41 |   71.25 |   71.11 |
+ src                   |   59.63 |    54.79 |      55 |   60.19 |
+  Command.js           |   79.66 |    78.72 |   76.92 |   81.03 | 32,55-62,73,80,119
+  PreCommand.js        |   21.95 |    11.54 |   14.29 |   21.95 | 8-99,116
+  cliConfig.js         |     100 |      100 |     100 |     100 |
+ src/commands          |   81.53 |       67 |   89.95 |    81.4 |
+  Alias.js             |   90.54 |    77.36 |     100 |   90.41 | 101,112,139,169,173,180,190
+  Bash.js              |      75 |        0 |   66.67 |      75 | 18-19
+  Cat.js               |    98.9 |    88.89 |     100 |    98.9 | 152
+  Cd.js                |   96.43 |    86.67 |     100 |   96.43 | 44
+  Chat.js              |   19.51 |        0 |   16.67 |   19.51 | 23-144
+  Conf.js              |   10.45 |        0 |      25 |   10.45 | 134-499
+  Contacts.js          |   74.67 |    65.98 |   92.86 |    74.5 | ...90-214,240,247,259,315,328,338
+  Copy.js              |   94.87 |    74.51 |     100 |   94.81 | 111,162,179,204
+  Courier.js           |   63.54 |    41.86 |   85.71 |   63.83 | ...37,152-171,188,200-203,215-221
+  Ds.js                |   92.54 |    82.05 |     100 |   92.42 | 99,108-113,125
+  Edit.js              |   13.58 |        0 |      40 |   13.58 | 88-214
+  Export.js            |   87.63 |    67.74 |     100 |   87.63 | ...66,175,182-186,191,203,212,215
+  Find.js              |   93.59 |    86.67 |     100 |   93.42 | 101,164,200-203,209
+  Help.js              |     100 |       80 |     100 |     100 | 29
+  Import.js            |    93.2 |    85.48 |     100 |   93.14 | ...65,367,387,393,441,456-463,490
+  Lcat.js              |     100 |    85.71 |     100 |     100 | 54
+  Lcd.js               |   95.65 |    81.82 |     100 |   95.65 | 50
+  Lls.js               |   95.45 |    72.73 |     100 |   95.45 | 97
+  Lpwd.js              |   92.31 |      100 |     100 |   92.31 | 36
+  Ls.js                |    91.3 |       75 |     100 |   90.77 | 103,114-116,130,181
+  Mkdir.js             |     100 |    66.67 |     100 |     100 | 38-44
+  Mv.js                |   88.04 |    73.21 |     100 |   87.78 | 93-99,133,155,165-172
+  Paste.js             |   87.23 |       75 |     100 |   87.23 | 72,78,81,89,113,129
+  Pwd.js               |   92.31 |      100 |     100 |   92.31 | 33
+  Quit.js              |      90 |       50 |     100 |      90 | 27
+  Rm.js                |      94 |    80.95 |     100 |   93.88 | 63,126,134
+  Shell.js             |   88.24 |       60 |     100 |   88.24 | 38,55
+  Ssh.js               |      25 |        0 |      40 |      25 | 72-120
+  Tag.js               |   98.04 |    92.31 |     100 |   98.02 | 122,171
+  Totp.js              |   96.47 |    74.47 |     100 |   96.47 | 188-189,235
+  Touch.js             |   95.92 |    81.48 |     100 |   95.83 | 152,202
+  Use.js               |   96.77 |    89.47 |     100 |   96.77 | 68
+  Ver.js               |      90 |    66.67 |     100 |      90 | 25
+  Whoami.js            |    93.1 |    63.64 |      80 |    93.1 | 29,64
+  chat.js              |   85.37 |    53.85 |     100 |   85.37 | 105,117-130,136,142
+  index.js             |   91.67 |       60 |     100 |    91.3 | 22,31
+ src/commands/chat     |   79.44 |    63.29 |   92.31 |   79.33 |
+  Contacts.js          |      80 |    42.86 |      80 |      80 | 54,65,69,81
+  Help.js              |   86.67 |       60 |     100 |   86.67 | 37-38
+  Join.js              |   95.65 |    82.61 |     100 |   95.56 | 43,110
+  Leave.js             |     100 |       60 |     100 |     100 | 24,28
+  Quit.js              |     100 |       75 |     100 |     100 | 24
+  Send.js              |   67.65 |    46.67 |     100 |   67.65 | 37,41,44,77,86-95
+  Show.js              |   68.75 |    70.59 |     100 |   68.75 | 74-78,87,102-108
+  Whoami.js            |   42.86 |        0 |      60 |   42.86 | 22,30-39
+ src/prompts           |   14.72 |        0 |   13.43 |   14.85 |
+  ChatPrompt.js        |     6.1 |        0 |       0 |     6.1 | 8-164
+  ChatPromptMock.js    |     100 |      100 |   66.67 |     100 |
+  CommandPrompt.js     |     9.8 |        0 |       0 |    9.93 | 24-318
+  Completion.js        |    4.41 |        0 |       0 |    4.48 | 6-103
+  MainPromptMock.js    |     100 |      100 |   66.67 |     100 |
+  MultiEditorPrompt.js |      25 |        0 |       0 |      25 | 7-36
+  SigintManager.js     |      25 |        0 |      20 |      25 | 10-36
+ src/utils             |   69.92 |    63.28 |   56.25 |   69.55 |
+  AliasManager.js      |     100 |    91.67 |     100 |     100 | 47
+  ContactManager.js    |   71.43 |       60 |   85.71 |   71.43 | 12,35-37
+  Fido2Client.js       |   15.38 |        0 |   11.11 |   15.38 | 14-108
+  HelpProto.js         |    91.6 |    84.06 |     100 |   91.45 | 49,153-154,171-176,195
+  Logger.js            |   63.64 |    56.25 |   36.84 |   62.79 | ...37-49,57,65-69,74,84,88,93,105
 -----------------------|---------|----------|---------|---------|-----------------------------------
 
 ```

package/coverage.report

@@ -1,5 +1,5 @@
 
-> secrez@1.1.5 test /Users/francescosullo/Projects/Secrez/secrez/packages/secrez
+> secrez@1.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 (1021ms)
+    ✓ should show either one or all the versions of a file (1016ms)
     ✓ 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 (1033ms)
+    ✓ should show the content of a Yaml file (1018ms)
 
   #Cd
     ✓ should return the help
@@ -41,7 +41,7 @@
 
   #Chat
     ✓ should return the help
-    ✓ should run the chat if the courier is ready (168ms)
+    ✓ should run the chat if the courier is ready (551ms)
 
   #Contacts
     ✓ should return the help
@@ -55,17 +55,17 @@
 
   #Copy
     ✓ should return the help
-    ✓ should copy a file to the clipboard (391ms)
-    ✓ should copy a string to the clipboard (246ms)
-    ✓ should copy a card to the clipboard (889ms)
+    ✓ should copy a file to the clipboard (401ms)
+    ✓ should copy a string to the clipboard (244ms)
+    ✓ should copy a card to the clipboard (883ms)
     ✓ should return an error if the file does not exist or is a folder
     ✓ should throw if copying to clipboard a binary files
 
   #Courier
     ✓ should return the help
     ✓ should check if it is ready
-    ✓ should set up the courier (143ms)
-    ✓ should set up the courier and get the default message when is already set up (145ms)
+    ✓ should set up the courier (172ms)
+    ✓ should set up the courier and get the default message when is already set up (171ms)
 
   #Ds
     ✓ should return the help
@@ -79,13 +79,14 @@
     ✓ should export a file to the current local folder
     ✓ 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 (1206ms)
+    ✓ 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 (716ms)
+    ✓ should export a keystore json file if a private_key exists in the entry (1050ms)
+    ✓ 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 (1034ms)
+    ✓ should show find a string in the tree (1024ms)
     ✓ should find no result without parameters
     ✓ should skip binary files from search
 
@@ -103,7 +104,7 @@
     ✓ 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
+    1) 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
@@ -150,7 +151,7 @@
 
   #Mv
     ✓ should return the help
-    ✓ should rename a file (1012ms)
+    ✓ should rename a file (1010ms)
     ✓ should move a file to another folder
     ✓ should move many files to another folder
     ✓ should move a file to another subfolder
@@ -159,14 +160,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 (1013ms)
+    ✓ 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 (82ms)
-    ✓ should paste the clipboard content to an existent file (89ms)
-    ✓ should paste a single field to a yml card (57ms)
+    ✓ should paste the clipboard content to a new file (69ms)
+    ✓ should paste the clipboard content to an existent file (110ms)
+    ✓ should paste a single field to a yml card (67ms)
 
   #Pwd
     ✓ should return the help
@@ -180,7 +181,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 (1009ms)
+    ✓ should delete some versions of a file (1008ms)
 
   #Shell
     ✓ should return the help
@@ -196,13 +197,13 @@
 
   #Totp
     ✓ should return the help
-    ✓ should totp a file to the clipboard (359ms)
-    ✓ should read a totp secret from an image and add the totp field to the card (49ms)
-    ✓ should read a totp secret from an image and return the secret
+    ✓ should totp a file to the clipboard (360ms)
+    ✓ should read a totp secret from an image and add the totp field to the card (68ms)
+    ✓ should read a totp secret from an image and return the secret (54ms)
     ✓ 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 (110ms)
+    ✓ should throw if the yaml is malformed (45ms)
+    ✓ should read a totp secret from the clipboard (310ms)
 
   #Touch
     ✓ should return the help
@@ -225,7 +226,7 @@ New file "/folder2/file1" created.
 
   #Whoami
     ✓ should return the help
-    ✓ should see who am I
+    ✓ should see who am I (38ms)
 
   #Help
     ✓ should return the help
@@ -234,7 +235,7 @@ New file "/folder2/file1" created.
     ✓ should return the help
     ✓ should join a chat with user0x
     ✓ should join a chat with user0x
-    ✓ should jump between chats
+    ✓ should jump between chats (39ms)
     ✓ should return all the users
     ✓ should throw if contact not found or multiple chat
 
@@ -244,29 +245,44 @@ New file "/folder2/file1" created.
 
   #Quit
     ✓ should return the help
-    ✓ should quit the chat, even if inside a room (49ms)
+    ✓ should quit the chat, even if inside a room (57ms)
 
   #Send
     ✓ should return the help
-    ✓ should send a message to user0 (99ms)
+    ✓ should send a message to user0 (245ms)
 
   #Show
     ✓ should return the help
-    ✓ should show history messages (367ms)
+    ✓ should show history messages (452ms)
 
 
-  166 passing (24s)
+  166 passing (30s)
   1 pending
+  1 failing
+
+  1) #Import
+       should read a folder and import text and binary files:
+
+      AssertionError: expected 'Invalid count value' to equal 'Imported files:'
+      + expected - actual
+
+      -Invalid count value
+      +Imported files:
+      
+      at assertConsole (/Users/francescosullo/Projects/Secrez/secrez/packages/test-helpers/src/index.js:121:16)
+      at Context.<anonymous> (test/commands/Import.test.js:331:5)
+
+
 
 -----------------------|---------|----------|---------|---------|-----------------------------------
 File                   | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s                 
 -----------------------|---------|----------|---------|---------|-----------------------------------
-All files              |   71.22 |    58.41 |   71.25 |   71.11 |                                   
+All files              |   71.26 |    58.57 |   71.25 |   71.15 |                                   
  src                   |   59.63 |    54.79 |      55 |   60.19 |                                   
   Command.js           |   79.66 |    78.72 |   76.92 |   81.03 | 32,55-62,73,80,119                
   PreCommand.js        |   21.95 |    11.54 |   14.29 |   21.95 | 8-99,116                          
   cliConfig.js         |     100 |      100 |     100 |     100 |                                   
- src/commands          |   81.53 |       67 |   89.95 |    81.4 |                                   
+ src/commands          |   81.57 |    67.18 |   89.95 |   81.43 |                                   
   Alias.js             |   90.54 |    77.36 |     100 |   90.41 | 101,112,139,169,173,180,190       
   Bash.js              |      75 |        0 |   66.67 |      75 | 18-19                             
   Cat.js               |    98.9 |    88.89 |     100 |    98.9 | 152                               
@@ -278,7 +294,7 @@ All files              |   71.22 |    58.41 |   71.25 |   71.11 |
   Courier.js           |   63.54 |    41.86 |   85.71 |   63.83 | ...37,152-171,188,200-203,215-221 
   Ds.js                |   92.54 |    82.05 |     100 |   92.42 | 99,108-113,125                    
   Edit.js              |   13.58 |        0 |      40 |   13.58 | 88-214                            
-  Export.js            |   87.63 |    67.74 |     100 |   87.63 | ...66,175,182-186,191,203,212,215 
+  Export.js            |   88.12 |    70.59 |     100 |   88.12 | ...75,185,197-201,206,218,227,230 
   Find.js              |   93.59 |    86.67 |     100 |   93.42 | 101,164,200-203,209               
   Help.js              |     100 |       80 |     100 |     100 | 29                                
   Import.js            |    93.2 |    85.48 |     100 |   93.14 | ...65,367,387,393,441,456-463,490 
@@ -327,3 +343,4 @@ All files              |   71.22 |    58.41 |   71.25 |   71.11 |
   HelpProto.js         |    91.6 |    84.06 |     100 |   91.45 | 49,153-154,171-176,195            
   Logger.js            |   63.64 |    56.25 |   36.84 |   62.79 | ...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": "1.1.5",
+  "version": "1.1.6",
   "license": "MIT",
   "nyc": {
     "include": "src",

package/src/commands/Export.js

@@ -66,6 +66,11 @@ class Export extends require("../Command") {
         alias: "k",
         type: Boolean,
       },
+      {
+        name: "crypto-env",
+        alias: "C",
+        type: Boolean,
+      },
     ];
   }
 
@@ -106,6 +111,10 @@ class Export extends require("../Command") {
           "export my-wallet.yml -k",
           "it will export a private key from the entry to a keystore file. The fill will be named as the entry replacing the extension with '.keystore.json'. If in the entry there are more than one private_key, it will ask which one to export. If no '--password' is specified, it will ask for a password to encrypt the keystore file. The entry must be a valid card, with at least one 'private_key' field.",
         ],
+        [
+          "export my-wallet.yml --crypto-env",
+          "it works like with keystore files, but it will export to file with .crypto.env extension ready to be used with @secrez/cryptoenv. Notice that the option -k has priority over -C.",
+        ],
       ],
     };
   }
@@ -140,7 +149,7 @@ class Export extends require("../Command") {
       if (Node.isBinary(entry) && typeof content === "string") {
         content = Crypto.bs64.decode(content);
       }
-      if (options.keystore) {
+      if (options.keystore || options.cryptoEnv) {
         let card;
         try {
           card = yamlParse(content);
@@ -165,17 +174,23 @@ class Export extends require("../Command") {
           });
           privateKey = card[pk];
         }
+        let fileType = options.keystore ? "keystore" : "crypto-env";
         let pwd =
           options.password ||
           (await this.useInput({
             type: "password",
-            message: "Type the password to encrypt the keystore file",
+            message: `Type the password to encrypt the ${fileType} file`,
           }));
         if (!pwd) {
           throw new Error("Operation canceled");
         }
-        content = await encryptPrivateKeyAsKeystoreJson(privateKey, pwd);
-        name = name.replace(/\.[^.]+$/, ".keystore.json");
+        if (options.keystore) {
+          content = await encryptPrivateKeyAsKeystoreJson(privateKey, pwd);
+          name = name.replace(/\.[^.]+$/, ".keystore.json");
+        } else {
+          content = await Crypto.encrypt(privateKey, Crypto.SHA3(pwd));
+          name = name.replace(/\.[^.]+$/, ".crypto.env");
+        }
       } else if (options.encrypt) {
         const myPublicKey = this.secrez.getPublicKey();
         if (options.publicKeys) {