lockbox 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ff8aec789f8ef6d6e8ec99c0c7a2d0d79e2a1c673042eeaf6cd04ab4e8b04ca
-  data.tar.gz: dc552daada840ec604a9e36c4c98a11e4079e5da41be66bff9fd66619e3804f9
+  metadata.gz: 10f6fa1f09a73c4fb740dce62478c0abc65dbfa6ed5434801429bf5d990e2e38
+  data.tar.gz: b6975e18f7f9c28ce7397f982a6f3900fc6af7938883e0631afbd72e32d5caec
 SHA512:
-  metadata.gz: 0c42c4e685a33bf56639b111ee7d815084580ee37d4bbc9e5ed3120f1651c15dbeabc976d705d95870f9d271e32765898992cb5853936c8752c0dcf03fb89d2f
-  data.tar.gz: 9edb22666740c150f8eeda4a3e6b02ccb662abaa8775aa74beb104d90c0c15fc27d2420521f2312ce25bb724323cb45645cb954386dcfaca5be6237c77609bcc
+  metadata.gz: 322b03e672c6e389f26311e57625b6f6e633c64dbd27904a6c5c59105b809b295edd2d49171965ad6c6f6707e8a7d4ddf191b2612b7563326a9c867cabcc9b57
+  data.tar.gz: 2a4cec96d5b0388bae885cb817aba5ada8ac1c65d74f3fc310800a207f500eba15d5de475c7b94e81027f7b4f09599c9a4b5c65145b6996e6ca9eda7215704a4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.2.3
+
+- Added time type
+- Added support for rotating padding with same key
+- Fixed `OpenSSL::KDF` error on some platforms
+- Fixed UTF-8 error
+
 ## 0.2.2
 
 - Fixed error with models that have attachments but no encrypted attachments

data/README.md

@@ -80,6 +80,7 @@ Specify the type of a field with:
 class User < ApplicationRecord
   encrypts :born_on, type: :date
   encrypts :signed_at, type: :datetime
+  encrypts :opens_at, type: :time
   encrypts :active, type: :boolean
   encrypts :salary, type: :integer
   encrypts :latitude, type: :float

data/lib/lockbox.rb

@@ -1,4 +1,5 @@
 # dependencies
+require "openssl"
 require "securerandom"
 
 # modules
@@ -97,7 +98,9 @@ class Lockbox
       begin
         return box.decrypt(ciphertext, **options)
       rescue => e
-        error_classes = [DecryptionError]
+        # returning DecryptionError instead of PaddingError
+        # is for end-user convenience, not for security
+        error_classes = [DecryptionError, PaddingError]
         error_classes << RbNaCl::LengthError if defined?(RbNaCl::LengthError)
         error_classes << RbNaCl::CryptoError if defined?(RbNaCl::CryptoError)
         if error_classes.any? { |ec| e.is_a?(ec) }

data/lib/lockbox/aes_gcm.rb

@@ -1,5 +1,3 @@
-require "openssl"
-
 class Lockbox
   class AES_GCM
     def initialize(key)

data/lib/lockbox/box.rb

@@ -1,5 +1,3 @@
-require "securerandom"
-
 class Lockbox
   class Box
     def initialize(key: nil, algorithm: nil, encryption_key: nil, decryption_key: nil, padding: false)
@@ -74,7 +72,7 @@ class Lockbox
       message
     end
 
-    # protect key for xchacha20 and hybrid
+    # protect key for xsalsa20, xchacha20, and hybrid
     def inspect
       to_s
     end

data/lib/lockbox/key_generator.rb

@@ -21,7 +21,7 @@ class Lockbox
     end
 
     def hkdf(ikm, salt:, info:, length:, hash:)
-      if OpenSSL::KDF.respond_to?(:hkdf)
+      if defined?(OpenSSL::KDF.hkdf)
         return OpenSSL::KDF.hkdf(ikm, salt: salt, info: info, length: length, hash: hash)
       end
 

data/lib/lockbox/model.rb

@@ -50,7 +50,7 @@ class Lockbox
       #   options[:type] = :float
       # end
 
-      raise ArgumentError, "Unknown type: #{options[:type]}" unless [nil, :string, :boolean, :date, :datetime, :integer, :float, :binary, :json, :hash].include?(options[:type])
+      raise ArgumentError, "Unknown type: #{options[:type]}" unless [nil, :string, :boolean, :date, :datetime, :time, :integer, :float, :binary, :json, :hash].include?(options[:type])
 
       attribute_type =
         case options[:type]
@@ -156,6 +156,11 @@ class Lockbox
                 message = ActiveRecord::Type::DateTime.new.serialize(message)
                 message = nil unless message.respond_to?(:iso8601) # for Active Record < 5.2
                 message = message.iso8601(9) unless message.nil?
+              when :time
+                message = ActiveRecord::Type::Time.new.serialize(message)
+                message = nil unless message.respond_to?(:strftime)
+                message = message.strftime("%H:%M:%S.%N") unless message.nil?
+                message
               when :integer
                 message = ActiveRecord::Type::Integer.new(limit: 8).serialize(message)
                 message = 0 if message.nil?
@@ -216,12 +221,14 @@ class Lockbox
                   message = ActiveRecord::Type::Date.new.deserialize(message)
                 when :datetime
                   message = ActiveRecord::Type::DateTime.new.deserialize(message)
+                when :time
+                  message = ActiveRecord::Type::Time.new.deserialize(message)
                 when :integer
                   message = ActiveRecord::Type::Integer.new(limit: 8).deserialize(message.unpack("q>").first)
                 when :float
                   message = ActiveRecord::Type::Float.new.deserialize(message.unpack("G").first)
                 when :string
-                  message = message.encode(Encoding::UTF_8)
+                  message.force_encoding(Encoding::UTF_8)
                 when :binary
                   # do nothing
                   # decrypt returns binary string
@@ -229,6 +236,9 @@ class Lockbox
                   type = self.class.attribute_types[name.to_s]
                   if type.is_a?(ActiveRecord::Type::Serialized)
                     message = type.deserialize(message)
+                  else
+                    # default to string if not serialized
+                    message.force_encoding(Encoding::UTF_8)
                   end
                 end
               end

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 class Lockbox
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-24 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement