lockbox 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8198d9c7bf3be294c7efc7c7d03abbe64ccf8d487a0a81ad01151b225dbfde92
-  data.tar.gz: dd51f9c1dc06a4cc657fb8b25a05f4a2960a2bce6883fd97dd41d1ac7e426e91
+  metadata.gz: c64ea693f929a79e495419fe5203760f73a2e1047602031eb90dcfd6542448d7
+  data.tar.gz: d5c43889eb01598b80ed47bb2d521fbd4970a94bf0e0880770f66f54d0ccfca9
 SHA512:
-  metadata.gz: fe9c1274693558f3e184b7881f027c0e1ce895aeacd2c222451ea87a61ed7ff1064ed324a2e11a3bf35f60fa3647698ded89574a8c378ef42c0b538fe6606e1c
-  data.tar.gz: 65ea6fb170250edf535692e085700430e4fe25ebca07e63d17de7e2f99afcb0d3089787a4b90c193b3314ae9bcde9540454eae3685a242da1e166c36d2982b19
+  metadata.gz: 760e4d28aaa0e3c059541ee91367112036e34bb87b64232d6de3a5e0c016ed59d47c79ea8549d67bb30922277869eed1187d2c5d77349430b7de81d50f2bc7d3
+  data.tar.gz: cee190766d994e26e05fce781c17404fd99fa74d1606c57f1103ed4e428abb0f2256779f005ace00123e07901fd3c4435083e6e950d8d01e92609625dfeca2da

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.4 (2020-04-05)
+
+- Fixed `migrating: true` with `validate: false`
+- Fixed serialization when migrating certain column types
+
 ## 0.3.3 (2020-02-16)
 
 - Improved performance of `rotate` for attributes with blind indexes

data/README.md

@@ -472,7 +472,7 @@ class UsersController < ApplicationController
     LockboxAudit.create!(
       subject: @user,
       viewer: current_user,
-      data: ["email", "dob"],
+      data: ["name", "email"],
       context: "#{controller_name}##{action_name}",
       ip: request.remote_ip
     )

data/lib/lockbox/box.rb

@@ -70,7 +70,7 @@ module Lockbox
           nonce, ciphertext = extract_nonce(@box, ciphertext)
           @box.decrypt(nonce, ciphertext, associated_data)
         end
-      message = Lockbox.unpad(message, size: @padding) if @padding
+      message = Lockbox.unpad!(message, size: @padding) if @padding
       message
     end
 

data/lib/lockbox/encryptor.rb

@@ -3,6 +3,8 @@ module Lockbox
     def initialize(**options)
       options = Lockbox.default_options.merge(options)
       @encode = options.delete(:encode)
+      # option may be renamed to binary: true
+      # warn "[lockbox] Lockbox 1.0 will default to encode: true. Pass encode: false to keep the current behavior." if @encode.nil?
       previous_versions = options.delete(:previous_versions)
 
       @boxes =
@@ -81,16 +83,19 @@ module Lockbox
       target.set_encoding(source.external_encoding) if source.respond_to?(:external_encoding)
     end
 
+    # TODO remove in 0.4.0
     # legacy for attr_encrypted
     def self.encrypt(options)
       box(options).encrypt(options[:value])
     end
 
+    # TODO remove in 0.4.0
     # legacy for attr_encrypted
     def self.decrypt(options)
       box(options).decrypt(options[:value])
     end
 
+    # TODO remove in 0.4.0
     # legacy for attr_encrypted
     def self.box(options)
       options = options.slice(:key, :encryption_key, :decryption_key, :algorithm, :previous_versions)

data/lib/lockbox/migrator.rb

@@ -67,7 +67,7 @@ module Lockbox
 
           relation = relation.merge(or_relation)
         else
-          relation = relation.or(attributes.map { |a| {a => nil} })
+          relation.merge(relation.unscoped.or(attributes.map { |a| {a => nil} }))
         end
       end
 

data/lib/lockbox/model.rb

@@ -125,7 +125,13 @@ module Lockbox
               serialize name, JSON if options[:type] == :json
               serialize name, Hash if options[:type] == :hash
             elsif !attributes_to_define_after_schema_loads.key?(name.to_s)
-              attribute name, :string
+              # when migrating it's best to specify the type directly
+              # however, we can try to use the original type if its already defined
+              if attributes_to_define_after_schema_loads.key?(original_name.to_s)
+                attribute name, attributes_to_define_after_schema_loads[original_name.to_s].first
+              else
+                attribute name, :string
+              end
             end
 
             define_method("#{name}_was") do
@@ -330,9 +336,23 @@ module Lockbox
           end
 
           if options[:migrating]
-            before_validation do
-              send("#{name}=", send(original_name)) if send("#{original_name}_changed?")
+            # TODO reuse module
+            m = Module.new do
+              define_method "#{original_name}=" do |value|
+                result = super(value)
+                send("#{name}=", send(original_name))
+                result
+              end
+
+              unless activerecord
+                define_method "reset_#{original_name}!" do
+                  result = super()
+                  send("#{name}=", send(original_name))
+                  result
+                end
+              end
             end
+            prepend m
           end
         end
       end

data/lib/lockbox/padding.rb

@@ -3,16 +3,24 @@ module Lockbox
     PAD_FIRST_BYTE = "\x80".b
     PAD_ZERO_BYTE = "\x00".b
 
+    def pad(str, **options)
+      pad!(str.dup, **options)
+    end
+
+    def unpad(str, **options)
+      unpad!(str.dup, **options)
+    end
+
     # ISO/IEC 7816-4
     # same as Libsodium
     # https://libsodium.gitbook.io/doc/padding
     # apply prior to encryption
     # note: current implementation does not
     # try to minimize side channels
-    def pad(str, size: 16)
+    def pad!(str, size: 16)
       raise ArgumentError, "Invalid size" if size < 1
 
-      str = str.dup.force_encoding(Encoding::BINARY)
+      str.force_encoding(Encoding::BINARY)
 
       pad_length = size - 1
       pad_length -= str.bytesize % size
@@ -27,12 +35,10 @@ module Lockbox
 
     # note: current implementation does not
     # try to minimize side channels
-    def unpad(str, size: 16)
+    def unpad!(str, size: 16)
       raise ArgumentError, "Invalid size" if size < 1
 
-      if str.encoding != Encoding::BINARY
-        str = str.dup.force_encoding(Encoding::BINARY)
-      end
+      str.force_encoding(Encoding::BINARY)
 
       i = 1
       while i <= size
@@ -40,7 +46,8 @@ module Lockbox
         when PAD_ZERO_BYTE
           i += 1
         when PAD_FIRST_BYTE
-          return str[0..-(i + 1)]
+          str.slice!(-i..-1)
+          return str
         else
           break
         end

data/lib/lockbox/utils.rb

@@ -2,6 +2,7 @@ module Lockbox
   class Utils
     def self.build_box(context, options, table, attribute)
       options = options.except(:attribute, :encrypted_attribute, :migrating, :attached, :type)
+      options[:encode] = false unless options.key?(:encode)
       options.each do |k, v|
         if v.is_a?(Proc)
           options[k] = context.instance_exec(&v) if v.respond_to?(:call)

data/lib/lockbox/version.rb

@@ -1,3 +1,3 @@
 module Lockbox
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lockbox
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler