Make message encryptor/verifier initializer takes keyword arguments

The arguments are already passed as keyword arguments.
This commit is contained in:
Ryuta Kamizono 2020-02-09 13:35:10 +09:00
parent 83a8721cae
commit 6708f3a5b7
3 changed files with 9 additions and 11 deletions

View File

@ -134,15 +134,13 @@ module ActiveSupport
# * <tt>:digest</tt> - String of digest to use for signing. Default is
# +SHA1+. Ignored when using an AEAD cipher like 'aes-256-gcm'.
# * <tt>:serializer</tt> - Object serializer to use. Default is +Marshal+.
def initialize(secret, *signature_key_or_options)
options = signature_key_or_options.extract_options!
sign_secret = signature_key_or_options.first
def initialize(secret, sign_secret = nil, cipher: nil, digest: nil, serializer: nil)
@secret = secret
@sign_secret = sign_secret
@cipher = options[:cipher] || self.class.default_cipher
@digest = options[:digest] || "SHA1" unless aead_mode?
@cipher = cipher || self.class.default_cipher
@digest = digest || "SHA1" unless aead_mode?
@verifier = resolve_verifier
@serializer = options[:serializer] || Marshal
@serializer = serializer || Marshal
end
# Encrypt and sign a message. We need to sign the message in order to avoid

View File

@ -103,11 +103,11 @@ module ActiveSupport
class InvalidSignature < StandardError; end
def initialize(secret, options = {})
def initialize(secret, digest: nil, serializer: nil)
raise ArgumentError, "Secret should not be nil." unless secret
@secret = secret
@digest = options[:digest] || "SHA1"
@serializer = options[:serializer] || Marshal
@digest = digest || "SHA1"
@serializer = serializer || Marshal
end
# Checks if a signed message could have been generated by signing an object

View File

@ -3,8 +3,8 @@
module ActiveSupport
module Messages
module Rotator # :nodoc:
def initialize(*, on_rotation: nil, **options)
super
def initialize(*secrets, on_rotation: nil, **options)
super(*secrets, **options)
@options = options
@rotations = []