trustworthy 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fef54ec026c8c04c1e46553eb5c7250a88dac46
-  data.tar.gz: 29a151ecda817fdaaa0bbee90d0e60c8315d8957
+  metadata.gz: e42d985518ef469697ee1454988f9e2b8ff259fc
+  data.tar.gz: e0313923ab5df072cd1c79e4b7776348ee0876ad
 SHA512:
-  metadata.gz: 0a9ee151b5b02ce3e0fa9be24fc9fa9d55a6315fad8b06f60aeea00d0a38626a9bdc100179a1220f0c32b7c4b67e42a299cbe43daaa48c283363062662d7661f
-  data.tar.gz: 487e84bea07c419cd6d7cac975d1e82bdb4800a0a5a50d15ffc92c7373761f00acf2917e034b62358538878b81882c36cc1fd1f04dd7ed2080416716999115fa
+  metadata.gz: 1bd3eb61ba0642ef2c0ddef733b4cc2f53c04bfd027a2a6d6f1e8562b27caf778dba100495e6e80998a2257e6b4da15c08be8ff9ef057269827aa0933b33872b
+  data.tar.gz: a330f89c54ce12a6b8eb8500d1b5dc00f3502b1293d37500fbb2e9f659fc270fd320b3a51b1e76ddbc9c370c74eaa99074eb118e07d0ad93338067f37cd3e623

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2013 John Downey
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/trustworthy/cli.rb

@@ -2,6 +2,7 @@ require 'highline/import'
 require 'optparse'
 
 require 'trustworthy/cli/command'
+require 'trustworthy/cli/crypt'
 require 'trustworthy/cli/add_key'
 require 'trustworthy/cli/init'
 require 'trustworthy/cli/decrypt'

data/lib/trustworthy/cli/crypt.rb

@@ -0,0 +1,50 @@
+module Trustworthy
+  class CLI
+    module Crypt
+      def self.included(klass)
+        klass.extend(ClassMethods)
+      end
+
+      def parse_options(args)
+        super(_command, args) do |opts, options|
+          opts.on('-i', '--input FILE', "File to #{_command}") do |file|
+            options[:input_file] = file
+          end
+
+          opts.on('-o', '--output FILE', "File to write #{_command}ed contents to") do |file|
+            options[:output_file] = file
+          end
+        end
+      end
+
+      def run(args)
+        catch(:error) do
+          options = _check_options(args)
+          prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
+          File.open(options[:input_file], 'rb') do |input_file|
+            _transform(prompt, options, input_file)
+          end
+        end
+      end
+
+      def _command
+        self.class._command
+      end
+
+      def _check_options(args)
+        options = parse_options(args)
+        unless options.has_key?(:input_file) && options.has_key?(:output_file)
+          print_help
+          throw :error
+        end
+        options
+      end
+
+      module ClassMethods
+        def description
+          "#{_command.capitalize} a file using a master key"
+        end
+      end
+    end
+  end
+end

data/lib/trustworthy/cli/decrypt.rb

@@ -2,47 +2,35 @@ module Trustworthy
   class CLI
     class Decrypt
       include Trustworthy::CLI::Command
+      include Trustworthy::CLI::Crypt
 
-      def self.description
-        'Decrypt a file using the master key'
+      def self._command
+        'decrypt'
       end
 
-      def parse_options(args)
-        super('encrypt', args) do |opts, options|
-          opts.on('-i', '--input FILE', 'File to decrypt') do |file|
-            options[:input_file] = file
-          end
-
-          opts.on('-o', '--output FILE', 'File to write decrypted contents to') do |file|
-            options[:output_file] = file
-          end
-        end
-      end
-
-      def run(args)
-        options = parse_options(args)
-
-        unless options.has_key?(:input_file) && options.has_key?(:output_file)
-          print_help
-          return
+      def _transform(prompt, options, input_file)
+        wrapped_ciphertext = input_file.read
+        unless wrapped_ciphertext.include?('TRUSTWORTHY ENCRYPTED FILE')
+          say("File #{options[:input_file]} does not appear to be a trustworthy encrypted file")
+          throw :error
         end
 
-        prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
-        File.open(options[:input_file], 'r') do |input_file|
-          wrapped_ciphertext = input_file.read
-          ciphertext = wrapped_ciphertext.gsub(/-+(BEGIN|END) TRUSTWORTHY ENCRYPTED FILE-+/, '')
-          ciphertext = ciphertext.gsub(/^Version: .*$/, '')
-          ciphertext = ciphertext.gsub("\n", '')
-
-          master_key = prompt.unlock_master_key
-          plaintext = master_key.decrypt(ciphertext)
-          File.open(options[:output_file], 'wb+') do |output_file|
-            output_file.write(plaintext)
-          end
+        master_key = prompt.unlock_master_key
+        ciphertext = _strip_ciphertext(wrapped_ciphertext)
+        plaintext = master_key.decrypt(ciphertext)
+        File.open(options[:output_file], 'wb+') do |output_file|
+          output_file.write(plaintext)
         end
 
         say("Decrypted #{options[:input_file]} to #{options[:output_file]}")
       end
+
+      def _strip_ciphertext(ciphertext)
+        ciphertext.
+          gsub(/-+(BEGIN|END) TRUSTWORTHY ENCRYPTED FILE-+/, '').
+          gsub(/^Version: .*$/, '').
+          gsub("\n", '')
+      end
     end
   end
 end

data/lib/trustworthy/cli/encrypt.rb

@@ -2,52 +2,31 @@ module Trustworthy
   class CLI
     class Encrypt
       include Trustworthy::CLI::Command
+      include Trustworthy::CLI::Crypt
 
-      def self.description
-        'Encrypt a file using the master key'
+      def self._command
+        'encrypt'
       end
 
-      def parse_options(args)
-        super('encrypt', args) do |opts, options|
-          opts.on('-i', '--input FILE', 'File to encrypt') do |file|
-            options[:input_file] = file
-          end
-
-          opts.on('-o', '--output FILE', 'File to write encrypted contents to') do |file|
-            options[:output_file] = file
-          end
-        end
-      end
-
-      def run(args)
-        options = parse_options(args)
-
-        unless options.has_key?(:input_file) && options.has_key?(:output_file)
-          print_help
-          return
-        end
-
-        prompt = Trustworthy::Prompt.new(options[:config_file], $terminal)
-        File.open(options[:input_file], 'rb') do |input_file|
-          plaintext = input_file.read
-          master_key = prompt.unlock_master_key
-          ciphertext = master_key.encrypt(plaintext)
-          File.open(options[:output_file], 'w+') do |output_file|
-            wrapped_ciphertext = ciphertext.scan(/.{1,64}/).join("\n")
-            output_file.write('-----BEGIN TRUSTWORTHY ENCRYPTED FILE-----')
-            output_file.write("\n")
-            output_file.write("Version: Trustworthy/#{Trustworthy::VERSION}")
-            output_file.write("\n")
-            output_file.write("\n")
-            output_file.write(wrapped_ciphertext)
-            output_file.write("\n")
-            output_file.write('-----END TRUSTWORTHY ENCRYPTED FILE-----')
-            output_file.write("\n")
-          end
+      def _transform(prompt, options, input_file)
+        plaintext = input_file.read
+        master_key = prompt.unlock_master_key
+        ciphertext = master_key.encrypt(plaintext)
+        File.open(options[:output_file], 'wb+') do |output_file|
+          _format_ciphertext(output_file, ciphertext)
         end
 
         say("Encrypted #{options[:input_file]} to #{options[:output_file]}")
       end
+
+      def _format_ciphertext(output_file, ciphertext)
+        wrapped_ciphertext = ciphertext.scan(/.{1,64}/).join("\n")
+        output_file.puts('-----BEGIN TRUSTWORTHY ENCRYPTED FILE-----')
+        output_file.puts("Version: Trustworthy/#{Trustworthy::VERSION}")
+        output_file.puts
+        output_file.puts(wrapped_ciphertext)
+        output_file.puts('-----END TRUSTWORTHY ENCRYPTED FILE-----')
+      end
     end
   end
 end

data/lib/trustworthy/key.rb

@@ -8,9 +8,18 @@ module Trustworthy
       new(x, y)
     end
 
+    def self.create_from_string(str)
+      x, y = str.split(',').map { |n| BigDecimal.new(n) }
+      Trustworthy::Key.new(x, y)
+    end
+
     def initialize(x, y)
       @x = x
       @y = y
     end
+
+    def to_s
+      "#{x.to_s('F')},#{y.to_s('F')}"
+    end
   end
 end

data/lib/trustworthy/settings.rb

@@ -2,9 +2,7 @@ module Trustworthy
   class Settings
     def self.open(filename)
       store = YAML::Store.new(filename)
-      if store.respond_to?(:ultra_safe=)
-        store.ultra_safe = true
-      end
+      store.ultra_safe = true if store.respond_to?(:ultra_safe=)
 
       store.transaction do
         yield Trustworthy::Settings.new(store)
@@ -17,20 +15,8 @@ module Trustworthy
 
     def add_key(key, username, password)
       salt = SCrypt::Engine.generate_salt
-
-      cipher = _cipher_from_password(salt, password)
-      nonce = Trustworthy::Cipher.generate_nonce
-      plaintext = "#{key.x.to_s('F')},#{key.y.to_s('F')}"
-      ciphertext = cipher.encrypt(nonce, '', plaintext)
-
-      encrypted_point = [nonce, ciphertext].map do |field|
-        Base64.encode64(field).gsub("\n", '')
-      end.join('--')
-
-      @store[username] = {
-        'salt' => salt,
-        'encrypted_point' => encrypted_point
-      }
+      encrypted_point = _encrypt(key.to_s, salt, password)
+      @store[username] = {'salt' => salt, 'encrypted_point' => encrypted_point}
     end
 
     def empty?
@@ -53,15 +39,8 @@ module Trustworthy
       key = find_key(username)
       salt = key['salt']
       ciphertext = key['encrypted_point']
-
-      nonce, ciphertext = ciphertext.split('--').map do |field|
-        Base64.decode64(field)
-      end
-
-      cipher = _cipher_from_password(salt, password)
-      plaintext = cipher.decrypt(nonce, '', ciphertext)
-      x, y = plaintext.split(',').map { |n| BigDecimal.new(n) }
-      Trustworthy::Key.new(x, y)
+      plaintext = _decrypt(ciphertext, salt, password)
+      Trustworthy::Key.create_from_string(plaintext)
     end
 
     def _cipher_from_password(salt, password)
@@ -69,5 +48,22 @@ module Trustworthy
       key = SCrypt::Engine.scrypt(password, salt, cost, Trustworthy::Cipher.key_len)
       Trustworthy::Cipher.new(key)
     end
+
+    def _decrypt(ciphertext, salt, password)
+      cipher = _cipher_from_password(salt, password)
+      nonce, ciphertext = ciphertext.split('--').map do |field|
+        Base64.decode64(field)
+      end
+      cipher.decrypt(nonce, '', ciphertext)
+    end
+
+    def _encrypt(plaintext, salt, password)
+      cipher = _cipher_from_password(salt, password)
+      nonce = Trustworthy::Cipher.generate_nonce
+      ciphertext = cipher.encrypt(nonce, '', plaintext)
+      [nonce, ciphertext].map do |field|
+        Base64.encode64(field).gsub("\n", '')
+      end.join('--')
+    end
   end
 end

data/lib/trustworthy/version.rb

@@ -1,3 +1,3 @@
 module Trustworthy
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/spec/trustworthy/cli/decrypt_spec.rb

@@ -37,7 +37,7 @@ describe Trustworthy::CLI::Decrypt do
         'user2',
         'password2'
       ) do
-        decrypt = Trustworthy::CLI::Encrypt.new
+        decrypt = Trustworthy::CLI::Decrypt.new
         decrypt.should_receive(:print_help)
         decrypt.run([])
       end
@@ -50,10 +50,20 @@ describe Trustworthy::CLI::Decrypt do
         'user2',
         'password2'
       ) do
-        decrypt = Trustworthy::CLI::Encrypt.new
+        decrypt = Trustworthy::CLI::Decrypt.new
         decrypt.should_receive(:print_help)
         decrypt.run(['-i', 'input.txt'])
       end
     end
+
+    it 'should error on non-trustworthy input files' do
+      File.open('input.txt', 'w+') do |file|
+        file.write('bad file')
+      end
+
+      decrypt = Trustworthy::CLI::Decrypt.new
+      decrypt.should_receive(:say).with('File input.txt does not appear to be a trustworthy encrypted file')
+      decrypt.run(['-i', 'input.txt', '-o', 'output.txt'])
+    end
   end
 end

data/spec/trustworthy/key_spec.rb

@@ -8,4 +8,21 @@ describe Trustworthy::Key do
       key.y.should == 84
     end
   end
+
+  describe 'self.create_from_string' do
+    it 'should create a key from the string representation' do
+      key = Trustworthy::Key.create_from_string('4.0,5.0')
+      key.x.should == BigDecimal.new('4.0')
+      key.y.should == BigDecimal.new('5.0')
+    end
+  end
+
+  describe 'to_s' do
+    it 'should return a set of points' do
+      x = BigDecimal.new('4')
+      y = BigDecimal.new('5')
+      key = Trustworthy::Key.new(x, y)
+      key.to_s.should == '4.0,5.0'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trustworthy
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - John Downey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aead
@@ -120,6 +120,7 @@ extra_rdoc_files: []
 files:
 - lib/trustworthy/cli/add_key.rb
 - lib/trustworthy/cli/command.rb
+- lib/trustworthy/cli/crypt.rb
 - lib/trustworthy/cli/decrypt.rb
 - lib/trustworthy/cli/encrypt.rb
 - lib/trustworthy/cli/init.rb
@@ -143,6 +144,7 @@ files:
 - spec/trustworthy/settings_spec.rb
 - bin/trustworthy
 - README.md
+- LICENSE
 homepage: http://github.com/jtdowney/trustworthy
 licenses:
 - MIT
@@ -163,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Encrypt and decrypt files with multiple key holders
@@ -178,3 +180,4 @@ test_files:
 - spec/trustworthy/prompt_spec.rb
 - spec/trustworthy/random_spec.rb
 - spec/trustworthy/settings_spec.rb
+has_rdoc: