mpw 4.0.0 → 4.1.0

data/lib/mpw/config.rb

@@ -1,17 +1,17 @@
 #!/usr/bin/ruby
 # MPW is a software to crypt and manage your passwords
-# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
-# 
+# Copyright (C) 2017  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.
@@ -20,140 +20,169 @@ require 'gpgme'
 require 'yaml'
 require 'i18n'
 require 'fileutils'
-	
+
 module MPW
-class Config
-	
-	attr_accessor :error_msg
-
-	attr_accessor :gpg_key
-	attr_accessor :lang
-	attr_accessor :config_dir
-	attr_accessor :default_wallet
-	attr_accessor :wallet_dir
-	attr_accessor :gpg_exe
-	attr_accessor :password
-
-	# Constructor
-	# @args: config_file -> the specify config file
-	def initialize(config_file=nil)
-		@config_file = config_file
-
-		if /darwin/ =~ RUBY_PLATFORM
-			@config_dir = "#{Dir.home}/Library/Preferences/mpw"
-		elsif /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-			@config_dir = "#{Dir.home}/AppData/Local/mpw"
-		else 
-			@config_dir = "#{Dir.home}/.config/mpw"
-		end
-		
-		@config_file = "#{@config_dir}/mpw.cfg" if @config_file.nil? or @config_file.empty?
-	end
-
-	# Create a new config file
-	# @args: options -> hash with values
-	# @rtrn: true if le config file is create
-	def setup(options)
-		gpg_key        = options[:gpg_key]        || @gpg_key
-		lang           = options[:lang]           || @lang
-		wallet_dir     = options[:wallet_dir]     || @wallet_dir
-		default_wallet = options[:default_wallet] || @default_wallet
-		gpg_exe        = options[:gpg_exe]        || @gpg_exe
-		password       = { numeric: true,
-		                   alpha:   true,
-		                   special: false,
-		                   length:  16,
-		                 }
-
-		['numeric', 'special', 'alpha', 'length'].each do |k|
-			if options.has_key?("pwd_#{k}".to_sym)
-				password[k.to_sym] = options["pwd_#{k}".to_sym]
-			elsif not @password.nil? and @password.has_key?(k.to_sym)
-				password[k.to_sym] = @password[k.to_sym]
-			end
-		end
-
-		if not gpg_key =~ /[a-zA-Z0-9.-_]+\@[a-zA-Z0-9]+\.[a-zA-Z]+/
-			raise I18n.t('error.config.key_bad_format')
-		end
-
-		wallet_dir = "#{@config_dir}/wallets" if wallet_dir.to_s.empty?
-		config     = { 'gpg_key'        => gpg_key,
-		               'lang'           => lang,
-		               'wallet_dir'     => wallet_dir,
-		               'default_wallet' => default_wallet,
-		               'gpg_exe'        => gpg_exe,
-		               'password'       => password,
-		             }
-
-		FileUtils.mkdir_p(@config_dir, mode: 0700)
-		FileUtils.mkdir_p(wallet_dir,  mode: 0700)
-
-		File.open(@config_file, 'w') do |file|
-			file << config.to_yaml
-		end
-	rescue Exception => e 
-		raise "#{I18n.t('error.config.write')}\n#{e}"
-	end
-
-	# Setup a new gpg key
-	# @args: password -> the GPG key password
-	#        name -> the name of user
-	#        length -> length of the GPG key
-	#        expire -> the time of expire to GPG key
-	# @rtrn: true if the GPG key is create, else false
-	def setup_gpg_key(password, name, length = 4096, expire = 0)
-		if name.to_s.empty?
-			raise "#{I18n.t('error.config.genkey_gpg.name')}"
-		elsif password.to_s.empty?
-			raise "#{I18n.t('error.config.genkey_gpg.password')}"
-		end
-
-		param = ''
-		param << '<GnupgKeyParms format="internal">' + "\n"
-		param << "Key-Type: RSA\n"  
-		param << "Key-Length: #{length}\n"
-		param << "Subkey-Type: ELG-E\n"
-		param << "Subkey-Length: #{length}\n"
-		param << "Name-Real: #{name}\n"
-		param << "Name-Comment: #{name}\n"
-		param << "Name-Email: #{@gpg_key}\n"
-		param << "Expire-Date: #{expire}\n"
-		param << "Passphrase: #{password}\n"
-		param << "</GnupgKeyParms>\n"
-
-		ctx = GPGME::Ctx.new
-		ctx.genkey(param, nil, nil)
-	rescue Exception => e
-		raise "#{I18n.t('error.config.genkey_gpg.exception')}\n#{e}"
-	end
-
-	# Load the config file
-	def load_config
-		config          = YAML::load_file(@config_file)
-		@gpg_key        = config['gpg_key']
-		@lang           = config['lang']
-		@wallet_dir     = config['wallet_dir']
-		@default_wallet = config['default_wallet']
-		@gpg_exe        = config['gpg_exe']
-		@password       = config['password'] || {}
-
-		raise if @gpg_key.empty? or @wallet_dir.empty?
-			
-		I18n.locale = @lang.to_sym
-	rescue Exception => e
-		raise "#{I18n.t('error.config.load')}\n#{e}"
-	end
-
-	# Check if private key exist
-	# @rtrn: true if the key exist, else false
-	def check_gpg_key?
-		ctx = GPGME::Ctx.new
-		ctx.each_key(@gpg_key, true) do
-			return true
-		end
-
-		return false
-	end
-end
+  class Config
+    attr_accessor :error_msg
+
+    attr_accessor :gpg_key
+    attr_accessor :lang
+    attr_accessor :config_dir
+    attr_accessor :default_wallet
+    attr_accessor :wallet_dir
+    attr_accessor :wallet_paths
+    attr_accessor :gpg_exe
+    attr_accessor :password
+    attr_accessor :pinmode
+
+    # Constructor
+    # @args: config_file -> the specify config file
+    def initialize(config_file = nil)
+      @config_file = config_file
+      @config_dir  =
+        if /darwin/ =~ RUBY_PLATFORM
+          "#{Dir.home}/Library/Preferences/mpw"
+        elsif /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+          "#{Dir.home}/AppData/Local/mpw"
+        else
+          "#{Dir.home}/.config/mpw"
+        end
+
+      @config_file = "#{@config_dir}/mpw.cfg" if @config_file.to_s.empty?
+    end
+
+    # Create a new config file
+    # @args: options -> hash with values
+    # @rtrn: true if le config file is create
+    def setup(**options)
+      gpg_key        = options[:gpg_key]        || @gpg_key
+      lang           = options[:lang]           || @lang
+      wallet_dir     = options[:wallet_dir]     || @wallet_dir
+      default_wallet = options[:default_wallet] || @default_wallet
+      gpg_exe        = options[:gpg_exe]        || @gpg_exe
+      pinmode        = options[:pinmode]        || @pinmode
+      password       = { numeric: true,
+                         alpha:   true,
+                         special: false,
+                         length:  16 }
+
+      %w[numeric special alpha length].each do |k|
+        if options.key?("pwd_#{k}".to_sym)
+          password[k.to_sym] = options["pwd_#{k}".to_sym]
+        elsif !@password.nil? && @password.key?(k.to_sym)
+          password[k.to_sym] = @password[k.to_sym]
+        end
+      end
+
+      unless gpg_key =~ /[a-zA-Z0-9.-_]+\@[a-zA-Z0-9]+\.[a-zA-Z]+/
+        raise I18n.t('error.config.key_bad_format')
+      end
+
+      wallet_dir = "#{@config_dir}/wallets" if wallet_dir.to_s.empty?
+      config     = { 'gpg_key'        => gpg_key,
+                     'lang'           => lang,
+                     'wallet_dir'     => wallet_dir,
+                     'default_wallet' => default_wallet,
+                     'gpg_exe'        => gpg_exe,
+                     'password'       => password,
+                     'pinmode'        => pinmode,
+                     'wallet_paths'   => @wallet_paths }
+
+      FileUtils.mkdir_p(@config_dir, mode: 0700)
+      FileUtils.mkdir_p(wallet_dir,  mode: 0700)
+
+      File.open(@config_file, 'w') do |file|
+        file << config.to_yaml
+      end
+    rescue => e
+      raise "#{I18n.t('error.config.write')}\n#{e}"
+    end
+
+    # Setup a new gpg key
+    # @args: password -> the GPG key password
+    #        name -> the name of user
+    #        length -> length of the GPG key
+    #        expire -> the time of expire to GPG key
+    # @rtrn: true if the GPG key is create, else false
+    def setup_gpg_key(password, name, length = 4096, expire = 0)
+      raise I18n.t('error.config.genkey_gpg.name') if name.to_s.empty?
+      raise I18n.t('error.config.genkey_gpg.password') if password.to_s.empty?
+
+      param = ''
+      param << '<GnupgKeyParms format="internal">' + "\n"
+      param << "Key-Type: RSA\n"
+      param << "Key-Length: #{length}\n"
+      param << "Subkey-Type: ELG-E\n"
+      param << "Subkey-Length: #{length}\n"
+      param << "Name-Real: #{name}\n"
+      param << "Name-Comment: #{name}\n"
+      param << "Name-Email: #{@gpg_key}\n"
+      param << "Expire-Date: #{expire}\n"
+      param << "Passphrase: #{password}\n"
+      param << "</GnupgKeyParms>\n"
+
+      ctx = GPGME::Ctx.new
+      ctx.genkey(param, nil, nil)
+    rescue => e
+      raise "#{I18n.t('error.config.genkey_gpg.exception')}\n#{e}"
+    end
+
+    # Load the config file
+    def load_config
+      config          = YAML.load_file(@config_file)
+      @gpg_key        = config['gpg_key']
+      @lang           = config['lang']
+      @wallet_dir     = config['wallet_dir']
+      @wallet_paths   = config['wallet_paths'] || {}
+      @default_wallet = config['default_wallet']
+      @gpg_exe        = config['gpg_exe']
+      @password       = config['password'] || {}
+      @pinmode        = config['pinmode']
+
+      raise if @gpg_key.empty? || @wallet_dir.empty?
+
+      I18n.locale = @lang.to_sym
+    rescue => e
+      raise "#{I18n.t('error.config.load')}\n#{e}"
+    end
+
+    # Check if private key exist
+    # @rtrn: true if the key exist, else false
+    def check_gpg_key?
+      ctx = GPGME::Ctx.new
+      ctx.each_key(@gpg_key, true) do
+        return true
+      end
+
+      false
+    end
+
+    # Change the path of one wallet
+    # @args: path -> the new directory path
+    #        wallet -> the wallet name
+    def set_wallet_path(path, wallet)
+      path = @wallet_dir if path == 'default'
+
+      return if path == @wallet_dir && File.exist?("#{@wallet_dir}/#{wallet}.mpw")
+      return if path == @wallet_paths[wallet]
+
+      old_wallet_file =
+        if @wallet_paths.key?(wallet)
+          "#{@wallet_paths[wallet]}/#{wallet}.mpw"
+        else
+          "#{@wallet_dir}/#{wallet}.mpw"
+        end
+
+      FileUtils.mkdir_p(path) unless Dir.exist?(path)
+      FileUtils.mv(old_wallet_file, "#{path}/#{wallet}.mpw") if File.exist?(old_wallet_file)
+
+      if path == @wallet_dir
+        @wallet_paths.delete(wallet)
+      else
+        @wallet_paths[wallet] = path
+      end
+
+      setup
+    end
+  end
 end

data/lib/mpw/item.rb

@@ -1,109 +1,102 @@
 #!/usr/bin/ruby
 # MPW is a software to crypt and manage your passwords
-# Copyright (C) 2016  Adrien Waksberg <mpw@yae.im>
-# 
+# Copyright (C) 2017  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 'i18n'
-	
-module MPW
-class Item
 
-	attr_accessor :id
-	attr_accessor :group
-	attr_accessor :host
-	attr_accessor :protocol
-	attr_accessor :user
-	attr_accessor :port
-	attr_accessor :otp
-	attr_accessor :comment
-	attr_accessor :last_edit
-	attr_accessor :last_sync
-	attr_accessor :created
+module MPW
+  class Item
+    attr_accessor :id
+    attr_accessor :group
+    attr_accessor :host
+    attr_accessor :protocol
+    attr_accessor :user
+    attr_accessor :port
+    attr_accessor :otp
+    attr_accessor :comment
+    attr_accessor :last_edit
+    attr_accessor :created
 
-	# Constructor
-	# Create a new item
-	# @args: options -> a hash of parameter
-	# raise an error if the hash hasn't the key name 
-	def initialize(options={})
-		if not options.has_key?(:host) or options[:host].to_s.empty?
-			raise I18n.t('error.update.host_empty')
-		end
+    # Constructor
+    # Create a new item
+    # @args: options -> a hash of parameter
+    # raise an error if the hash hasn't the key name
+    def initialize(**options)
+      if !options.key?(:host) || options[:host].to_s.empty?
+        raise I18n.t('error.update.host_empty')
+      end
 
-		if not options.has_key?(:id) or options[:id].to_s.empty? or not options.has_key?(:created) or options[:created].to_s.empty?
-			@id = generate_id
-			@created = Time.now.to_i
-		else
-			@id = options[:id]
-			@created   = options[:created]
-			@last_edit = options[:last_edit]
-			options[:no_update_last_edit] = true
-		end
+      if !options.key?(:id) || options[:id].to_s.empty? || !options.key?(:created) || options[:created].to_s.empty?
+        @id = generate_id
+        @created = Time.now.to_i
+      else
+        @id = options[:id]
+        @created   = options[:created]
+        @last_edit = options[:last_edit]
+        options[:no_update_last_edit] = true
+      end
 
-		update(options)
-	end
+      update(options)
+    end
 
-	# Update the item
-	# @args: options -> a hash of parameter
-	def update(options={})
-		if options.has_key?(:host) and options[:host].to_s.empty?
-			raise I18n.t('error.update.host_empty')
-		end
+    # Update the item
+    # @args: options -> a hash of parameter
+    def update(**options)
+      if options.key?(:host) && options[:host].to_s.empty?
+        raise I18n.t('error.update.host_empty')
+      end
 
-		@group     = options[:group]      if options.has_key?(:group)
-		@host      = options[:host]       if options.has_key?(:host)
-		@protocol  = options[:protocol]   if options.has_key?(:protocol)
-		@user      = options[:user]       if options.has_key?(:user)
-		@port      = options[:port].to_i  if options.has_key?(:port) and not options[:port].to_s.empty?
-		@otp       = options[:otp]        if options.has_key?(:otp)
-		@comment   = options[:comment]    if options.has_key?(:comment)
-		@last_edit = Time.now.to_i        if not options.has_key?(:no_update_last_edit)
-	end
+      @group     = options[:group]      if options.key?(:group)
+      @host      = options[:host]       if options.key?(:host)
+      @protocol  = options[:protocol]   if options.key?(:protocol)
+      @user      = options[:user]       if options.key?(:user)
+      @port      = options[:port].to_i  if options.key?(:port) && !options[:port].to_s.empty?
+      @otp       = options[:otp]        if options.key?(:otp)
+      @comment   = options[:comment]    if options.key?(:comment)
+      @last_edit = Time.now.to_i        unless options.key?(:no_update_last_edit)
+    end
 
-	# Update last_sync
-	def set_last_sync
-		@last_sync = Time.now.to_i
-	end
+    # Delete all data
+    def delete
+      @id        = nil
+      @group     = nil
+      @host      = nil
+      @protocol  = nil
+      @user      = nil
+      @port      = nil
+      @otp       = nil
+      @comment   = nil
+      @created   = nil
+      @last_edit = nil
+    end
 
-	# Delete all data
-	def delete
-		@id        = nil
-		@group     = nil
-		@host      = nil
-		@protocol  = nil
-		@user      = nil
-		@port      = nil
-		@otp       = nil
-		@comment   = nil
-		@created   = nil
-		@last_edit = nil
-		@last_sync = nil
-	end
+    def empty?
+      @id.to_s.empty?
+    end
 
-	def empty?
-		return @id.to_s.empty?
-	end
+    def nil?
+      false
+    end
 
-	def nil?
-		return false
-	end
+    private
 
-	# Generate an random id
-	private
-	def generate_id
-		return ([*('A'..'Z'),*('a'..'z'),*('0'..'9')]).sample(16).join
-	end 
-end
+    # Generate an random id
+    def generate_id
+      [*('A'..'Z'), *('a'..'z'), *('0'..'9')].sample(16).join
+    end
+  end
 end