From 7ad541f955dfa396f4a6b29700bed2e188cd9187 Mon Sep 17 00:00:00 2001
From: Logan Leger <logan@loganleger.com>
Date: Fri, 21 Nov 2014 17:52:22 -0600
Subject: Add `#verified` and `#valid_message?` to MessageVerifier

This commit adds a `#verified` method to
`ActiveSupport::MessageVerifier` which will return either `false` when
it encounters an error or the message. `#verify` continues to raise an
`InvalidSignature` exception on error.

This commit also adds a convenience boolean method on `MessageVerifier`
as a way to check if a message is valid without performing the
decoding.
---
 .../lib/active_support/message_verifier.rb          | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'activesupport/lib')

diff --git a/activesupport/lib/active_support/message_verifier.rb b/activesupport/lib/active_support/message_verifier.rb
index a8a8de5672..8e5d050540 100644
--- a/activesupport/lib/active_support/message_verifier.rb
+++ b/activesupport/lib/active_support/message_verifier.rb
@@ -34,21 +34,30 @@ module ActiveSupport
       @serializer = options[:serializer] || Marshal
     end
 
-    def verify(signed_message)
-      raise InvalidSignature if signed_message.blank?
-
+    def valid_message?(signed_message)
+      return false if signed_message.blank?
+      
       data, digest = signed_message.split("--")
-      if data.present? && digest.present? && ActiveSupport::SecurityUtils.secure_compare(digest, generate_digest(data))
+      data.present? && digest.present? && ActiveSupport::SecurityUtils.secure_compare(digest, generate_digest(data))
+    end
+
+    def verified(signed_message)
+      if valid_message?(signed_message)
         begin
+          data = signed_message.split("--")[0]
           @serializer.load(decode(data))
         rescue ArgumentError => argument_error
-          raise InvalidSignature if argument_error.message =~ %r{invalid base64}
+          return false if argument_error.message =~ %r{invalid base64}
           raise
         end
       else
-        raise InvalidSignature
+        false
       end
     end
+    
+    def verify(signed_message)
+      verified(signed_message) || raise(InvalidSignature)
+    end
 
     def generate(value)
       data = encode(@serializer.dump(value))
-- 
cgit v1.2.3