mpw 3.2.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ff318ce8061073b24eabf8281fe0788d18013fc
-  data.tar.gz: 16c7121ac2fba8ce8815756c6de92434aed846f0
+  metadata.gz: 449a8603fbd577dd5cb93ef7beefb0b8e9c45825
+  data.tar.gz: 763ee9163b7d0abac719853bdf48fa3b4a10ec7d
 SHA512:
-  metadata.gz: 67d566ca822ca103f1e3e1dd13dacfadfa2e78f8550751cb64f54df182fcc101f54eadab2d5682731025c7ecff4cbff56e698701ded4906b2fee25608d0db6c6
-  data.tar.gz: c248a9fd67592cb63fe4957946941c38bf2939cad89171074a4c1125a4e417a26060bf2c61d3f39a5c3b7f41f7122c22d5458560b61618f570568e2c2daeedbe
+  metadata.gz: f843a0c0918d63864f01c7929736f75f60bbe97ac3de0b0588b10bc90b50e87abf7f155622653c19947caa11648ac1147e88a38ff8a8756593020fb976d10d50
+  data.tar.gz: 571dc0eb3daa1d425f4ceae5137f1cfc41017828335d6b8fe081428c9d6bd7713badfee3cec0cc49fe45512305bcb176555c6c412c1dc8e13100b35e609b14e5

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+*.gem

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+rvm:
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
+  - 2.1.10
+install:
+  - bundle install
+  - gem install 'test-unit'
+  - echo 9999 > VERSION
+  - gem build mpw.gemspec
+  - gem install mpw-9999.gem
+script:
+  - ruby ./test/tests.rb 

data/CHANGELOG.md

@@ -0,0 +1,56 @@
+# CHANGELOG
+## v4.0.0
+
+ * feature: set default wallet
+ * add option for generate a random password when you update an item
+ * fix encryption when you share an existing wallet
+ * several bugs fix
+
+## v4.0.0-beta1
+
+ * add manage share key with new interface
+
+## v4.0.0-beta
+
+ * new interface with a table
+ * new command line interface
+ * use text editor for add or update an item
+ * fix generate gpg key with RSA
+ * several bugs fix
+ * add unit tests
+
+## v3.2.1
+
+ * fix bug when add a new item
+
+## v3.2.0
+
+ * add support OTP
+ * fix bug in synchronize
+ * improve interface
+
+## v3.1.0
+
+ * add clipboard
+ * can change gpg version
+ * minor change in interface
+ * several bugs fix
+
+## v3.0.0
+
+ * new storage format
+ * new share system
+ * remove MPW server
+
+## v2.0.0
+
+ * change format csv to yaml
+ * easy install with gem
+ * add sync with ftp and ssh
+ * many improvement
+
+## v1.1.0
+
+ * Add sync with MPW Server
+ * Add MPW Server
+ * Fix minors bugs

data/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
-gem 'highline'
-gem 'i18n'
-gem 'locale'
-gem 'gpgme'
-gem 'colorize'
-gem 'net-ssh'
-gem 'net-scp'
-gem 'clipboard'
-gem 'rotp'
+gem "i18n",      "~> 0.7", ">= 0.7.0"
+gem "gpgme",     "~> 2.0", ">= 2.0.12"
+gem "highline",  "~> 1.7", ">= 1.7.8"
+gem "locale",    "~> 2.1", ">= 2.1.2"
+gem "colorize",  "~> 0.8", ">= 0.8.1"
+gem "net-ssh",   "~> 3.2", ">= 3.2.0"
+gem "net-sftp",  "~> 2.1", ">= 2.1.2"
+gem "clipboard", "~> 1.1", ">= 1.1.1"
+gem "rotp",      "~> 3.1", ">= 3.1.0"

data/README.md

@@ -1,128 +1,147 @@
-# Manage your passwords!
+# MPW: Manage your passwords!
+[![Version](https://img.shields.io/badge/latest_version-4.0.0-green.svg)](https://github.com/nishiki/manage-password/releases)
+[![Build Status](https://travis-ci.org/nishiki/manage-password.svg?branch=master)](https://travis-ci.org/nishiki/manage-password)
+[![License](https://img.shields.io/badge/license-GPL--2.0-blue.svg)](https://github.com/nishiki/manage-password/blob/master/LICENSE)
 
-MPW is a little software which stores your passwords in an GPG encrypted file.
-MPW can synchronize your password with SSH or FTP.
+mpw is a little software which stores your passwords in [GnuPG](http://www.gnupg.org/) encrypted files.
 
-# Installation
+## Features
 
-This program work with ruby >= 2.0
+ * generate random password
+ * generate OTP code
+ * copy your login, password or otp in clipboard
+ * manage many wallets
+ * synchronize your passwords with SSH or FTP.
+ * share a wallet with others GPG keys
 
-* install ruby and rubygems on your computer
-* install xclip
-* gem install mpw
+## Install
 
-# How to use
+On debian or ubuntu:
+```
+apt install ruby ruby-dev xclip
+gem install mpw
+```
+
+## How to use
+### First steps
+
+Initialize your first wallet:
+```
+mpw config --init user@host.com
+```
 
-* Show help
+Add your first item:
 ```
-mpw --help
+mpw add
 ```
 
-* Setup a new config file
+And list your items:
 ```
-mpw --setup
-mpw --setup --config /path/conf/file.cfg
+mpw list
+```
+or search an item with
+```
+mpw list --pattern Da
+mpw list --group bank
 ```
 
-* Create and setup a new wallet
+Output:
 ```
-mpw --setup-wallet --wallet new_wallet_name
-mpw --setup-wallet --wallet new_wallet_name --config /path/conf/file.cfg 
+Bank
+ ==============================================================================
+  ID | Host          | User      | Protocol | Port | OTP | Comment                
+ ==============================================================================
+  1  | bank.com      | 1234456   | https    |      |  X  |                        
+
+Linux
+ ==============================================================================
+  ID | Host          | User      | Protocol | Port | OTP | Comment                
+ ==============================================================================
+  2  | linuxfr.org   | example   | https    |      |     | Da Linux French Site
+
 ```
 
-* Add a GPG key in wallet
+Copy a password, login or OTP code:
 ```
-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
+mpw copy -p linuxfr
 ```
 
-* Add a new  GPG key in wallet
+Update an item:
 ```
-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
+mpw update -p linuxfr
 ```
 
-* Delete a GPG key in wallet
+Delete an item:
 ```
-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 
+mpw delete -p linuxfr
 ```
 
-* Add a new item in wallet
+### Manage wallets
+
+List all available wallets:
 ```
-mpw --add 
-mpw --add --config /path/conf/file.cfg
-mpw --add --wallet wallet_name
-mpw --add --config /path/conf/file.cfg --wallet wallet_name
+mpw wallet --list
 ```
 
-* Update an item
+Create an other wallet:
 ```
-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
+mpw config --wallet work --init user@host.com
 ```
 
-* Delete an item
+List all GPG keys in wallet:
 ```
-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
+mpw wallet --list-keys [--wallet NAME]
 ```
 
-* Show an item
+Share with an other GPG key:
 ```
-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
+mpw wallet --add-gpg-key test42@localhost.com
+ or
+mpw wallet --add-gpg-key /path/to/file
 ```
 
-* Export data in YAML file
+Remove a GPG key:
 ```
-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
+mpw wallet --delete-gpg-key test42@localhost.com
 ```
 
-* Import data from YAML file
+Add synchronize:
 ```
-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
+mpw wallet --protocol ssh --host example.com --user test --path /remote/path --password
 ```
 
-Format file to import:
+### Export and import data
+
+You can export your data in yaml file with your passwords in clear text:
 ```
+mpw export --file export.yml
+```
+
+Import data from an yaml file:
+```
+mpw import --file import.yml
+```
+
+Example yaml file for mpw:
+
+```
+---
 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
+  host: bank.com
+  user: 123456
+  group: Bank
+  password: secret
   protocol: https
-  user: test
-  password: coucou 
   port: 
+  otp_key: 1afg34
   comment: 
+2:
+  host: linuxfr.org
+  user: example
+  group: 
+  password: 'complex %- password'
+  protocol: https
+  port: 
+  otp_key: 
+  comment: Da Linux French Site
 ```

data/VERSION

@@ -1 +1 @@
-3.2.1
+4.0.0

data/bin/mpw

@@ -18,13 +18,10 @@
 
 $: << File.expand_path('../../lib', __FILE__)
 
-require 'optparse'
 require 'locale'
 require 'set'
 require 'i18n'
-require 'mpw/mpw'
-require 'mpw/config'
-require 'mpw/cli'
+require 'colorize'
 
 # --------------------------------------------------------- #
 # Set local
@@ -45,195 +42,28 @@ I18n.locale         = lang.to_sym
 # Options
 # --------------------------------------------------------- #
 
-options_password    = {}
-options             = {}
-options[:force]     = false
-options[:otp]       = false
-options[:sync]      = true
-options[:clipboard] = true
-options[:editor]    = false
-options[:group]     = nil
-options[:config]    = nil
-options[:wallet]    = nil
+bin_dir = File.dirname(__FILE__)
+command = "#{bin_dir}/mpw-#{ARGV[0]}"
+
+if Dir.glob("#{bin_dir}/mpw-*").include?("#{command}")
+	begin
+		Kernel.load(command)
+	rescue OptionParser::ParseError => e
+		puts "#{I18n.t('display.error')}: #{e}".red
+	end
+else
+	puts "#{I18n.t('option.usage')}: mpw COMMAND [options]\n\n"
+	puts 'Commands:'
+	puts "  add       #{I18n.t('command.add')}"
+	puts "  config    #{I18n.t('command.config')}"
+	puts "  copy      #{I18n.t('command.copy')}"
+	puts "  delete    #{I18n.t('command.delete')}"
+	puts "  export    #{I18n.t('command.export')}"
+	puts "  genpwd    #{I18n.t('command.genpwd')}"
+	puts "  import    #{I18n.t('command.import')}"
+	puts "  list      #{I18n.t('command.list')}"
+	puts "  update    #{I18n.t('command.update')}"
+	puts "  wallet    #{I18n.t('command.wallet')}"
 
-OptionParser.new do |opts|
-	opts.banner = "#{I18n.t('option.usage')}: mpw [options]"
-
-	opts.on('-a', '--add', I18n.t('option.add')) do
-		options[:add] = true
-	end
-
-	opts.on('-A', '--show-all', I18n.t('option.show_all')) do
-		options[:type] = nil
-		options[:show] = ''
-	end
-
-	opts.on('-c', '--config CONFIG', I18n.t('option.config')) do |config|
-		options[:config] = config
-	end
-
-	opts.on('-C', '--no-clipboard', I18n.t('option.clipboard')) do
-		options[:clipboard] = false
-	end
-
-	opts.on('-d', '--delete', I18n.t('option.remove')) do
-		options[:delete] = true
-	end
-
-	opts.on('-e', '--export', I18n.t('option.export')) do
-		options[:export] = true
-	end
-
-	opts.on('-E', '--editor', I18n.t('option.editor')) do
-		options[:editor] = true
-	end
-
-	opts.on('-f', '--file FILE', I18n.t('option.file')) do |file|
-		options[:file] = file
-	end
-
-	opts.on('-F', '--force', I18n.t('option.force')) do
-		options[:force] = true
-	end
-
-	opts.on('-g', '--group GROUP', I18n.t('option.group')) do |group|
-		options[:group] = group
-	end
-
-	opts.on('-G', '--generate-password [LENGTH]', I18n.t('option.generate_password')) do |length|
-		options_password[:length] = length
-	end
-
-	opts.on('-h', '--help', I18n.t('option.help')) do
-		puts opts
-		exit 0
-	end
-
-	opts.on('-i', '--id ID', I18n.t('option.id')) do |id|
-		options[:id] = id
-	end
-
-	opts.on('-I', '--import', I18n.t('option.import')) do
-		options[:import] = true
-	end
-
-	opts.on('-k', '--key KEY', I18n.t('option.key')) do |key|
-		options[:key] = key
-	end
-
-	opts.on('-n', '--numeric', I18n.t('option.numeric')) do
-		options_password[:numeric] = true
-	end
-
-	opts.on('-N', '--no-sync', I18n.t('option.no_sync')) do
-		options[:sync] = false
-	end
-
-	opts.on('-O', '--otp', I18n.t('option.otp')) do
-		options[:otp] = true
-	end
-
-	opts.on('-s', '--show [SEARCH]', I18n.t('option.show')) do |search|
-		search.nil? ? (options[:show]  = '')  : (options[:show] = search)
-	end
-
-	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
-
-	opts.on('-x', '--special-chars', I18n.t('option.special_chars')) do
-		options_password[:special] = true
-	end
-
-	opts.on('-y', '--alpha', I18n.t('option.alpha')) do
-		options_password[:alpha] = true
-	end
-end.parse!
-
-# --------------------------------------------------------- #
-# Main
-# --------------------------------------------------------- #
-
-# Generate password
-if not options_password.empty?
-	puts MPW::MPW::password(options_password)
-	exit 0
-end
-
-begin
-	config = MPW::Config.new(options[:config])
-	cli    = MPW::Cli.new(config, options[:clipboard], options[:sync], options[:otp])
-		
-	# Setup a new config 
-	if not options[:setup].nil?
-		cli.setup(lang)
-		exit 0
-	end
-
-	cli.setup(lang)   if not config.is_valid?
-	cli.setup_gpg_key if not config.check_gpg_key?
-	
-	cli.get_wallet(options[:wallet])
-	cli.decrypt
-	
-	# Display the item's informations
-	if not options[:show].nil?
-		opts = {search:    options[:show],
-		        group:     options[:group],
-		       }
-	
-		cli.display(opts)
-	
-	# Remove an item
-	elsif not options[:delete].nil? and not options[:id].nil?
-		cli.delete(options[:id], options[:force])
-	
-	# Update an item
-	elsif not options[:update].nil? and not options[:id].nil?
-		cli.update(options[:id])
-	
-	# Add a new item
-	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? and not options[:file].nil?
-		cli.export(options[:file])
-	
-	# Add a new item
-	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
-	
-	end
-	
-	cli = nil
-	
-	exit 0
-
-rescue SystemExit, Interrupt
 	exit 3
 end

data/bin/mpw-add

@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+# 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 'optparse'
+require 'mpw/config'
+require 'mpw/cli'
+
+# --------------------------------------------------------- #
+# Options
+# --------------------------------------------------------- #
+
+options        = {}
+options[:sync] = true
+
+OptionParser.new do |opts|
+	opts.banner = "#{I18n.t('option.usage')}: mpw add [options]"
+
+	opts.on('-c', '--config PATH', I18n.t('option.config')) do |config|
+		options[:config] = config
+	end
+
+	opts.on('-h', '--help', I18n.t('option.help')) do
+		puts opts
+		exit 0
+	end
+
+	opts.on('-n', '--no-sync', I18n.t('option.no_sync')) do
+		options[:sync] = false
+	end
+
+	opts.on('-r', '--random', I18n.t('option.random_password')) do
+		options[:password] = true
+	end
+
+	opts.on('-w', '--wallet NAME', I18n.t('option.wallet')) do |wallet|
+		options[:wallet] = wallet
+	end
+end.parse!
+
+config = MPW::Config.new(options[:config])
+cli    = MPW::Cli.new(config, options[:sync])
+
+cli.load_config
+cli.get_wallet(options[:wallet])
+cli.decrypt
+cli.add(options[:password])