keyrack 0.1.3 → 0.2.0

data/Gemfile

@@ -4,7 +4,7 @@ source :rubygems
 #   gem "activesupport", ">= 2.3.5"
 gem 'net-scp', :require => 'net/scp'
 gem 'highline'
-gem 'clipboard'
+gem 'viking-copier', :require => 'copier'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -13,4 +13,5 @@ group :development do
   gem "jeweler", "~> 1.5.1"
   gem "rcov", ">= 0"
   gem "mocha", :require => false
+  gem "cucumber"
 end

data/Gemfile.lock

@@ -1,17 +1,23 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    clipboard (0.9.2)
-      ffi
-      zucker (>= 8)
-    ffi (1.0.1)
-      rake (>= 0.8.7)
+    builder (3.0.0)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
     git (1.2.5)
     highline (1.6.1)
-    jeweler (1.5.1)
+    jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    json (1.4.6)
     mocha (0.9.10)
       rake
     net-scp (1.0.4)
@@ -19,16 +25,18 @@ GEM
     net-ssh (2.0.23)
     rake (0.8.7)
     rcov (0.9.9)
-    zucker (8)
+    term-ansicolor (1.0.5)
+    viking-copier (1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
-  clipboard
+  cucumber
   highline
   jeweler (~> 1.5.1)
   mocha
   net-scp
   rcov
+  viking-copier

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/features/console.feature

@@ -0,0 +1,39 @@
+Feature: Console runner
+  I want to run Keyrack from the console
+
+  Scenario: starting for the first time with a filesystem store
+    * I run keyrack interactively
+    * I wait a few seconds
+    * the output should contain "New passphrase:"
+    * I type "secret"
+    * the output should contain "Confirm passphrase:"
+    * I type "secret"
+    * I wait a few seconds
+    * the output should contain "Choose storage type:"
+    * I type "filesystem"
+    * the output should contain "n. Add new"
+    * I type "n" to add a new entry
+    * the output should contain "Label:"
+    * I type "Twitter"
+    * the output should contain "Username:"
+    * I type "dudeguy"
+    * the output should contain "Generate password?"
+    * I type "n" for no
+    * the output should contain "Password:"
+    * I type "kittens"
+    * the output should contain "Password (again):"
+    * I type "kittens"
+    * the output should contain "1. Twitter"
+    * the output should also contain "s. Save"
+    * I type "s" to save the database
+    * I type "q" to quit
+    * I wait a few seconds
+    * I run keyrack interactively again
+    * I wait a few seconds
+    * the output should contain "Keyrack password:"
+    * I type "secret"
+    * I wait a few seconds
+    * the output should contain "1. Twitter"
+    * I type "1" for Twitter
+    * my clipboard should contain "kittens"
+    * I type "q" to quit

data/features/step_definitions/keyrack_steps.rb

@@ -0,0 +1,45 @@
+Before do
+  @aruba_io_wait_seconds = 2
+  @fake_home = Dir::Tmpname.create('keyrack') { }
+  Dir.mkdir(@fake_home)
+  @old_home = ENV['HOME']
+  ENV['HOME'] = @fake_home
+end
+
+After do
+  ENV['HOME'] = @old_home
+  FileUtils.rm_rf(@fake_home)
+end
+
+When /I run keyrack interactively/ do
+  @out, @in, @pid = PTY.spawn("bundle exec ruby -Ilib bin/keyrack")
+end
+
+Then /the output should contain "([^"]+)"/ do |expected|
+  if @slept
+    @slept = false
+  else
+    sleep 1
+  end
+  @output = @out.read_nonblock(255)
+  @output.should include(expected)
+end
+
+Then /the output should also contain "([^"]+)"/ do |expected|
+  @output.should include(expected)
+end
+
+When /I type "([^"]+)"/ do |text|
+  @in.puts(text)
+end
+
+When /I wait a few seconds/ do
+  sleep 5
+  @slept = true
+end
+
+Then /my clipboard should contain "([^"]+)"/ do |expected|
+  sleep 1
+  result = %x{xclip -selection clipboard -o}.chomp
+  result.should == expected
+end

data/features/support/env.rb

@@ -0,0 +1,13 @@
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'tempfile'
+require 'fileutils'
+require 'pty'
+require 'yaml'

data/lib/keyrack/database.rb

@@ -1,10 +1,9 @@
 module Keyrack
   class Database
-    def initialize(config)
-      store_config = config['store'].dup
-      @store = Store[store_config.delete('type')].new(store_config)
-      key_path = File.expand_path(config['key'])
-      @key = OpenSSL::PKey::RSA.new(File.read(key_path), config['password'])
+    def initialize(key, iv, store)
+      @key = key
+      @iv = iv
+      @store = store
       @data = decrypt
       @dirty = false
     end
@@ -27,14 +26,22 @@ module Keyrack
     end
 
     def save
-      @store.write(@key.public_encrypt(Marshal.dump(@data)))
+      cipher = OpenSSL::Cipher::Cipher.new("AES-128-CBC")
+      cipher.encrypt; cipher.key = @key; cipher.iv = @iv
+      @store.write(cipher.update(Marshal.dump(@data)) + cipher.final)
       @dirty = false
     end
 
     private
       def decrypt
         data = @store.read
-        data ? Marshal.load(@key.private_decrypt(data)) : {}
+        if data
+          cipher = OpenSSL::Cipher::Cipher.new("AES-128-CBC")
+          cipher.decrypt; cipher.key = @key; cipher.iv = @iv
+          Marshal.load(cipher.update(data) + cipher.final)
+        else
+          {}
+        end
       end
   end
 end

data/lib/keyrack/runner.rb

@@ -1,21 +1,55 @@
 module Keyrack
   class Runner
     def initialize(argv)
-      options = {
-        :config_path => "~/.keyrack/config"
-      }
+      @config_path = "~/.keyrack"
       OptionParser.new do |opts|
-        opts.on("-c", "--config [FILE]", "Specify configuration file (Default: #{options[:config_path]}") do |f|
-          options[:config_path] = f
+        opts.on("-d", "--directory [PATH]", "Specify configuration path (Default: #{@config_path}") do |f|
+          @config_path = f
         end
       end.parse(argv)
-
-      @options = YAML.load_file(File.expand_path(options[:config_path]))
+      @config_path = File.expand_path(@config_path)
       @ui = UI::Console.new
-      password = @ui.get_password
-      @database = Database.new(@options.merge('password' => password))
-      @ui.database = @database
 
+      if Dir.exist?(@config_path)
+        @options = YAML.load_file(File.join(@config_path, "config"))
+        password = @ui.get_password
+        rsa_key = Utils.open_rsa_key(@options['rsa'], password)
+        aes_data = Utils.open_aes_data(@options['aes'], rsa_key)
+      else
+        Dir.mkdir(@config_path)
+        @options = {}
+        @ui.display_first_time_notice
+
+        # RSA
+        rsa_options = @ui.rsa_setup
+        rsa_key, rsa_pem = Utils.generate_rsa_key(rsa_options['password'])
+        rsa_path = File.expand_path(rsa_options['path'], @config_path)
+        File.open(rsa_path, 'w') { |f| f.write(rsa_pem) }
+        @options['rsa'] = rsa_path
+
+        # AES
+        aes_data = {
+          'key' => Utils.generate_aes_key,
+          'iv'  => Utils.generate_aes_key
+        }
+        dump = Marshal.dump(aes_data)
+        aes_path = File.expand_path('aes', @config_path)
+        File.open(aes_path, 'w') { |f| f.write(rsa_key.public_encrypt(dump)) }
+        @options['aes'] = aes_path
+
+        # Store
+        store_options = @ui.store_setup
+        if store_options['type'] == 'filesystem'
+          store_options['path'] = File.expand_path(store_options['path'], @config_path)
+        end
+        @options['store'] = store_options
+
+        # Write out config
+        File.open(File.expand_path('config', @config_path), 'w') { |f| f.print(@options.to_yaml) }
+      end
+      store = Store[@options['store']['type']].new(@options['store'].reject { |k, _| k == 'type' })
+      @database = Database.new(aes_data['key'], aes_data['iv'], store)
+      @ui.database = @database
       main_loop
     end
 

data/lib/keyrack/ui/console.rb

@@ -38,7 +38,7 @@ module Keyrack
             :quit
           end
         else
-          Clipboard.copy(entries[result.to_i - 1][:password])
+          Copier(entries[result.to_i - 1][:password])
           @highline.say("The password has been copied to your clipboard.")
           nil
         end
@@ -69,6 +69,40 @@ module Keyrack
         end
         result
       end
+
+      def display_first_time_notice
+        @highline.say("This looks like your first time using Keyrack.  I'll need to ask you a few questions first.")
+      end
+
+      def rsa_setup
+        password = confirmation = nil
+        loop do
+          password = @highline.ask("New passphrase: ") { |q| q.echo = false }
+          confirmation = @highline.ask("Confirm passphrase: ") { |q| q.echo = false }
+          break if password == confirmation
+          @highline.say("Passphrases didn't match.")
+        end
+        { 'password' => password, 'path' => 'rsa' }
+      end
+
+      def store_setup
+        result = {}
+        result['type'] = @highline.choose do |menu|
+          menu.header = "Choose storage type:"
+          menu.choices("filesystem", "ssh")
+        end
+
+        case result['type']
+        when 'filesystem'
+          result['path'] = 'database'
+        when 'ssh'
+          result['host'] = @highline.ask("Host: ")
+          result['user'] = @highline.ask("User: ")
+          result['path'] = @highline.ask("Remote path: ")
+        end
+
+        result
+      end
     end
   end
 end

data/lib/keyrack/utils.rb

@@ -7,5 +7,23 @@ module Keyrack
       end
       result
     end
+
+    def self.generate_rsa_key(password)
+      rsa = OpenSSL::PKey::RSA.new(4096)
+      cipher = OpenSSL::Cipher::Cipher.new('des3')
+      [rsa, rsa.to_pem(cipher, password)]
+    end
+
+    def self.generate_aes_key
+      SecureRandom.base64(128)[0..127]
+    end
+
+    def self.open_rsa_key(path, password)
+      OpenSSL::PKey::RSA.new(File.read(path), password)
+    end
+
+    def self.open_aes_data(path, rsa_key)
+      Marshal.load(rsa_key.private_decrypt(File.read(path)))
+    end
   end
 end

data/lib/keyrack.rb

@@ -1,9 +1,10 @@
 require 'openssl'
 require 'yaml'
 require 'optparse'
+require 'securerandom'
 require 'net/scp'
 require 'highline'
-require 'clipboard'
+require 'copier'
 
 module Keyrack
 end

data/test/fixtures/id_rsa

@@ -1,30 +1,54 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,F09A7B088DE6A0D4DAED7A4E6EE0E655
+DEK-Info: DES-EDE3-CBC,030F0E3D8BD7BF1A
 
-oIv2SUdgq9Zgg94N57hhjDD6spYkQEejLP8k+hw2Qrfzze4BmnSYCt6RNPcIxnMy
-kCS8abNxjewuzpzMtdzvcEW9RoIYO0VekH4vMc7oZsZ0HHn14avXGk6Z36deYYDm
-pUmKJMYFi0jkeLZThwTZkTvISR3DgHznHGhTkqvCqW8zp6NksYyNxJSnbxAspAGh
-KDL8EsiU7RruirswF3+lHaEftNH/HgYcfVNNeLSbN9GuvTZzwlsFmJCGzigL7LuH
-29bR+Q5dd+sx+lt7GzPb5tetYdvux25e0CXWbzwmsKNNOsZohJCMhwCkpzlb1Qrl
-ttXQC7lm1VvebvwkC6ozXkdOhdS8nIc9HdukZ4EujgSHfvR8TYLcIH5YvP+3nKCX
-VXQOjgEP9w+xADM9aPJJDHYCkSWYxwKgVYffv7YZwRQGBmShMAAuYyjlAUjzd6cG
-lvZ6v+ScMY2nQtPvLbMfFilevzaOHSFT8WhVSmutHoBCVNvzbWWiKqTtEqw3XjgZ
-TrrPHb738tNTIz0HrztPpgn+CksRrgSYoUZknPfnF40r+UfaouQvvGaKhDi50gh3
-8CvQQ5PZ7ngKKsp4YdJyK6b8fW4oIBok1vHIPvneRwRGZqtzT0u0jVBaoCs1IrTn
-Lx1r9VKx4nqGm2SSM5SxbTJL+iHa7u7SFgb5zJUUGOO2iMMorpVfV4zpAd6TKsex
-h8cAYBcROS98Ixh/SPl/+IKzyaNEBc+jqban3on9gSmX/pHRRvcAtrKX8194svc6
-ZCSAcaaMk127AmxkFInUdZk9aKKZzjx0sQw6qd4c75Yl2Kwrt09umSOPnv0oRrI6
-p+ZHRc8XRxlBYnz8v11hC7VP0zG94p5mNH2WaAsPuifZaIzTx4+HqhK4tzL6sYuv
-obaPwzyYJvT7fAhAJ/MuC57AAygpTflSTv9cEbO4ufEUaNlvBFroiE5Di+9/sgEn
-OnB33quVBih21d+1NUu2H8bxHQfNPm343o1y/pYvoTCZFlrLnmpnVK7QM+VTB9G4
-X61z7agN5wKm8c/nssLplkvKVeZkuZzHqPDAfTM8OXNsc4DZfxvaEKhLNq9kmhB9
-burDVGTeN/qsWBDJl9flerBmEHdF8yGKppJSygiqRGTstjX6/pUBnUPv9mY6yhu5
-9sEYfrOT1IuuZVNZygjA2WIhRxmDuSbyiVdlwtSfx0AbqeMVIem5BGnpEbV3RiHD
-DelvO0fz77RF/4+w8Fms/7YO+4fs22AsOzozOSaK1nmMRaOBO+rFQAlfhvOibqn9
-vENbwDbJsdG8lFwV6RGQtz5r8MgOKyx5v3VOqVti2ET8OBUhPPbuj0Cw32F1xMRq
-pKFy5Jygh+x7WpnDqhyRqRCaTgky2cEfmxRE3DQzNvMlZbApKEbtarwFYJpOs4k8
-FL87isDMBxw/KCCe4/EBpsGXcOCge3uNnA198rnpyaNwcmqL5AKHyQH/i3r5SZOT
-sdYvWyugDbjIciQ+OEpqgwIdf0Rh89HWfZG7JHJY3OKifrnHI9srJ2KBsmv8wvQ6
-dY/0GBaam/PX8OKEhWrpojGAPG+4uUVpy4AZ2H0DZC44sxJu+Xw/OcbenVJuUMN2
+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
 -----END RSA PRIVATE KEY-----

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'fileutils'
 require 'rubygems'
 require 'bundler'
 begin
@@ -29,7 +30,7 @@ class Test::Unit::TestCase
 
   def teardown
     if @tmpnames
-      @tmpnames.each { |t| File.unlink(t) if File.exist?(t) }
+      @tmpnames.each { |t| FileUtils.rm_rf(t) }
     end
   end
 end

data/test/keyrack/test_database.rb

@@ -3,30 +3,28 @@ require 'helper'
 module Keyrack
   class TestDatabase < Test::Unit::TestCase
     def setup
+      @key = "abcdefgh" * 32
+      @iv = @key.reverse
+
       @path = get_tmpname
-      @database = Keyrack::Database.new({
-        'store' => { 'type' => 'filesystem', 'path' => @path },
-        'key' => fixture_path('id_rsa'),
-        'password' => 'secret'
-      })
+      @store = Store['filesystem'].new('path' => @path)
+
+      @database = Keyrack::Database.new(@key, @iv, @store)
       @database.add('Twitter', 'username', 'password')
       @database.save
     end
 
     def test_encrypts_database
-      key = OpenSSL::PKey::RSA.new(File.read(fixture_path('id_rsa')), 'secret')
       encrypted_data = File.read(@path)
-      marshalled_data = key.private_decrypt(encrypted_data)
+      cipher = OpenSSL::Cipher::Cipher.new("AES-128-CBC")
+      cipher.decrypt; cipher.key = @key; cipher.iv = @iv
+      marshalled_data = cipher.update(encrypted_data) + cipher.final
       data = Marshal.load(marshalled_data)
       assert_equal({'Twitter'=>{:username=>'username',:password=>'password'}}, data)
     end
 
     def test_reading_existing_database
-      database = Keyrack::Database.new({
-        'store' => { 'type' => 'filesystem', 'path' => @path },
-        'key' => fixture_path('id_rsa'),
-        'password' => 'secret'
-      })
+      database = Keyrack::Database.new(@key, @iv, @store)
       expected = {:username => 'username', :password => 'password'}
       assert_equal(expected, database.get('Twitter'))
     end
@@ -40,5 +38,15 @@ module Keyrack
       @database.add('Foo', 'bar', 'baz')
       assert @database.dirty?
     end
+
+    def test_large_number_of_entries
+      site = "abcdefg"; user = "1234567"; pass = "zyxwvut" * 2
+      500.times do |i|
+        @database.add(site, user, pass)
+        site.next!; user.next!; pass.next!
+      end
+      @database.save
+      assert_equal 501, @database.sites.length
+    end
   end
 end

data/test/keyrack/test_runner.rb

@@ -2,31 +2,98 @@ require 'helper'
 
 module Keyrack
   class TestRunner < Test::Unit::TestCase
+    def setup
+      @console = stub('console', {
+        :get_password => 'secret',
+        :database= => nil, :menu => nil,
+        :get_new_entry => {:site => "Foo", :username => "bar", :password => "baz"}
+      })
+      UI::Console.stubs(:new).returns(@console)
+      @database = stub('database', { :add => nil })
+      Database.stubs(:new).returns(@database)
+    end
+
     def test_console
+      store_path = 'foo/bar/hey/buddy'
+      rsa_path = 'omg/rsa/path'
+      aes_path = 'hey/its/some/aes/stuff'
       config = {
-        'store' => { 'type' => 'filesystem', 'path' => 'foobar' },
-        'key' => fixture_path('id_rsa')
+        'store' => { 'type' => 'filesystem', 'path' => store_path },
+        'rsa' => rsa_path, 'aes' => aes_path
       }
-      config_path = get_tmpname
-      File.open(config_path, 'w') { |f| f.print(config.to_yaml) }
+      keyrack_dir = get_tmpname
+      Dir.mkdir(keyrack_dir)
+      File.open(File.join(keyrack_dir, "config"), 'w') { |f| f.print(config.to_yaml) }
 
-      console = mock('console')
-      UI::Console.expects(:new).returns(console)
-      database = mock('database')
+      UI::Console.expects(:new).returns(@console)
 
       seq = sequence('ui sequence')
-      console.expects(:get_password).returns('secret').in_sequence(seq)
-      Database.expects(:new).with(config.merge('password' => 'secret')).returns(database).in_sequence(seq)
-      console.expects(:database=).with(database).in_sequence(seq)
-      console.expects(:menu).returns(:new).in_sequence(seq)
-      console.expects(:get_new_entry).returns({:site => "Foo", :username => "bar", :password => "baz"}).in_sequence(seq)
-      database.expects(:add).with("Foo", "bar", "baz")
-      console.expects(:menu).returns(nil).in_sequence(seq)
-      console.expects(:menu).returns(:save).in_sequence(seq)
-      database.expects(:save).in_sequence(seq)
-      console.expects(:menu).returns(:quit).in_sequence(seq)
-
-      runner = Runner.new(["-c", config_path])
+      @console.expects(:get_password).returns('secret').in_sequence(seq)
+      rsa = mock("rsa key")
+      Utils.expects(:open_rsa_key).with(rsa_path, 'secret').returns(rsa).in_sequence(seq)
+      aes = {'key' => '12345', 'iv' => '54321'}
+      Utils.expects(:open_aes_data).with(aes_path, rsa).returns(aes).in_sequence(seq)
+      store = mock('filesystem store')
+      Store::Filesystem.expects(:new).with('path' => store_path).returns(store).in_sequence(seq)
+      Database.expects(:new).with('12345', '54321', store).returns(@database).in_sequence(seq)
+      @console.expects(:database=).with(@database).in_sequence(seq)
+
+      @console.expects(:menu).returns(:new).in_sequence(seq)
+      @console.expects(:get_new_entry).returns({:site => "Foo", :username => "bar", :password => "baz"}).in_sequence(seq)
+      @database.expects(:add).with("Foo", "bar", "baz")
+      @console.expects(:menu).returns(nil).in_sequence(seq)
+      @console.expects(:menu).returns(:save).in_sequence(seq)
+      @database.expects(:save).in_sequence(seq)
+      @console.expects(:menu).returns(:quit).in_sequence(seq)
+
+      runner = Runner.new(["-d", keyrack_dir])
+    end
+
+    def test_console_first_run
+      keyrack_dir = get_tmpname
+      seq = sequence('ui sequence')
+
+      @console.expects(:display_first_time_notice).in_sequence(seq)
+
+      # RSA generation
+      rsa_path = 'id_rsa'
+      @console.expects(:rsa_setup).returns('password' => 'secret', 'path' => rsa_path).in_sequence(seq)
+      rsa = mock('rsa key')
+      Utils.expects(:generate_rsa_key).with('secret').returns([rsa, 'private key']).in_sequence(seq)
+
+      # AES generation
+      Utils.expects(:generate_aes_key).twice.returns('foobar', 'barfoo').in_sequence(seq)
+      dump = Marshal.dump('key' => 'foobar', 'iv' => 'barfoo')
+      rsa.expects(:public_encrypt).with(dump).returns("encrypted dump")
+
+      # Store setup
+      store_path = 'database'
+      @console.expects(:store_setup).returns('type' => 'filesystem', 'path' => store_path).in_sequence(seq)
+      store = mock('filesystem store')
+      Store::Filesystem.expects(:new).with('path' => store_path).returns(store).in_sequence(seq)
+
+      Database.expects(:new).with('foobar', 'barfoo', store).returns(@database).in_sequence(seq)
+      @console.expects(:database=).with(@database).in_sequence(seq)
+      @console.expects(:menu).returns(:quit).in_sequence(seq)
+
+      runner = Runner.new(["-d", keyrack_dir])
+
+      assert Dir.exist?(keyrack_dir)
+      expected_rsa_file = File.expand_path(rsa_path, keyrack_dir)
+      assert File.exist?(expected_rsa_file)
+      assert_equal 'private key', File.read(expected_rsa_file)
+
+      expected_aes_file = File.expand_path('aes', keyrack_dir)
+      assert File.exist?(expected_aes_file)
+      assert_equal 'encrypted dump', File.read(expected_aes_file)
+
+      expected_config_file = File.expand_path('config', keyrack_dir)
+      assert File.exist?(expected_config_file)
+      expected_config = {
+        'rsa' => expected_rsa_file, 'aes' => expected_aes_file,
+        'store' => { 'type' => 'filesystem', 'path' => store_path }
+      }
+      assert_equal expected_config, YAML.load_file(expected_config_file)
     end
   end
 end

data/test/keyrack/test_utils.rb

@@ -6,5 +6,36 @@ module Keyrack
       result = Utils.generate_password
       assert_match result, /^[!-~]{8}$/
     end
+
+    def test_generate_rsa_key
+      rsa = mock('rsa')
+      OpenSSL::PKey::RSA.expects(:new).with(4096).returns(rsa)
+      cipher = mock('cipher')
+      OpenSSL::Cipher::Cipher.expects(:new).with('des3').returns(cipher)
+      rsa.expects(:to_pem).with(cipher, 'secret').returns('private key')
+
+      assert_equal([rsa, 'private key'], Utils.generate_rsa_key('secret'))
+    end
+
+    def test_generate_aes_key
+      SecureRandom.expects(:base64).with(128).returns("x" * 172)
+      result = Utils.generate_aes_key
+      assert_equal 128, result.length
+    end
+
+    def test_open_rsa_key
+      rsa_path = fixture_path('id_rsa')
+      rsa = mock('rsa')
+      OpenSSL::PKey::RSA.expects(:new).with(File.read(rsa_path), 'secret').returns(rsa)
+      assert_equal(rsa, Utils.open_rsa_key(rsa_path, 'secret'))
+    end
+
+    def test_open_aes_data
+      aes_path = fixture_path('aes')
+      aes = {'key' => '12345', 'iv' => '54321'}
+      rsa = mock('rsa')
+      rsa.expects(:private_decrypt).with(File.read(aes_path)).returns(Marshal.dump(aes))
+      assert_equal(aes, Utils.open_aes_data(aes_path, rsa))
+    end
   end
 end

data/test/keyrack/ui/test_console.rb

@@ -4,14 +4,11 @@ module Keyrack
   module UI
     class TestConsole < Test::Unit::TestCase
       def setup
-        @path = get_tmpname
-        @database = Database.new({
-          'store' => { 'type' => 'filesystem', 'path' => @path },
-          'key' => fixture_path('id_rsa'),
-          'password' => 'secret'
-        })
-        @database.add('Twitter', 'username', 'password')
-        @database.save
+        @database = stub('database', :sites => %w{Twitter}, :dirty? => false) do
+          stubs(:get).with('Twitter').returns({
+            :username => 'username', :password => 'password'
+          })
+        end
       end
 
       def test_select_entry_from_menu
@@ -27,7 +24,7 @@ module Keyrack
         question = mock('question')
         question.expects(:in=).with(%w{n q 1})
         highline.expects(:ask).yields(question).returns('1')
-        Clipboard.expects(:copy).with('password')
+        console.expects(:Copier).with('password')
         highline.expects(:say).with("The password has been copied to your clipboard.")
         assert_nil console.menu
       end
@@ -145,6 +142,62 @@ module Keyrack
         highline.expects(:agree).with("Generated bluefoobar.  Sound good? [yn] ").returns(true).in_sequence(seq)
         assert_equal({:site => "Foo", :username => "bar", :password => "foobar"}, console.get_new_entry)
       end
+
+      def test_display_first_time_notice
+        highline = mock('highline')
+        HighLine.expects(:new).returns(highline)
+        console = Console.new
+
+        highline.expects(:say).with("This looks like your first time using Keyrack.  I'll need to ask you a few questions first.")
+        console.display_first_time_notice
+      end
+
+      def test_rsa_setup
+        highline = mock('highline')
+        HighLine.expects(:new).returns(highline)
+        console = Console.new
+
+        seq = sequence("rsa setup")
+        highline.expects(:ask).with("New passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
+        highline.expects(:ask).with("Confirm passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('small').in_sequence(seq)
+        highline.expects(:say).with("Passphrases didn't match.").in_sequence(seq)
+        highline.expects(:ask).with("New passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
+        highline.expects(:ask).with("Confirm passphrase: ").yields(mock{expects(:echo=).with(false)}).returns('huge').in_sequence(seq)
+        expected = {'password' => 'huge', 'path' => 'rsa'}
+        assert_equal expected, console.rsa_setup
+      end
+
+      def test_store_setup_for_filesystem
+        highline = mock('highline')
+        HighLine.expects(:new).returns(highline)
+        console = Console.new
+
+        highline.expects(:choose).yields(mock {
+          expects(:header=).with("Choose storage type:")
+          expects(:choices).with("filesystem", "ssh")
+        }).returns("filesystem")
+
+        expected = {'type' => 'filesystem', 'path' => 'database'}
+        assert_equal expected, console.store_setup
+      end
+
+      def test_store_setup_for_ssh
+        highline = mock('highline')
+        HighLine.expects(:new).returns(highline)
+        console = Console.new
+
+        seq = sequence("store setup")
+        highline.expects(:choose).yields(mock {
+          expects(:header=).with("Choose storage type:")
+          expects(:choices).with("filesystem", "ssh")
+        }).returns("ssh").in_sequence(seq)
+        highline.expects(:ask).with("Host: ").returns("example.com").in_sequence(seq)
+        highline.expects(:ask).with("User: ").returns("dudeguy").in_sequence(seq)
+        highline.expects(:ask).with("Remote path: ").returns(".keyrack/database").in_sequence(seq)
+
+        expected = {'type' => 'ssh', 'host' => 'example.com', 'user' => 'dudeguy', 'path' => '.keyrack/database'}
+        assert_equal expected, console.store_setup
+      end
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeremy Stephens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -06:00
+date: 2011-01-04 00:00:00 -06:00
 default_executable: keyrack
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,7 +44,7 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: clipboard
+  name: viking-copier
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,6 +112,19 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id008
 description: Simple password manager with local/remote database storage and RSA encryption.
 email: viking@pillageandplunder.net
 executables: 
@@ -132,6 +145,9 @@ files:
 - Rakefile
 - VERSION
 - bin/keyrack
+- features/console.feature
+- features/step_definitions/keyrack_steps.rb
+- features/support/env.rb
 - keyrack.gemspec
 - lib/keyrack.rb
 - lib/keyrack/database.rb
@@ -142,10 +158,10 @@ files:
 - lib/keyrack/ui.rb
 - lib/keyrack/ui/console.rb
 - lib/keyrack/utils.rb
+- test/fixtures/aes
 - test/fixtures/config.yml
 - test/fixtures/foo.txt
 - test/fixtures/id_rsa
-- test/fixtures/id_rsa.pub
 - test/helper.rb
 - test/keyrack/store/test_filesystem.rb
 - test/keyrack/store/test_ssh.rb
@@ -168,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3357719399858262545
+      hash: -415657060610893124
       segments: 
       - 0
       version: "0"

data/test/fixtures/id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC5BJJ44xstXL/qsJzIDTr7NTX64g/Nvi2z5fDM05mYQ1+cbAm+s+xI0vBrzY7nU4eVK62h5HOVOh3BB9vGfF3rfycEwj1ZpcDuMAlwQnmnmwLXXwQJV0VQtUgvukBKVX/RwSPJPkGk0nEGvpBmtn8IjtlR+Ido2jeKyKHsUCygvExoVTvJprCGLYxAH7Wo6wtF2idWwmBY6ApFY8cdf0VVBwSsIGjRmnMXf6ggsP/eoYBmR7aD3nGvb4uE1P1XX5XgRAcd7gHbHFe9LVErVoAT734MGMaSQJ6vfBdjBe/BfoAaquGJcr/b+DLc++JpPbaRbDX7IUIlB1vqnkOcLOi5 viking@ip-10-195-17-174