mpw 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb4b82dd0d113ea933f35498f0c06d204da9dd4
-  data.tar.gz: 6e8e787417bab3e9e5a467af6f44f99569385c0b
+  metadata.gz: 4d0eff317597b9307b65264bd5c42547b32588d6
+  data.tar.gz: a374e4ec216d629846f5848e7648d606634eaf2f
 SHA512:
-  metadata.gz: a64bfc419f4a5ff32bf19e4c187840a0ae5929695da310d9efa7fdbc7d3f1352e6fc11270a74b6b609996eda13079f946a6faf30342cb95529337847a4f0901a
-  data.tar.gz: 6783a408ea98e5994845d552f5797a5cd3a30c7a921d4162ca03f46b5a2bb5bd8d9065df30a84fa8c2631b321d1e81ee9ea970ff00e062c739f9581894c823a3
+  metadata.gz: d4b873e23e0065cbe83eb0273e16186a721acfb162974f73036d8eee8f49588172e64cc4ef2ad859971989bf141a2253f7af3cf184a6e730b53d8f967454a7ed
+  data.tar.gz: 1d6c99d6e62f544139ffd11aa5185b99346f2e8b6c9777a32b42cd472be4db9f067a21a9a2fe9e11658c14649b8b997f08fa998c35fc78e88abdaf3137b6180e

data/Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
 gem 'highline'
-gem 'i18n', '0.6.9'
+gem 'i18n'
 gem 'locale'
 gem 'gpgme'
 gem 'colorize'
-
-group :ssh do
-	gem 'net-sftp'
-end
+gem 'net-ssh'
+gem 'net-scp'

data/README.md

@@ -1,18 +1,127 @@
 # Manage your passwords!
 
 MPW is a little software which stores your passwords in an GPG encrypted file.
-MPW can synchronize your password with a MPW Server or via SSH or via FTP.
+MPW can synchronize your password with via SSH or FTP.
 
 # Installation
 
-You must generate a GPG Key with GPG or with Seahorse (GUI on linux).
-This program work with ruby >= 1.9
+This program work with ruby >= 2.0
 
 * install ruby and rubygems on your computer
 * gem install mpw
 
-If you want use mpw-ssh, you must install sshpass
-
 # How to use
 
-mpw -h 
+* Show help
+```
+mpw --help
+```
+
+* Setup a new config file
+```
+mpw --setup
+mpw --setup --config /path/conf/file.cfg
+```
+
+* Create and setup a new wallet
+```
+mpw --setup-wallet --wallet new_wallet_name
+mpw --setup-wallet --wallet new_wallet_name --config /path/conf/file.cfg 
+```
+
+* Add a GPG key in wallet
+```
+mpw --add --key root@localhost.local
+mpw --add --key root@localhost.local --config /path/conf/file.cfg 
+mpw --add --key root@localhost.local --wallet wallet_name
+mpw --add --key root@localhost.local --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Add a new  GPG key in wallet
+```
+mpw --add --key root@localhost.local --file /path/gpg/file.pub
+mpw --add --key root@localhost.local --file /path/gpg/file.pub --config /path/conf/file.cfg 
+mpw --add --key root@localhost.local --file /path/gpg/file.pub --wallet wallet_name
+mpw --add --key root@localhost.local --file /path/gpg/file.pub --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Delete a GPG key in wallet
+```
+mpw --delete --key root@localhost.local
+mpw --delete --key root@localhost.local --wallet wallet_name
+mpw --delete --key root@localhost.local --wallet wallet_name --config /path/conf/file.cfg 
+```
+
+* Add a new item in wallet
+```
+mpw --add 
+mpw --add --config /path/conf/file.cfg
+mpw --add --wallet wallet_name
+mpw --add --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Update an item
+```
+mpw --update --id uniq_id
+mpw --update --id uniq_id --config /path/conf/file.cfg
+mpw --update --id uniq_id --wallet wallet_name
+mpw --update --id uniq_id --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Delete an item
+```
+mpw --delete --id uniq_id
+mpw --delete --id uniq_id --config /path/conf/file.cfg
+mpw --delete --id uniq_id --wallet wallet_name
+mpw --delete --id uniq_id --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Show an item
+```
+mpw --show 'string to search'
+mpw --show 'string to search' --config /path/conf/file.cfg
+mpw --show 'string to search' --wallet wallet_name
+mpw --show 'string to search' --config /path/conf/file.cfg --wallet wallet_name
+mpw --show 'string to search' --group group_name
+mpw --show 'string to search' --group group_name --config /path/conf/file.cfg
+mpw --show 'string to search' --group group_name --wallet wallet_name
+mpw --show 'string to search' --group group_name --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Export data in YAML file
+```
+mpw --export --file /path/file/to/export.yml
+mpw --export --file /path/file/to/export.yml --config /path/conf/file.cfg
+mpw --export --file /path/file/to/export.yml --wallet wallet_name
+mpw --export --file /path/file/to/export.yml --config /path/conf/file.cfg --wallet wallet_name
+```
+
+* Import data from YAML file
+```
+mpw --import --file /path/file/to/export.yml
+mpw --import --file /path/file/to/export.yml --config /path/conf/file.cfg
+mpw --import --file /path/file/to/export.yml --wallet wallet_name
+mpw --import --file /path/file/to/export.yml --config /path/conf/file.cfg --wallet wallet_name
+```
+
+Format file to import:
+```
+1:
+  name: Website perso
+  group: Perso
+  host: localhost.local
+  protocol: ftp
+  user: test
+  password: letoortue
+  port: 21
+  comment: Mysuper website
+2:
+  name: Linuxfr
+  group: Pro
+  host: Linuxfr.org
+  protocol: https
+  user: test
+  password: coucou 
+  port: 
+  comment: 
+```

data/VERSION

@@ -1 +1 @@
-2.0.3
+3.0.0

data/bin/mpw

@@ -1,17 +1,26 @@
 #!/usr/bin/ruby
-# author: nishiki
-# mail: nishiki@yaegashi.fr
-# info: a simple script who manage your passwords
+# MPW is a software to crypt and manage your passwords
+# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
+# 
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'rubygems'
 require 'optparse'
 require 'pathname'
 require 'locale'
 require 'set'
 require 'i18n'
-require 'mpw/mpw'
-require 'mpw/config'
-require 'mpw/ui/cli'
 
 # --------------------------------------------------------- #
 # Set local
@@ -25,8 +34,13 @@ end
 
 APP_ROOT = File.dirname(Pathname.new(__FILE__).realpath)
 
+# TODO
+require "#{APP_ROOT}/../lib/mpw/mpw.rb"
+require "#{APP_ROOT}/../lib/mpw/config.rb"
+require "#{APP_ROOT}/../lib/mpw/ui/cli.rb"
+
 I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks)
-I18n.load_path      = Dir["#{APP_ROOT}/../i18n/cli/*.yml"]
+I18n.load_path      = Dir["#{APP_ROOT}/../i18n/*.yml"]
 I18n.default_locale = :en
 I18n.locale         = lang.to_sym
 
@@ -36,16 +50,16 @@ I18n.locale         = lang.to_sym
 
 options = {}
 options[:force]  = false
-options[:format] = false
 options[:sync]   = true
 options[:group]  = nil
 options[:config] = nil
+options[:wallet] = nil
 
 OptionParser.new do |opts|
 	opts.banner = "#{I18n.t('option.usage')}: mpw [options]"
 
-	opts.on('-s', '--show [SEARCH]', I18n.t('option.show')) do |search|
-		search.nil? ? (options[:show]  = '')  : (options[:show] = search)
+	opts.on('-a', '--add', I18n.t('option.add')) do
+		options[:add] = true
 	end
 
 	opts.on('-A', '--show-all', I18n.t('option.show_all')) do
@@ -53,64 +67,74 @@ OptionParser.new do |opts|
 		options[:show] = ''
 	end
 
-	opts.on('-u', '--update ID', I18n.t('option.update')) do |id|
-		options[:update] = id
+	opts.on('-c', '--config CONFIG', I18n.t('option.config')) do |config|
+		options[:config] = config
 	end
 
-	opts.on('-d', '--delete ID', I18n.t('option.remove')) do |id|
-		options[:delete] = id
+	opts.on('-d', '--delete', I18n.t('option.remove')) do
+		options[:delete] = true
 	end
 
-	opts.on('-g', '--group GROUP', I18n.t('option.group')) do |group|
-		options[:group] = group
+	opts.on('-e', '--export', I18n.t('option.export')) do
+		options[:export] = true
 	end
 
-	opts.on('-a', '--add', I18n.t('option.add')) do
-		options[:add] = true
+	opts.on('-f', '--file FILE', I18n.t('option.file')) do |file|
+		options[:file] = file
 	end
 
-	opts.on('-c', '--config CONFIG', I18n.t('option.config')) do |config|
-		options[:config] = config
+	opts.on('-F', '--force', I18n.t('option.force')) do
+		options[:force] = true
 	end
 
-	opts.on('-S', '--setup', I18n.t('option.setup')) do
-		options[:setup] = true
+	opts.on('-g', '--group GROUP', I18n.t('option.group')) do |group|
+		options[:group] = group
 	end
 
-	opts.on('-p', '--protocol PROTOCOL', I18n.t('option.protocol')) do |protocol|
-		options[:protocol] = protocol
+	opts.on('-G', '--generate-password [LENGTH]', I18n.t('option.generate_password')) do |length|
+		puts MPW::MPW::password(length)
+		exit 0
 	end
 
-	opts.on('-e', '--export FILE', I18n.t('option.export')) do |file|
-		options[:export] = file
-		options[:type]   = :yaml
+	opts.on('-h', '--help', I18n.t('option.help')) do
+		puts opts
+		exit 0
 	end
 
-	opts.on('-t', '--type TYPE', I18n.t('option.type')) do |type|
-		options[:type] = type.to_sym
+	opts.on('-i', '--id ID', I18n.t('option.id')) do |id|
+		options[:id] = id
 	end
 
-	opts.on('-i', '--import FILE', I18n.t('option.import')) do |file|
-		options[:import] = file
-		options[:type]   = :yaml
+	opts.on('-I', '--import', I18n.t('option.import')) do
+		options[:import] = true
 	end
 
-	opts.on('-f', '--force', I18n.t('option.force')) do
-		options[:force] = true
+	opts.on('-k', '--key KEY', I18n.t('option.key')) do |key|
+		options[:key] = key
 	end
 
 	opts.on('-N', '--no-sync', I18n.t('option.no_sync')) do
 		options[:sync] = false
 	end
 
-	opts.on('-G', '--generate-password [LENGTH]', I18n.t('option.generate_password')) do |length|
-		puts MPW::MPW::password(length)
-		exit 0
+	opts.on('-s', '--show [SEARCH]', I18n.t('option.show')) do |search|
+		search.nil? ? (options[:show]  = '')  : (options[:show] = search)
 	end
 
-	opts.on('-h', '--help', I18n.t('option.help')) do
-		puts opts
-		exit 0
+	opts.on('-S', '--setup', I18n.t('option.setup')) do
+		options[:setup] = true
+	end
+
+	opts.on('-u', '--update', I18n.t('option.update')) do
+		options[:update] = true
+	end
+
+	opts.on('-w', '--wallet WALLET', I18n.t('option.wallet')) do |wallet|
+		options[:wallet] = wallet
+	end
+
+	opts.on('-W', '--setup-wallet', I18n.t('option.setup_wallet')) do
+		options[:setup_wallet] = true
 	end
 end.parse!
 
@@ -118,51 +142,59 @@ end.parse!
 # Main
 # --------------------------------------------------------- #
 
-config      = MPW::Config.new(options[:config])
-check_error = config.checkconfig
-
-cli = Cli.new(config)
+config = MPW::Config.new(options[:config])
+cli    = MPW::Cli.new(config, options[:sync])
 	
 # Setup a new config 
-if not check_error or not options[:setup].nil?
+if not config.is_valid? or not options[:setup].nil?
 	cli.setup(lang)
 elsif not config.check_gpg_key?
 	cli.setup_gpg_key
 end
 
+cli.get_wallet(options[:wallet])
 cli.decrypt
-cli.sync(options[:sync])
 
 # Display the item's informations
 if not options[:show].nil?
 	opts = {search:    options[:show],
 	        group:     options[:group],
-	        protocol:  options[:protocol],
 	       }
 
 	cli.display(opts)
 
 # Remove an item
-elsif not options[:delete].nil?
-	cli.delete(options[:delete], options[:force])
+elsif not options[:delete].nil? and not options[:id].nil?
+	cli.delete(options[:id], options[:force])
 
 # Update an item
-elsif not options[:update].nil?
-	cli.update(options[:update])
+elsif not options[:update].nil? and not options[:id].nil?
+	cli.update(options[:id])
 
 # Add a new item
-elsif not options[:add].nil?
+elsif not options[:add].nil? and options[:key].nil?
 	cli.add
 
+# Add a new public key in wallet
+elsif not options[:add].nil? and not options[:key].nil?
+	cli.add_key(options[:key], options[:file])
+
+# Delete a public key in wallet
+elsif not options[:delete].nil? and not options[:key].nil?
+	cli.delete_key(options[:key])
+
 # Export
-elsif not options[:export].nil?
-	cli.export(options[:export], options[:type])
+elsif not options[:export].nil? and not options[:file].nil?
+	cli.export(options[:file])
 
 # Add a new item
-elsif not options[:import].nil?
-	cli.import(options[:import], options[:type], options[:force])
+elsif not options[:import].nil? and not options[:file].nil?
+	cli.import(options[:file])
+
+# Setup wallet config
+elsif not options[:setup_wallet].nil?
+	cli.setup_wallet_config
 
-# Interactive mode
 end
 
 cli = nil

data/i18n/{cli/en.yml → en.yml}

@@ -1,8 +1,6 @@
 ---
 en:
   error:
-    client:
-      no_authorized: "You aren't authorized."
     config:
       write: "Can't write the config file!"
       check: "Checkconfig failed!"
@@ -14,52 +12,56 @@ en:
         password: "You must define a password for your GPG key!"
     delete:
       id_no_exist: "Can't delete the item %{id}, it doesn't exist!"
-    export:
-      unknown_type: "The data type %{type} is unknown!"
-      write: "Can't export, unable to write in %{file}!"
+    export: "Can't export, unable to write in %{file}!"
     gpg_file: 
       decrypt: "Can't decrypt file!"
       encrypt: "Can't encrypt the GPG file!"
-    import:
-      bad_format: "Can't import, the file is badly formated!"
-      read: "Can't import, unable to read %{file}!"
+    mpw_file: 
+      read_data: "Can't to read the MPW file!"
+      write_data: "Can't to write the MPW file!"
+    import: "Can't import, unable to read %{file}!"
     update:
       name_empty: "You must define a name!"
     sync: 
+      general: "An error is appeared durint the sync"
       connection: "Connection fail!"
       communication: "A communication problem with the server is appeared!"
       download: "Can't download the file!"
       not_authorized: "You haven't the access to remote file!"
       upload: "Can't upload the file on the server!"
-      unknown: "An unknown error is occured!" 
-    unknown_type: "The sync type is unknown" 
+      unknown: "An unknown error is occured!"
+      unknown_type: "The sync type is unknown"
 
   warning:
     select: 'Your choice is not a valid element!'
 
   option:
-    usage: "Usage"
-    show: "Search and show the items"
-    show_all: "Show all items"
-    update: "Update an item"
-    remove: "Delete an item"
-    group: "Search the items with specified group"
-    add: "Add an item"
+    add: "Add an item or key"
     config: "Specify the configuration file to use"
-    setup: "Create a new configuration file" 
-    protocol: "Select the items with the specified protocol"
-    export: "Export all items in a file"
-    type: "Data's type export file [csv|yaml]"
-    import: "Import item since a yaml or csv file"
-    force: "Force an action"
-    no_sync: "Disable synchronization with the server"
-    format: "Change the display items format by an alternative format"
+    export: "Export a wallet in an yaml file"
+    file: "Specify a file, to use with the options [--import | --export | --add]"
+    force: "No ask to confirm when you delete an item"
     generate_password: "Generate a random password (default 8 characters)"
+    group: "Search the items with specified group"
     help: "Show this help message"
+    id: "Specify an id, to use with the options [--delete | --update]"
+    import: "Import item since a yaml file"
+    key: "Specify the key name, to use with the options [--add | --delete | --update]"
+    no_sync: "Disable synchronization with the server"
+    setup: "Create a new configuration file" 
+    setup_wallet: "Create a new configuration file for a wallet"
+    show: "Search and show the items"
+    show_all: "Show all items"
+    remove: "Delete an item"
+    update: "Update an item"
+    usage: "Usage"
+    wallet: "Specify a wallet to use"
 
   form:
     select: "Select the item: "
-    add:
+    add_key:
+      valid: "Key has been added!"
+    add_item:
       title: "Add a new item"
       name: "Enter the name: "
       group: "Enter the group (optional): "
@@ -70,7 +72,9 @@ en:
       port: "Enter the connection port (optional): "
       comment: "Enter a comment (optional): "
       valid: "Item has been added!"
-    delete:
+    delete_key:
+      valid: "Key has been deleted!"
+    delete_item:
       ask: "Are you sure you want to remove the item %{id} ?"
       valid: "The item %{id} has been removed!"
       not_valid: "The item %{id} hasn't been removed, because it doesn't exist!"
@@ -78,20 +82,21 @@ en:
       ask: "Are you sure you want to import this file %{file} ?"
       valid: "The import is succesfull!"
       not_valid: "No data to import!"
-    setup:
+    setup_config:
       title: "Setup a new config file"
-      lang: "Choose your language (en, fr, ...): "
-      gpg_key: "Enter the GPG key: " 
-      share_gpg_keys: "Enter the GPG keys with who you want to share the passwords: " 
-      gpg_file: "Enter the path to encrypt file [default=%{home}/db/default.gpg]: "
-      timeout: "Enter the timeout (in seconde) to GPG password [default=60]: "
-      sync_type: "Synchronization type (mpw, ssh, ftp, or nil): "
+      lang: "Choose your language (en, fr, ...) [default=%{lang}]: "
+      gpg_key: "Enter the GPG key [ex: test@host.local]: " 
+      wallet_dir: "Enter the wallets's folder path [default=%{home}/wallets]: "
+      valid: "The config file has been created!"
+    setup_wallet:
+      title: "Wallet setup"
+      sync_type: "Synchronization type (ssh, ftp, or nil): "
       sync_host: "Synchronization server: "
       sync_port: "Port of the synchronization server: "
       sync_user: "Username for the synchronization: "
       sync_pwd: "Password for the synchronization: "
       sync_path: "File path for the synchronization : "
-      valid: "The config file has been created!"
+      valid: "The wallet config file has been created!"
     setup_gpg_key:
       title: "Setup a GPG key"
       ask: "Do you want create your GPG key ? (Y/n)"
@@ -104,7 +109,7 @@ en:
       expire: "Expire time of the GPG key [default=0 (unlimited)]: "
       wait: "Please waiting during the GPG key generate, this process can take few minutes."
       valid: "Your GPG key has been created ;-)"
-    update:
+    update_item:
       title: "Update an item"
       name: "Enter the name [%{name}]: "
       group: "Enter the group [%{group}]: "
@@ -121,28 +126,17 @@ en:
   display:
     comment: "Comment"
     error: "ERROR"
-    gpg_password: "Password GPG: "
+    gpg_password: "GPG passphrase: "
     group: "Group"
     login: "Login"
     name: "Name"
-    nothing: "Nothing result!"
+    nothing: "No matches!"
     password: "Password"
     port: "Port"
     protocol: "Protocol"
     server: "Server"
     warning: "Warning"
 
-  ssh:
-    option:
-      usage: "Usage"
-      login: "Change the login"
-      server: "Change the host or the ip"
-      port: "Change the port"
-      help: "Show this help message"
-    display:
-      connect: "Connection to:"
-      nothing: "Nothing result!"
-
   formats:
     default: ! '%Y-%m-%d'
     long: ! '%B %d, %Y'