Fix ActiveRecord::Encryption::Errors::Encoding incorrectly raises for not-encrypted binary encoded values (rails#51412)

Author: joshuay03

activerecord/lib/active_record/encryption/encrypted_attribute_type.rb

@@ -134,12 +134,12 @@ def serialize_with_current(value)
         end
 
         def encrypt_as_text(value)
+          if encryptor.binary? && !cast_type.binary?
+            raise Errors::Encoding, "Binary encoded data can only be stored in binary columns"
+          end
+
           with_context do
-            encryptor.encrypt(value, **encryption_options).tap do |encrypted|
-              if !cast_type.binary? && encrypted.encoding == Encoding::BINARY
-                raise Errors::Encoding, "Binary encoded data can only be stored in binary columns"
-              end
-            end
+            encryptor.encrypt(value, **encryption_options)
           end
         end
 

activerecord/lib/active_record/encryption/encryptor.rb

@@ -74,6 +74,10 @@ def encrypted?(text)
         false
       end
 
+      def binary?
+        serializer.binary?
+      end
+
       private
         DECRYPT_ERRORS = [OpenSSL::Cipher::CipherError, Errors::EncryptedContentIntegrity, Errors::Decryption]
         ENCODING_ERRORS = [EncodingError, Errors::Encoding]

activerecord/lib/active_record/encryption/message_pack_message_serializer.rb

@@ -31,6 +31,10 @@ def load(serialized_content)
         raise Errors::Decryption
       end
 
+      def binary?
+        true
+      end
+
       private
         def message_to_hash(message)
           {

activerecord/lib/active_record/encryption/message_serializer.rb

@@ -33,6 +33,10 @@ def dump(message)
         JSON.dump message_to_json(message)
       end
 
+      def binary?
+        false
+      end
+
       private
         def parse_message(data, level)
           validate_message_data_format(data, level)

activerecord/lib/active_record/encryption/null_encryptor.rb

@@ -16,6 +16,10 @@ def decrypt(encrypted_text, key_provider: nil, cipher_options: {})
       def encrypted?(text)
         false
       end
+
+      def binary?
+        false
+      end
     end
   end
 end

activerecord/lib/active_record/encryption/read_only_null_encryptor.rb

@@ -19,6 +19,10 @@ def decrypt(encrypted_text, key_provider: nil, cipher_options: {})
       def encrypted?(text)
         false
       end
+
+      def binary?
+        false
+      end
     end
   end
 end

activerecord/test/cases/encryption/contexts_test.rb

@@ -61,6 +61,14 @@ class ActiveRecord::Encryption::ContextsTest < ActiveRecord::EncryptionTestCase
     assert_not_encrypted_attribute @post, :title, "Some new title"
   end
 
+  test ".without_encryption doesn't raise on binary encoded data" do
+    assert_nothing_raised do
+      ActiveRecord::Encryption.without_encryption do
+        EncryptedBook.create!(name: "Dune".encode(Encoding::BINARY))
+      end
+    end
+  end
+
   test ".protecting_encrypted_data don't decrypt attributes automatically" do
     ActiveRecord::Encryption.protecting_encrypted_data do
       assert_equal @title_ciphertext, @post.reload.title

activerecord/test/cases/encryption/encryption_schemes_test.rb

@@ -199,6 +199,10 @@ def encrypted?(text)
       rescue ActiveRecord::Encryption::Errors::Decryption
         false
       end
+
+      def binary?
+        false
+      end
     end
 
     class EncryptedAuthor1 < Author