pwkeep 0.0.3 → 0.0.4

data/lib/pwkeep/main.rb

@@ -8,6 +8,24 @@ module PWKeep
      def initialize
        @opts = { :home => ENV['PWKEEP_HOME'] || '~/.pwkeep' } # required value
      end
+
+     def keypair_load
+       counter = 0
+       while true 
+         begin
+           pw = ask("Enter your password:") { |q| q.echo = false }
+           @storage.keypair_load pw
+         rescue OpenSSL::PKey::RSAError => e
+           say "<%= color('Invalid password', RED) %>"
+           counter = counter + 1
+           if (counter>2) 
+             raise e
+           end
+           next
+         end
+         break
+       end
+     end
   
      def setup
        @opts = Trollop::options do
@@ -31,6 +49,7 @@ EOS
          opt :list, "List all known systems", :short => '-l'
          opt :help, "Show usage", :short => '-h'
          opt :home, "Home directory", :short => '-H', :type => :string, :default => ( ENV['PWKEEP_HOME'] || '~/.pwkeep' )
+         opt :migrate, "Migrate from old storage format(s)"
          opt :version, "Show version", :short => '-V'
        end
   
@@ -44,7 +63,7 @@ EOS
        Trollop::die :initialize, "can only have one mode of operation" if opts[:initialize] and (opts[:edit] or opts[:view] or opts[:delete] or opts[:create] or opts[:search] or opts[:list])
        Trollop::die :list, "can only have one mode of operation" if opts[:list] and (opts[:edit] or opts[:view] or opts[:delete] or opts[:create] or opts[:search] or opts[:initialize])
   
-       Trollop::die "You must choose one mode of operation" unless opts[:create] or opts[:edit] or opts[:view] or opts[:delete] or opts[:search] or opts[:initialize] or opts[:list]
+       Trollop::die "You must choose one mode of operation" unless opts[:create] or opts[:edit] or opts[:view] or opts[:delete] or opts[:search] or opts[:initialize] or opts[:list] or opts[:migrate]
      end
   
      def self.run
@@ -92,8 +111,7 @@ EOS
          raise "Storage not initialized (run with --initialize)" unless @storage.valid? 
   
          if opts[:view]
-           pw = ask("Enter your password:") { |q| q.echo = false }
-           @storage.keypair_load pw
+           keypair_load
    
            data = @storage.load_system opts[:system]
   
@@ -111,16 +129,14 @@ EOS
              raise PWKeep::Exception, "Not modified"
            end
   
-           pw = ask("Enter your password:") { |q| q.echo = false }
-           @storage.keypair_load pw
+           keypair_load
            @storage.save_system opts[:system], result[1]
            say("<%= color('Changes stored', GREEN)%>")
            return
          end
   
          if opts[:edit]
-           pw = ask("Enter your password:") { |q| q.echo = false }
-           @storage.keypair_load pw
+           keypair_load
            data = @storage.load_system opts[:system]
            result = PWKeep.run_editor(data[:data], {})
            unless result[0]
@@ -132,8 +148,7 @@ EOS
          end
   
          if opts[:delete]
-           pw = ask("Enter your password:") { |q| q.echo = false }
-           @storage.keypair_load pw
+           keypair_load
            data = @storage.load_system opts[:system]
            # just to be sure
            unless agree("Are you <%=color('SURE',BOLD)%> you want to delete #{data[:system]}?")
@@ -144,8 +159,7 @@ EOS
          end
   
          if opts[:search]
-           pw = ask("Enter your password:") { |q| q.echo = false }
-           @storage.keypair_load pw
+           keypair_load
            say("All matching systems\n")
            @storage.list_all_systems.sort.each do |system|
              if system.match opts[:search]
@@ -156,18 +170,27 @@ EOS
          end
   
          if opts[:list]
-           pw = ask("Enter your password:") { |q| q.echo = false }
-           @storage.keypair_load pw
+           keypair_load
            say("All known systems\n")
            @storage.list_all_systems.sort.each do |system| 
              say("  - #{system}")
            end
            return
          end
+
+         if opts[:migrate]
+           keypair_load
+           say("Migrating systems...\n")
+           count = @storage.migrate
+           say("Migrated #{count} systems\n")
+           return
+         end
        rescue PWKeep::Exception => e1
         PWKeep::logger.error e1.message.colorize(:red)
        rescue OpenSSL::PKey::RSAError => e2
         PWKeep::logger.error "Cannot load private key".colorize(:red)
+       rescue SystemExit,Interrupt
+        # ignore
        end
      end
   end

data/lib/pwkeep/storage.rb

@@ -50,23 +50,17 @@ class Storage
      @key = OpenSSL::PKey::RSA.new key_pem, password
    end
 
-   def master_key_load
-     unless @key
-       raise PWKeep::Exception, "RSA private key required"
-     end
-
-     # load the key
-     @master_key = @key.private_decrypt(path.join('master.key').open('rb') { |io| io.read },4)
-   end
-
    def system_to_hash(system)
      d = Digest.const_get(@options[:digest].upcase).new
 
-     system_h = system.downcase
+     # hash with public key to prevent dictionary attacks
+     system_h = system.downcase + @key.public_key.to_der
+
      (0..@options[:iterations]).each do
          system_h = d.update(system_h).digest
          d.reset
      end
+  
      "system-#{Base64.urlsafe_encode64(system_h)}"
    end
 
@@ -167,11 +161,27 @@ class Storage
    def list_all_systems
      systems = []
      path.entries.each do |s|
-         next unless s.fnmatch? "system-*"
-         systems << JSON.load(decrypt_system(path.join(s)))["system"]
+       next unless s.fnmatch? "system-*"
+       systems << JSON.load(decrypt_system(path.join(s)))["system"]
      end
      systems
    end
+
+   def migrate
+     count = 0
+     path.entries.each do |s|
+       next unless s.fnmatch? "system-*"
+       # check whether name matches the system name
+       system = JSON.load(decrypt_system(path.join(s)))["system"]
+       system_h = system_to_hash system
+       
+       if s.to_s != system_h
+         count = count + 1
+         File.rename path.join(s), path.join(system_h)
+       end
+     end
+     count
+   end
 end
 
 end

data/pwkeep.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'pwkeep'
-  s.version = '0.0.3'
+  s.version = '0.0.4'
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'Aki Tuomi']
   s.email = %w( aki.tuomi@g-works.fi )
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'trollop'
   s.add_dependency 'lockfile'
   s.add_dependency 'hashr'
-  s.add_dependency 'ruco'
   s.add_dependency 'keepass-password-generator'
+  s.add_dependency 'yard'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwkeep
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-09 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruco
+  name: keepass-password-generator
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: keepass-password-generator
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -154,6 +154,28 @@ files:
 - README.md
 - Rakefile
 - bin/pwkeep
+- doc/PWKeep.html
+- doc/PWKeep/Config.html
+- doc/PWKeep/Editor.html
+- doc/PWKeep/EditorApplication.html
+- doc/PWKeep/Exception.html
+- doc/PWKeep/Main.html
+- doc/PWKeep/StatusBar.html
+- doc/PWKeep/Storage.html
+- doc/_index.html
+- doc/class_list.html
+- doc/css/common.css
+- doc/css/full_list.css
+- doc/css/style.css
+- doc/file.README.html
+- doc/file_list.html
+- doc/frames.html
+- doc/index.html
+- doc/js/app.js
+- doc/js/full_list.js
+- doc/js/jquery.js
+- doc/method_list.html
+- doc/top-level-namespace.html
 - lib/pwkeep.rb
 - lib/pwkeep/config.rb
 - lib/pwkeep/editor.rb