diff options
author | Yuji Yaginuma <yuuji.yaginuma@gmail.com> | 2018-01-08 12:16:53 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-08 12:16:53 +0900 |
commit | bd79c651e0fd5f41ae39dfe8cc46901cdaf3468c (patch) | |
tree | 87febcc0e62e623d3f23dec38f897a466a1caa6f /activesupport/lib/active_support | |
parent | 1ba8412607ae7190dc1c59718099e2f04372905d (diff) | |
parent | d2113777a137bb6740d576cd75061782703f075b (diff) | |
download | rails-bd79c651e0fd5f41ae39dfe8cc46901cdaf3468c.tar.gz rails-bd79c651e0fd5f41ae39dfe8cc46901cdaf3468c.tar.bz2 rails-bd79c651e0fd5f41ae39dfe8cc46901cdaf3468c.zip |
Merge pull request #31547 from eugeneius/use_authenticated_message_encryption_new_framework_defaults
Allow use_authenticated_message_encryption to be set in new_framework_defaults_5_2.rb
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/message_encryptor.rb | 4 | ||||
-rw-r--r-- | activesupport/lib/active_support/railtie.rb | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/message_encryptor.rb b/activesupport/lib/active_support/message_encryptor.rb index 27fd061947..5236c776dd 100644 --- a/activesupport/lib/active_support/message_encryptor.rb +++ b/activesupport/lib/active_support/message_encryptor.rb @@ -81,9 +81,9 @@ module ActiveSupport class MessageEncryptor prepend Messages::Rotator::Encryptor - class << self - attr_accessor :use_authenticated_message_encryption #:nodoc: + cattr_accessor :use_authenticated_message_encryption, instance_accessor: false, default: false + class << self def default_cipher #:nodoc: if use_authenticated_message_encryption "aes-256-gcm" diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index 91872e29c8..635d98367e 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -10,9 +10,11 @@ module ActiveSupport config.eager_load_namespaces << ActiveSupport initializer "active_support.set_authenticated_message_encryption" do |app| - if app.config.active_support.respond_to?(:use_authenticated_message_encryption) - ActiveSupport::MessageEncryptor.use_authenticated_message_encryption = - app.config.active_support.use_authenticated_message_encryption + config.after_initialize do + unless app.config.active_support.use_authenticated_message_encryption.nil? + ActiveSupport::MessageEncryptor.use_authenticated_message_encryption = + app.config.active_support.use_authenticated_message_encryption + end end end |