aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2019-06-06 15:43:52 +0200
committerGitHub <noreply@github.com>2019-06-06 15:43:52 +0200
commit480d9f2d2431e6a11c89edb45123181f9b6db958 (patch)
tree33c0448be93ec8080f7fe57b40284e955d6a434f /activesupport/lib
parent66ee39be6d4583980595ff53319d8f36a36d8813 (diff)
parenta5502f4a795d6d34d4f05eeefc9f9a653eff0eb0 (diff)
downloadrails-480d9f2d2431e6a11c89edb45123181f9b6db958.tar.gz
rails-480d9f2d2431e6a11c89edb45123181f9b6db958.tar.bz2
rails-480d9f2d2431e6a11c89edb45123181f9b6db958.zip
Merge pull request #36270 from Edouard-chin/ec-on-rotation-constructor
Allow `on_rotation` in MessageEncryptor to be passed in constructor:
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/messages/rotator.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/messages/rotator.rb b/activesupport/lib/active_support/messages/rotator.rb
index 823a399d67..50ea7dcd8d 100644
--- a/activesupport/lib/active_support/messages/rotator.rb
+++ b/activesupport/lib/active_support/messages/rotator.rb
@@ -3,11 +3,12 @@
module ActiveSupport
module Messages
module Rotator # :nodoc:
- def initialize(*, **options)
+ def initialize(*, on_rotation: nil, **options)
super
@options = options
@rotations = []
+ @on_rotation = on_rotation
end
def rotate(*secrets, **options)
@@ -17,7 +18,7 @@ module ActiveSupport
module Encryptor
include Rotator
- def decrypt_and_verify(*args, on_rotation: nil, **options)
+ def decrypt_and_verify(*args, on_rotation: @on_rotation, **options)
super
rescue MessageEncryptor::InvalidMessage, MessageVerifier::InvalidSignature
run_rotations(on_rotation) { |encryptor| encryptor.decrypt_and_verify(*args, options) } || raise
@@ -32,7 +33,7 @@ module ActiveSupport
module Verifier
include Rotator
- def verified(*args, on_rotation: nil, **options)
+ def verified(*args, on_rotation: @on_rotation, **options)
super || run_rotations(on_rotation) { |verifier| verifier.verified(*args, options) }
end
@@ -46,7 +47,7 @@ module ActiveSupport
def run_rotations(on_rotation)
@rotations.find do |rotation|
if message = yield(rotation) rescue next
- on_rotation.call if on_rotation
+ on_rotation&.call
return message
end
end