loyal3-sentry 0.5.0 → 0.5.2

data/Rakefile

@@ -9,7 +9,7 @@ require 'rake/testtask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'sentry'
-PKG_VERSION   = '0.3.1'
+PKG_VERSION   = '0.5.2'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PROD_HOST     = "technoweenie@bidwell.textdrive.com"
 RUBY_FORGE_PROJECT = 'sentry'

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.2

data/lib/active_record/sentry.rb

@@ -32,11 +32,12 @@ module ActiveRecord # :nodoc:
           define_method("#{attr_name}_with_decryption") do |*optional|
             begin
               crypted_value = self.send("#{attr_name}_without_decryption")
+              #puts "crypted value: #{crypted_value}"
               return nil if crypted_value.nil?
               key = optional.shift || (options[:key].is_a?(Proc) ? options[:key].call : options[:key]) || ::Sentry.default_key
-              decrypted_value = ::Sentry::AsymmetricSentry.decrypt_from_base64(crypted_value, key)
-              return decrypted_value[8,decrypted_value.length-8]
-            rescue
+              decrypted_value = ::Sentry::AsymmetricSentry.decrypt_large_from_base64(crypted_value, key)
+              return decrypted_value
+            rescue Exception => e
               nil
             end
           end
@@ -58,8 +59,7 @@ module ActiveRecord # :nodoc:
 
       def encrypt_for_sentry(string)
         return nil if string.nil?
-        padded_value = ActiveRecord::Sentry.rand_string + string
-        encrypted_value = ::Sentry::AsymmetricSentry.encrypt_to_base64(padded_value)
+        return ::Sentry::AsymmetricSentry.encrypt_large_to_base64(string)
       end
 
       private

data/lib/sentry/asymmetric_sentry.rb

@@ -13,8 +13,8 @@ module Sentry
     # * <tt>:symmetric_algorithm</tt> - algorithm to use for SymmetricSentry
     def initialize(options = {})
       @public_key = @private_key = nil
-      private_key_file = options[:private_key_file]
-      public_key_file  = options[:public_key_file] || @@default_public_key_file
+      self.private_key_file = options[:private_key_file]
+      self.public_key_file  = options[:public_key_file] || @@default_public_key_file
       @symmetric_algorithm = options[:symmetric_algorithm] || @@default_symmetric_algorithm
     end
   
@@ -25,9 +25,10 @@ module Sentry
     end
 
     def decrypt_large_from_base64(data, key=nil)
-      padding_length = data[0]
       chunk_length = public_rsa.max_encryptable_length + 11 # 11 is magic padding for RSA encoding
-      data = Base64.decode64(data[1,data.length])
+      b64_decoded = Base64.decode64(data)
+      padding_length = b64_decoded[0]
+      data = b64_decoded[1, data.length]
       return (0...data.length).step(chunk_length).inject("") { |accum, idx| accum + decrypt_with_padding(data.slice(idx, chunk_length), padding_length, key)}
     end
 
@@ -38,7 +39,7 @@ module Sentry
     def encrypt_large_to_base64(data)
       padding_length = 8
       chunk_length = chunk_size(padding_length)
-      return padding_length.chr + Base64.encode64( (0...data.length).step(chunk_length).inject("") {|accum, idx| accum + encrypt_with_padding( data.slice(idx, chunk_length), padding_length)} )
+      return Base64.encode64(padding_length.chr + (0...data.length).step(chunk_length).inject("") {|accum, idx| accum + encrypt_with_padding( data.slice(idx, chunk_length), padding_length)} )
     end
 
     def decrypt_with_padding(data, padding_length, key=nil)
@@ -110,11 +111,19 @@ module Sentry
       def encrypt_to_base64(data)
         self.new.encrypt_to_base64(data)
       end
+
+      def encrypt_large_to_base64(data)
+        self.new.encrypt_large_to_base64(data)
+      end
   
       def decrypt(data, key = nil)
         self.new.decrypt(data, key)
       end
   
+      def decrypt_large_from_base64(data, key = nil)
+         self.new.decrypt_large_from_base64(data, key)
+      end
+      
       def decrypt_from_base64(data, key = nil)
         self.new.decrypt_from_base64(data, key)
       end
@@ -156,6 +165,7 @@ module Sentry
       if @private_key_file and File.file?(@private_key_file)
         @private_key = File.open(@private_key_file) { |f| f.read }
       end
+      return @private_key
     end
   
     def load_public_key

data/sentry.gemspec

@@ -5,18 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sentry}
-  s.version = "0.5.0"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Pelly", "David Stevenson"]
-  s.date = %q{2009-08-18}
+  s.date = %q{2009-08-19}
   s.description = %q{Asymmetric encryption of active record fields}
   s.email = %q{commoncode@pivotallabs.com}
   s.extra_rdoc_files = [
     "README"
   ]
   s.files = [
-    ".gitignore",
      "CHANGELOG",
      "MIT-LICENSE",
      "README",

data/test/asymmetric_sentry_callback_test.rb

@@ -98,6 +98,10 @@ class AsymmetricSentryCallbackTest < ActiveSupport::TestCase
     assert_nil users(:user_2).creditcard('other secret')
   end
 
+  def test_do_encryption
+    use_encrypted_keys
+  end
+
   def test_should_encrypt_encrypted_creditcard
     use_encrypted_keys
     u = User.create :login => 'jones'

data/test/asymmetric_sentry_test.rb

@@ -2,6 +2,8 @@ require 'abstract_unit'
 
 class AsymmetricSentryTest < Test::Unit::TestCase
   def setup
+    Sentry::AsymmetricSentry.default_public_key_file = nil
+    Sentry::AsymmetricSentry.default_private_key_file = nil
     @str = 'sentry'
     @key = 'secret'
     @public_key_file = File.dirname(__FILE__) + '/keys/public'
@@ -13,8 +15,6 @@ class AsymmetricSentryTest < Test::Unit::TestCase
     @orig = 'sentry'
     @data = "vYfMxtVB8ezXmQKSNqTC9sPgi8TbsYRxWd7DVbpprzyuEdZ7gftJ/0IXsbXm\nXCU08bTAl0uEFm7dau+eJMXEJg==\n"
     @encrypted_data = "q2obYAITmK93ylzVS01mJx1jSlnmylMX15nFpb4uKesVgnqvtzBRHZ/SK+Nm\nEzceIoAcJc3DHosVa4VUE/aK/A==\n"
-    Sentry::AsymmetricSentry.default_public_key_file = nil
-    Sentry::AsymmetricSentry.default_private_key_file = nil
   end
 
   def test_should_decrypt_files
@@ -62,13 +62,6 @@ class AsymmetricSentryTest < Test::Unit::TestCase
     assert_equal @orig, Sentry::AsymmetricSentry.decrypt_from_base64(@data)
   end
 
-  def test_foo
-    puts "^^^^^^^"
-    puts `ruby -v`
-    puts (1...20).step(3).inspect
-
-  end
-
   def test_should_decrypt_files_with_default_encrypted_key_using_class_method
     set_default_key_files @encrypted_public_key_file, @encrypted_private_key_file
     assert_equal @orig, Sentry::AsymmetricSentry.decrypt_from_base64(@encrypted_data, @key)

data/test/fixtures/users.yml

@@ -2,8 +2,8 @@ user_1:
   id: 1
   login: bob
   password: "0XlmUuNpE2k=\n"
-  creditcard: "n0DW3do8BTv5caPgR52CVtZJ4IXh8Fmkpt7k2QnHaxIx63I9ILG+GKKzXuIM\nohtHRSnzcw3gk1gkeDpYml9CoQ==\n"  # "sentry" with 8 characters of prepadding
+  creditcard: "CBUI2TcYh/ATRB7fYpDBb0t1ifOWPb5jfpO2M8Zy9D/8Gua6/uA+ILHwKtGY\nOgrooPYSxwpBzEZoH18mXqJE7yk=\n"  # "sentry" with 8 characters of prepadding
 user_2:
   id: 2
   login: fred
-  creditcard: "MiIZuZmc7znWzqZuPWYPVATXeJUrfxCNyVYibefs2hfvpna7Godk6RWILXfi\nqRRU0WehLLo1Mq5EuMTTnPi09A==\n"  # "sentry" with 8 different characters of prepadding
+  creditcard: "CEUx1Ufxi7leQVp0xHhMWKqBcvrb0p3VvX5rqJBXSwddH+Alscs73TEX8Ctn\n9WnV5Ii8txpa20UfM3h5msLpm20=\n"  # "sentry" with 8 different characters of prepadding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: loyal3-sentry
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors: 
 - John Pelly
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-18 00:00:00 -07:00
+date: 2009-08-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -23,7 +23,6 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
-- .gitignore
 - CHANGELOG
 - MIT-LICENSE
 - README

data/.gitignore

@@ -1,3 +0,0 @@
-.idea/*
-*.log
-