aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/message_verifier.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/message_verifier.rb')
-rw-r--r--activesupport/lib/active_support/message_verifier.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index 8e5d050540..97fb994cff 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -35,8 +35,8 @@ module ActiveSupport
end
def valid_message?(signed_message)
- return false if signed_message.blank?
-
+ return if signed_message.blank?
+
data, digest = signed_message.split("--")
data.present? && digest.present? && ActiveSupport::SecurityUtils.secure_compare(digest, generate_digest(data))
end
@@ -47,14 +47,12 @@ module ActiveSupport
data = signed_message.split("--")[0]
@serializer.load(decode(data))
rescue ArgumentError => argument_error
- return false if argument_error.message =~ %r{invalid base64}
+ return if argument_error.message =~ %r{invalid base64}
raise
end
- else
- false
end
end
-
+
def verify(signed_message)
verified(signed_message) || raise(InvalidSignature)
end