tome 1.0.0 → 1.0.1

data/README.md

@@ -94,7 +94,7 @@ of every website you sign up with, you can use tome to help mitigate your risk a
   computing power and time. To further reduce risk, don't store usernames (e.g. do `tome set gmail.com` instead of `tome set foo@gmail.com`).
 * Dependence on the `.tome` file: if your `.tome` file is lost or corrupt and you forget your passwords, you'll have to reset them.
 * If you want access to your passwords on multiple machines, you'll have to sync the `.tome` file between machines.
-* Trust in *my* secure coding practices: I encourage you to look at the source yourself.
+* Trust in *my* secure coding practices. I encourage you to look at the source yourself.
 
 ## Under the hood
 
@@ -102,6 +102,10 @@ All account and password information is stored in a single `.tome` file in the u
 YAML-formatted and stores the encrypted account and password information as well as the encryption parameters.
 These encryption parameters, along with the master password, are used to decrypt the password information.
 
+A randomly-generated 1K-4K block of data is appended to the actual password data to obfuscate the number of passwords
+stored in the database. This is not a security mechanism, but rather a hindrance to attempts to infer
+anything from the encrypted data.
+
 Each time the `.tome` file is modified, new encryption parameters (i.e. the salt and IV) are randomly generated
 and used for encryption.
 

data/lib/tome/command.rb

@@ -64,6 +64,7 @@ module Tome
         /\A(generate|gen)\z/i => :generate,
         /\A(copy|cp)\z/i => :copy,
         /\A(rename|ren|rn)\z/i => :rename,
+        /\A(master)\z/i => :master,
         /\A(list|ls)\z/i => :list
       }
 
@@ -98,6 +99,7 @@ module Tome
         :generate => $generate_usage,
         :copy => $copy_usage,
         :rename => $rename_usage,
+        :master => $master_usage,
         :list => $list_usage
       }
 
@@ -118,7 +120,7 @@ module Tome
         raise CommandError, "Invalid arguments.\n\n#{$set_usage}"
       end
       
-      tome = tome_create_connect()
+      created, tome = tome_create_connect()
 
       case args.length
         # TODO: Validate that first argument is in [username@]domain form.
@@ -213,7 +215,7 @@ module Tome
         raise CommandError, "Invalid arguments.\n\n#{$generate_usage}"
       end
       
-      tome = tome_create_connect()
+      created, tome = tome_create_connect()
 
       # tome gen bar.com
       # tome gen foo@bar.com
@@ -229,11 +231,12 @@ module Tome
       end
 
       created = tome.set(id, password)
+      Clipboard.copy(password)
 
       if created
-        @out.puts "Generated password for #{id}."
+        @out.puts "Generated and copied password for #{id}."
       else
-        @out.puts "Updated #{id} with the generated password."
+        @out.puts "Updated and copied password for #{id}."
       end
     end
 
@@ -262,7 +265,7 @@ module Tome
         match = matches.first
         password = match.last
 
-        Clipboard.copy password
+        Clipboard.copy(password)
         if Clipboard.paste == password
           @out.puts "Password for #{match.first} copied to clipboard."
         else
@@ -316,6 +319,20 @@ module Tome
       end
     end
 
+    def master(args)
+      if args.count > 0
+        raise CommandError, "Invalid arguments.\n\n#{$master_usage}"
+      end
+
+      created, tome = tome_create_connect()
+
+      if !created
+        master_password = prompt_password('New master password')
+        tome.master_password = master_password
+        @out.puts 'Master password updated.'
+      end
+    end
+
     def generate_password
       Passgen.generate(:length => 30, :symbols => true)
     end
@@ -414,10 +431,10 @@ module Tome
       if !Tome.exists?(@tome_filename)
         @out.puts 'Creating tome database.'
         master_password = prompt_password('Master password')
-        tome = Tome.create!(@tome_filename, master_password)
+        return true, Tome.create!(@tome_filename, master_password)
       else
-        tome = tome_connect()
+        return false, tome_connect()
       end
     end
   end
-end
+end

data/lib/tome/tome.rb

@@ -105,6 +105,13 @@ module Tome
       end 
     end
 
+    def master_password=(master_password)
+      return writable_store do |store|
+        @master_password = master_password
+        true
+      end
+    end
+
   private
     def set_by_id(store, id, password)
       created = !store.include?(id)
@@ -230,7 +237,11 @@ module Tome
         raise MasterPasswordError
       end
 
-      store_yaml = Padding.unpad(padded_store_yaml)
+      begin
+        store_yaml = Padding.unpad(padded_store_yaml)
+      rescue Exception
+        raise MasterPasswordError
+      end
 
       store = YAML.load(store_yaml)
       return store || {}

data/lib/tome/usage.rb

@@ -8,7 +8,7 @@ Usage:
 
     tome generate [user@]<domain>
 
-        Generate a random password for an account.
+        Generate and copy a random password for an account.
         Example: tome generate reddit.com
 
     tome get <pattern>
@@ -36,6 +36,11 @@ Usage:
         Rename the account information stored.
         Example: tome rename twitter.com foo@twitter.com
 
+    tome master
+
+        Set the master password.
+        Example: tome master
+
     tome help
 
         Shows help for a specific command.
@@ -126,6 +131,7 @@ $generate_usage = <<END
 tome generate
 
     Generate a random password for an account. The user is optional.
+    The generated password is copied to the clipboard.
 
 Usage:
 
@@ -190,4 +196,14 @@ Examples:
     tome rename foo@gmail.com bar@gmail.com
 
 Alias: rename, ren, rn
-END
+END
+
+$master_usage = <<END
+tome master
+
+    Set the master password.
+
+Usage:
+
+    tome master
+END

data/lib/tome/version.rb

@@ -1 +1 @@
-$version = '1.0.0'
+$version = '1.0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tome
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: passgen
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement