nishiki/mpw
1
0
Fork 0
mirror of https://github.com/nishiki/manage-password.git synced 2024-11-27 07:33:05 +00:00
Code Issues Releases Activity

fix minor bugs

Browse source
This commit is contained in:
nishiki 2014-12-07 10:32:33 +01:00
parent ccb0e71edc
commit d7a7dfbe10
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/MPW.rb
View file

@ -20,20 +20,20 @@ module MPW
@file_gpg = file_gpg @file_gpg = file_gpg
@key = key @key = key
@share_keys = share_keys @share_keys = share_keys
@data = {}
end end
# Decrypt a gpg file # Decrypt a gpg file
# @args: password -> the GPG key password # @args: password -> the GPG key password
# @rtrn: true if data has been decrypted # @rtrn: true if data has been decrypted
def decrypt(passwd=nil) def decrypt(passwd=nil)
@data = {}
if File.exist?(@file_gpg) if File.exist?(@file_gpg)
crypto = GPGME::Crypto.new(armor: true) crypto = GPGME::Crypto.new(armor: true)
data_decrypt = crypto.decrypt(IO.read(@file_gpg), password: passwd).read.force_encoding('utf-8') data_decrypt = crypto.decrypt(IO.read(@file_gpg), password: passwd).read.force_encoding('utf-8')
@data = YAML.load(data_decrypt) if not data_decrypt.to_s.empty? @data = YAML.load(data_decrypt) if not data_decrypt.to_s.empty?
end end
puts @data.class
return true return true
rescue Exception => e rescue Exception => e
@error_msg = "#{I18n.t('error.gpg_file.decrypt')}\n#{e}" @error_msg = "#{I18n.t('error.gpg_file.decrypt')}\n#{e}"
@ -135,7 +135,7 @@ module MPW
row_update['protocol'] = protocol.to_s.empty? ? row['protocol'] : protocol row_update['protocol'] = protocol.to_s.empty? ? row['protocol'] : protocol
row_update['login'] = login.to_s.empty? ? row['login'] : login row_update['login'] = login.to_s.empty? ? row['login'] : login
row_update['password'] = passwd.to_s.empty? ? row['password'] : passwd row_update['password'] = passwd.to_s.empty? ? row['password'] : passwd
row_update['port'] = port.to_s.empty? ? row['port'] : port row_update['port'] = port.to_s.empty? ? row['port'] : port.to_i
row_update['comment'] = comment.to_s.empty? ? row['comment'] : comment row_update['comment'] = comment.to_s.empty? ? row['comment'] : comment
row_update['date'] = Time.now.to_i row_update['date'] = Time.now.to_i
@ -147,7 +147,8 @@ module MPW
if update if update
@data[id] = row_update @data[id] = row_update
else else
@data[row_update['id']] = row_update id = row_update['id']
@data[id] = row_update
end end
return true return true