diff options
author | José Valim <jose.valim@gmail.com> | 2011-09-15 09:14:16 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-09-15 09:14:16 -0700 |
commit | 06c3ca8173add65c4eeaa1942195348e6ebb0574 (patch) | |
tree | 234254725c5702f5e94c39626fcfc06e387f12a5 /activesupport/lib/active_support/message_encryptor.rb | |
parent | da7f0426ec7b0aa053489633c2a8a3da6423654f (diff) | |
parent | a8aaef676217f53f2812cd56f71a6b00c5d22162 (diff) | |
download | rails-06c3ca8173add65c4eeaa1942195348e6ebb0574.tar.gz rails-06c3ca8173add65c4eeaa1942195348e6ebb0574.tar.bz2 rails-06c3ca8173add65c4eeaa1942195348e6ebb0574.zip |
Merge pull request #3031 from wvanbergen/master
Custom serializers and deserializers in MessageVerifier and MessageEncryptor.
Diffstat (limited to 'activesupport/lib/active_support/message_encryptor.rb')
-rw-r--r-- | activesupport/lib/active_support/message_encryptor.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index 4f7cd12d48..05d6790075 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -13,9 +13,13 @@ module ActiveSupport class InvalidMessage < StandardError; end OpenSSLCipherError = OpenSSL::Cipher.const_defined?(:CipherError) ? OpenSSL::Cipher::CipherError : OpenSSL::CipherError + attr_accessor :serializer, :deserializer + def initialize(secret, cipher = 'aes-256-cbc') @secret = secret @cipher = cipher + @serializer = lambda { |value| Marshal.dump(value) } + @deserializer = lambda { |value| Marshal.load(value) } end def encrypt(value) @@ -27,7 +31,7 @@ module ActiveSupport cipher.key = @secret cipher.iv = iv - encrypted_data = cipher.update(Marshal.dump(value)) + encrypted_data = cipher.update(serializer.call(value)) encrypted_data << cipher.final [encrypted_data, iv].map {|v| ActiveSupport::Base64.encode64s(v)}.join("--") @@ -44,7 +48,7 @@ module ActiveSupport decrypted_data = cipher.update(encrypted_data) decrypted_data << cipher.final - Marshal.load(decrypted_data) + deserializer.call(decrypted_data) rescue OpenSSLCipherError, TypeError raise InvalidMessage end |