symmetric-encryption 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30cffd6db15e542fee8493edb838e9843906d54
-  data.tar.gz: 9e869eb73ce3cba78ff656d049fe3177fdeadea4
+  metadata.gz: e317defa3d42505af60cafe4a0b2536eece87610
+  data.tar.gz: 457e73b4600877ccb94491bac705fe2d5cb07b8b
 SHA512:
-  metadata.gz: 2caf1f8d69a160d78c372d61d0c2267e58416ab470ad955f7a6d2e7a381798649d68ff054dd3065a318bfb510aa86606bd4e609061bd602ac3cf7486b505294a
-  data.tar.gz: 0cd59f67247763283ae7320971477a064489b5a551fd15fa0e14f12cb8d56ec4d6a8e479b28bd6cf94a1396f3cb10aee9ad3f551f7cb266e0cd5baf7f1948734
+  metadata.gz: 628ef9f9873e93d96d276775033524d2f40744e289760be21f7e9c3c2bdaf99f8b65af5313e7c3d8c2e6a861ef4d49918695733ff62420728d1fe0628407f9b3
+  data.tar.gz: a94058c40a5f285a7dc78207cceb980546cdd09dfcfe90fc11a28c727029868d50b63183c7cceee03d1d9f741b939ab73293484b5984fb3a71edc841bb40f0d9

data/lib/symmetric_encryption/cipher.rb

@@ -392,7 +392,7 @@ module SymmetricEncryption
         openssl_cipher.iv = iv if iv
         # Set the binary indicator on the header if string is Binary Encoded
         binary = (string.encoding == SymmetricEncryption::BINARY_ENCODING)
-        self.class.build_header(version, compress, random_iv ? iv : nil, binary) +
+        self.class.build_header(version, compress, random_iv ? iv : nil, nil, nil, binary) +
           openssl_cipher.update(compress ? Zlib::Deflate.deflate(string) : string)
       else
         openssl_cipher.iv = @iv if @iv

data/lib/symmetric_encryption/mongoid.rb

@@ -79,13 +79,13 @@
 Mongoid::Fields.option :encrypted do |model, field, options|
   if options != false
     options = options.is_a?(Hash) ? options.dup : {}
-    field_name = field.name
+    encrypted_field_name = field.name
 
-    decrypt_as = options.delete(:decrypt_as)
-    if decrypt_as.nil? && field_name.to_s.start_with?('encrypted_')
-      decrypt_as = field_name.to_s['encrypted_'.length..-1]
+    decrypted_field_name = options.delete(:decrypt_as)
+    if decrypted_field_name.nil? && encrypted_field_name.to_s.start_with?('encrypted_')
+      decrypted_field_name = encrypted_field_name.to_s['encrypted_'.length..-1]
     else
-      raise "SymmetricEncryption for Mongoid. Encryption enabled for field #{field_name}. It must either start with 'encrypted_' or the option :decrypt_as must be supplied"
+      raise "SymmetricEncryption for Mongoid. Encryption enabled for field #{encrypted_field_name}. It must either start with 'encrypted_' or the option :decrypt_as must be supplied"
     end
 
     random_iv = options.delete(:random_iv) || false
@@ -95,21 +95,21 @@ Mongoid::Fields.option :encrypted do |model, field, options|
     model.class_eval(<<-EOS, __FILE__, __LINE__ + 1)
       # Set the un-encrypted field
       # Also updates the encrypted field with the encrypted value
-      def #{decrypt_as}=(value)
-        @stored_#{field_name} = ::SymmetricEncryption.encrypt(value,#{random_iv},#{compress})
-        self.#{field_name} = @stored_#{field_name}
-        @#{decrypt_as} = value.freeze
+      # Freeze the decrypted field value so that it is not modified directly
+      def #{decrypted_field_name}=(value)
+        self.#{encrypted_field_name} = @stored_#{encrypted_field_name} = ::SymmetricEncryption.encrypt(value,#{random_iv},#{compress})
+        @#{decrypted_field_name} = value.freeze
       end
 
       # Returns the decrypted value for the encrypted field
       # The decrypted value is cached and is only decrypted if the encrypted value has changed
       # If this method is not called, then the encrypted value is never decrypted
-      def #{decrypt_as}
-        if @stored_#{field_name} != self.#{field_name}
-          @#{decrypt_as} = ::SymmetricEncryption.decrypt(self.#{field_name}).freeze
-          @stored_#{field_name} = self.#{field_name}
+      def #{decrypted_field_name}
+        if @stored_#{encrypted_field_name} != self.#{encrypted_field_name}
+          @#{decrypted_field_name} = ::SymmetricEncryption.decrypt(self.#{encrypted_field_name}).freeze
+          @stored_#{encrypted_field_name} = self.#{encrypted_field_name}
         end
-        @#{decrypt_as}
+        @#{decrypted_field_name}
       end
     EOS
   end

data/lib/symmetric_encryption/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module SymmetricEncryption #:nodoc
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symmetric-encryption
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Reid Morrison