nishiki/mpw
1
0
Fork 0
mirror of https://github.com/nishiki/manage-password.git synced 2025-03-19 21:04:35 +00:00
Code Issues Releases Activity

add option to enable pinmode with gpg >= 2.1

Browse source
This commit is contained in:
Adrien Waksberg 2017-04-04 23:45:03 +02:00
parent d1adfd24c1
commit 7ce4ba721b
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/mpw-config
View file

@ -60,6 +60,10 @@ OptionParser.new do |opts|
values[:lang] = lang values[:lang] = lang
end end
opts.on('-P', '--pinmode', I18n.t('option.pinmode')) do
values[:pinmode] = true
end
opts.on('-w', '--wallet-dir PATH', I18n.t('option.wallet_dir')) do |wallet_dir| opts.on('-w', '--wallet-dir PATH', I18n.t('option.wallet_dir')) do |wallet_dir|
values[:wallet_dir] = wallet_dir values[:wallet_dir] = wallet_dir
end end
@ -94,7 +98,7 @@ OptionParser.new do |opts|
end.parse! end.parse!
config = MPW::Config.new(options[:config]) config = MPW::Config.new(options[:config])
cli = MPW::Cli.new(config, nil) cli = MPW::Cli.new(config)
if options.key?(:init) if options.key?(:init)
cli.setup(values) cli.setup(values)

2
lib/mpw/cli.rb
View file

@ -101,7 +101,7 @@ module MPW
def decrypt def decrypt
unless defined?(@mpw) unless defined?(@mpw)
@password = ask(I18n.t('display.gpg_password')) { |q| q.echo = false } @password = ask(I18n.t('display.gpg_password')) { |q| q.echo = false }
@mpw = MPW.new(@config.gpg_key, @wallet_file, @password, @config.gpg_exe) @mpw = MPW.new(@config.gpg_key, @wallet_file, @password, @config.gpg_exe, @config.pinmode)
end end
@mpw.read_data @mpw.read_data

6
lib/mpw/config.rb
View file

@ -32,6 +32,7 @@ module MPW
attr_accessor :wallet_dir attr_accessor :wallet_dir
attr_accessor :gpg_exe attr_accessor :gpg_exe
attr_accessor :password attr_accessor :password
attr_accessor :pinmode
# Constructor # Constructor
# @args: config_file -> the specify config file # @args: config_file -> the specify config file
@ -59,6 +60,7 @@ module MPW
wallet_dir = options[:wallet_dir] || @wallet_dir wallet_dir = options[:wallet_dir] || @wallet_dir
default_wallet = options[:default_wallet] || @default_wallet default_wallet = options[:default_wallet] || @default_wallet
gpg_exe = options[:gpg_exe] || @gpg_exe gpg_exe = options[:gpg_exe] || @gpg_exe
pinmode = options[:pinmode] || @pinmode
password = { numeric: true, password = { numeric: true,
alpha: true, alpha: true,
special: false, special: false,
@ -82,7 +84,8 @@ module MPW
'wallet_dir' => wallet_dir, 'wallet_dir' => wallet_dir,
'default_wallet' => default_wallet, 'default_wallet' => default_wallet,
'gpg_exe' => gpg_exe, 'gpg_exe' => gpg_exe,
'password' => password } 'password' => password,
'pinmode' => pinmode }
FileUtils.mkdir_p(@config_dir, mode: 0700) FileUtils.mkdir_p(@config_dir, mode: 0700)
FileUtils.mkdir_p(wallet_dir, mode: 0700) FileUtils.mkdir_p(wallet_dir, mode: 0700)
@ -132,6 +135,7 @@ module MPW
@default_wallet = config['default_wallet'] @default_wallet = config['default_wallet']
@gpg_exe = config['gpg_exe'] @gpg_exe = config['gpg_exe']
@password = config['password'] || {} @password = config['password'] || {}
@pinmode = config['pinmode']
raise if @gpg_key.empty? || @wallet_dir.empty? raise if @gpg_key.empty? || @wallet_dir.empty?

5
lib/mpw/mpw.rb
View file

@ -26,11 +26,12 @@ require 'mpw/item'
module MPW module MPW
class MPW class MPW
# Constructor # Constructor
def initialize(key, wallet_file, gpg_pass = nil, gpg_exe = nil) def initialize(key, wallet_file, gpg_pass = nil, gpg_exe = nil, pinmode = false)
@key = key @key = key
@gpg_pass = gpg_pass @gpg_pass = gpg_pass
@gpg_exe = gpg_exe @gpg_exe = gpg_exe
@wallet_file = wallet_file @wallet_file = wallet_file
@pinmode = pinmode
GPGME::Engine.set_info(GPGME::PROTOCOL_OpenPGP, @gpg_exe, "#{Dir.home}/.gnupg") unless @gpg_exe.to_s.empty? GPGME::Engine.set_info(GPGME::PROTOCOL_OpenPGP, @gpg_exe, "#{Dir.home}/.gnupg") unless @gpg_exe.to_s.empty?
end end
@ -338,7 +339,7 @@ module MPW
return nil if data.to_s.empty? return nil if data.to_s.empty?
password = password =
if /^1\.[0-9.]+$/ =~ GPGME::Engine.info.first.version if /^1\.[0-9.]+$/ =~ GPGME::Engine.info.first.version || @pinmode
{ password: @gpg_pass } { password: @gpg_pass }
else else
{ password: @gpg_pass, { password: @gpg_pass,