mongoid-kms 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cb228e647b25e802a9177c9e2f4eee88a630002
-  data.tar.gz: 4b67ede7c96225fd21b317af50ae3813649fc541
+  metadata.gz: 0b721f1617dbd2a4c8b99a82f4f0dd5a9ab1aa91
+  data.tar.gz: 8751a588d3a45ea1a10c1fa5abd0d9e6ba0e1881
 SHA512:
-  metadata.gz: e97764a5fac3ffa37ce481eff455c1f66c792de64268958af20fc5add2ee604483f3ce7baa7b59b0a09566a4cf82c889063427136ec9e0b2470823bc99119270
-  data.tar.gz: d53ebd837648518bac3ae1c54a6979bf4891b728da2c7d60880988f9b52ed186baf0d96230d4f1e6a814f6d816008ef5f937000ff47bb458c56cbca544915aea
+  metadata.gz: e0dd1407b688f8cb6ceffa37228d4d0f3ab7868f6e9b35080c9ff21b9fb2f6ee4506f0b81d6fc5573503212f0ec0048bc76049eeca95e53716a3c9d74c9d66ea
+  data.tar.gz: 9ec33a149e4d181a87556b9a0d7f42df1ee472e3f1dfff901e05ee3f5750b4fb8adef52d85a89ee2623857bb9a8e579ed4e263e23cc67641d85c3c42c1172029

data/lib/mongoid/kms/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
 module Kms
-VERSION = "0.0.25"
+VERSION = "0.0.26"
 end
 end

data/lib/mongoid/kms.rb

@@ -58,7 +58,9 @@ module Mongoid
           encrypted_field_name = self.class.get_encrypted_field_name(field_name)
 
           if instance_variable_get("@#{field_name}").nil? && kms_context_value_changed?(field_name)
-            value = self.class.decrypt_field(self, field_name, self.send(encrypted_field_name), self.class.kms_context_was(self, field_name))
+            raw = self.send(encrypted_field_name)
+            raw = raw.data if raw.is_a?(Mongoid::Kms.bson_class::Binary)
+            value = self.class.decrypt_field(self, field_name, raw, self.class.kms_context_was(self, field_name))
           else
             value = send("#{field_name}")
           end
@@ -66,7 +68,7 @@ module Mongoid
           if value.nil?
             self.send("#{encrypted_field_name}=", nil)
           else
-            self.send("#{encrypted_field_name}=", self.class.encrypt_field(self, field_name, value))
+            self.send("#{encrypted_field_name}=", Mongoid::Kms.bson_class::Binary.new(self.class.encrypt_field(self, field_name, value)))
           end
         end
       end
@@ -88,7 +90,7 @@ module Mongoid
           key_id: Mongoid::Kms.key,
           plaintext: value,
           encryption_context: kms_context(object, field_name)
-        })[:ciphertext_blob].force_encoding('UTF-8')
+        })[:ciphertext_blob]
       end
 
       def decrypt_field(object, field_name, data, encryption_context = nil)
@@ -152,11 +154,12 @@ module Mongoid
         define_method(field_name) do
           instance_variable_get("@#{field_name}") || begin
             raw = send("kms_secure_#{field_name}")
+            raw = raw.data if raw.is_a?(Mongoid::Kms.bson_class::Binary)
 
             if raw.nil?
               raw
             else
-              v = Mongoid::Kms.bson_class::Binary.new(self.class.decrypt_field(self, field_name, raw))
+              v = self.class.decrypt_field(self, field_name, raw)
               instance_variable_set("@#{field_name}", v)
               v
             end

data/spec/lib/mongoid/kms_spec.rb

@@ -15,7 +15,7 @@ describe Mongoid::Kms do
     o.save!
 
     o = MyClass.find(o.id)
-    expect(o.secure).to eq(BSON::Binary.new "batman")
+    expect(o.secure).to eq("batman")
     expect(o.unsecure).to eq("robin")
   end
 
@@ -24,7 +24,7 @@ describe Mongoid::Kms do
     o.save!
 
     o = OtherClass.find(o.id)
-    expect(o.super_secure).to eq(BSON::Binary.new "joker")
+    expect(o.super_secure).to eq("joker")
     expect(o.unsecure).to eq("pengiun")
   end
 
@@ -37,7 +37,7 @@ describe Mongoid::Kms do
     o.save!
 
     o = MyClass.find(o.id)
-    expect(o.secure).to eq(BSON::Binary.new "other")
+    expect(o.secure).to eq("other")
   end
 
   it "updates properly" do
@@ -49,7 +49,7 @@ describe Mongoid::Kms do
     o.save!
 
     o = MyClass.find(o.id)
-    expect(o.secure).to eq(BSON::Binary.new "salted-other")
+    expect(o.secure).to eq("salted-other")
   end
 
   it "handles a class without context" do
@@ -57,7 +57,7 @@ describe Mongoid::Kms do
     o.save!
 
     o = MyClass.find(o.id)
-    expect(o.secure).to eq(BSON::Binary.new("bla"))
+    expect(o.secure).to eq("bla")
   end
 
   it "fails to configure without a region" do
@@ -69,7 +69,7 @@ describe Mongoid::Kms do
     o.save!
 
     o = ExtendedClass.find(o.id)
-    expect(o.additional_secure).to eq(BSON::Binary.new "wha!")
+    expect(o.additional_secure).to eq("wha!")
     o.test_hash_crash
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-kms
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Chris Winslett