9fbfd8100b
In #42843 and #42846, several config settings were added to control the default serializer for `MessageEncryptor` and `MessageVerifier`, and to provide a migration path from a default `Marshal` serializer to a default `JSON` serializer: * `config.active_support.default_message_encryptor_serializer` * Supports `:marshal`, `:hybrid`, or `:json`. * `config.active_support.default_message_verifier_serializer` * Supports `:marshal`, `:hybrid`, or `:json`. * `config.active_support.fallback_to_marshal_deserialization` * Affects `:hybrid` for both `MessageEncryptor` and `MessageVerifier`. * `config.active_support.use_marshal_serialization` * Affects `:hybrid` for both `MessageEncryptor` and `MessageVerifier`. This commit unifies those config settings into a single setting, `config.active_support.message_serializer`, which supports `:marshal`, `:json_allow_marshal`, and `:json` values. So, for example, ```ruby config.active_support.default_message_encryptor_serializer = :hybrid config.active_support.default_message_verifier_serializer = :hybrid config.active_support.fallback_to_marshal_deserialization = true config.active_support.use_marshal_serialization = false ``` becomes ```ruby config.active_support.message_serializer = :json_allow_marshal ``` and ```ruby config.active_support.default_message_encryptor_serializer = :hybrid config.active_support.default_message_verifier_serializer = :hybrid config.active_support.fallback_to_marshal_deserialization = false config.active_support.use_marshal_serialization = false ``` becomes ```ruby config.active_support.message_serializer = :json ``` This commit also replaces `ActiveSupport::JsonWithMarshalFallback` with `ActiveSupport::Messages::SerializerWithFallback`, which implements a generic mechanism for serializer fallback. The `:marshal` serializer uses this mechanism too, so ```ruby config.active_support.default_message_encryptor_serializer = :hybrid config.active_support.default_message_verifier_serializer = :hybrid config.active_support.fallback_to_marshal_deserialization = false config.active_support.use_marshal_serialization = true ``` becomes ```ruby config.active_support.message_serializer = :marshal ``` Additionally, the logging behavior of `JsonWithMarshalFallback` has been replaced with notifications which include the names of the intended and actual serializers, as well as the serialized and deserialized message data. This provides a more targeted means of tracking serializer fallback events. It also allows the user to "silence" such events, if desired, without an additional config setting. All of these changes make it easier to add migration paths for new serializers such as `ActiveSupport::MessagePack`.
135 lines
3.9 KiB
Ruby
135 lines
3.9 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
#--
|
|
# Copyright (c) David Heinemeier Hansson
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining
|
|
# a copy of this software and associated documentation files (the
|
|
# "Software"), to deal in the Software without restriction, including
|
|
# without limitation the rights to use, copy, modify, merge, publish,
|
|
# distribute, sublicense, and/or sell copies of the Software, and to
|
|
# permit persons to whom the Software is furnished to do so, subject to
|
|
# the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be
|
|
# included in all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
|
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
|
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
#++
|
|
|
|
require "securerandom"
|
|
require "active_support/dependencies/autoload"
|
|
require "active_support/version"
|
|
require "active_support/deprecator"
|
|
require "active_support/logger"
|
|
require "active_support/lazy_load_hooks"
|
|
require "active_support/core_ext/date_and_time/compatibility"
|
|
|
|
# :include: activesupport/README.rdoc
|
|
module ActiveSupport
|
|
extend ActiveSupport::Autoload
|
|
|
|
autoload :Concern
|
|
autoload :CodeGenerator
|
|
autoload :ActionableError
|
|
autoload :ConfigurationFile
|
|
autoload :CurrentAttributes
|
|
autoload :Dependencies
|
|
autoload :DescendantsTracker
|
|
autoload :ExecutionWrapper
|
|
autoload :Executor
|
|
autoload :ErrorReporter
|
|
autoload :FileUpdateChecker
|
|
autoload :EventedFileUpdateChecker
|
|
autoload :ForkTracker
|
|
autoload :LogSubscriber
|
|
autoload :IsolatedExecutionState
|
|
autoload :Notifications
|
|
autoload :Reloader
|
|
autoload :SecureCompareRotator
|
|
|
|
eager_autoload do
|
|
autoload :BacktraceCleaner
|
|
autoload :ProxyObject
|
|
autoload :Benchmarkable
|
|
autoload :Cache
|
|
autoload :Callbacks
|
|
autoload :Configurable
|
|
autoload :Deprecation
|
|
autoload :Digest
|
|
autoload :ExecutionContext
|
|
autoload :Gzip
|
|
autoload :Inflector
|
|
autoload :JSON
|
|
autoload :KeyGenerator
|
|
autoload :MessageEncryptor
|
|
autoload :MessageEncryptors
|
|
autoload :MessageVerifier
|
|
autoload :MessageVerifiers
|
|
autoload :Multibyte
|
|
autoload :NumberHelper
|
|
autoload :OptionMerger
|
|
autoload :OrderedHash
|
|
autoload :OrderedOptions
|
|
autoload :StringInquirer
|
|
autoload :EnvironmentInquirer
|
|
autoload :TaggedLogging
|
|
autoload :XmlMini
|
|
autoload :ArrayInquirer
|
|
end
|
|
|
|
autoload :Rescuable
|
|
autoload :SafeBuffer, "active_support/core_ext/string/output_safety"
|
|
autoload :TestCase
|
|
|
|
def self.eager_load!
|
|
super
|
|
|
|
NumberHelper.eager_load!
|
|
end
|
|
|
|
cattr_accessor :test_order # :nodoc:
|
|
cattr_accessor :test_parallelization_threshold, default: 50 # :nodoc:
|
|
|
|
@error_reporter = ActiveSupport::ErrorReporter.new
|
|
singleton_class.attr_accessor :error_reporter # :nodoc:
|
|
|
|
def self.cache_format_version
|
|
Cache.format_version
|
|
end
|
|
|
|
def self.cache_format_version=(value)
|
|
Cache.format_version = value
|
|
end
|
|
|
|
def self.to_time_preserves_timezone
|
|
DateAndTime::Compatibility.preserve_timezone
|
|
end
|
|
|
|
def self.to_time_preserves_timezone=(value)
|
|
unless value
|
|
ActiveSupport.deprecator.warn(
|
|
"Support for the pre-Ruby 2.4 behavior of to_time has been deprecated and will be removed in Rails 7.2."
|
|
)
|
|
end
|
|
|
|
DateAndTime::Compatibility.preserve_timezone = value
|
|
end
|
|
|
|
def self.utc_to_local_returns_utc_offset_times
|
|
DateAndTime::Compatibility.utc_to_local_returns_utc_offset_times
|
|
end
|
|
|
|
def self.utc_to_local_returns_utc_offset_times=(value)
|
|
DateAndTime::Compatibility.utc_to_local_returns_utc_offset_times = value
|
|
end
|
|
end
|
|
|
|
autoload :I18n, "active_support/i18n"
|