facebook-signed-request 0.2.5 → 0.2.6

data/lib/facebook-signed-request/signed_request.rb

@@ -20,7 +20,12 @@ module Facebook
     attr_reader :errors, :signature, :data, :encoded_data
 
     def initialize( request_data, options = {} )
-      @encoded_signature, @encoded_data = request_data.split(".", 2)
+      if request_data.respond_to?(:split)
+        @encoded_signature, @encoded_data = request_data.split(".", 2)
+      else
+        @encoded_signature, @encoded_data = nil
+      end
+
       @secret = options[:secret] || SignedRequest.secret
       @errors = []
 
@@ -40,25 +45,31 @@ module Facebook
       @errors.empty?
     end
 
+    def invalid?
+      !valid?
+    end
+
     private
 
     def check_for_invalid_arguments
       if @encoded_signature.nil? || @encoded_data.nil?
-        raise ArgumentError, "Invalid Format. See http://developers.facebook.com/docs/authentication/signed_request/"
+        @errors << "Invalid Format. See http://developers.facebook.com/docs/authentication/signed_request/"
       end
 
       if @secret.nil?
-        raise ArgumentError, "No secret provided. Use SignedRequest.secret= or the options hash"
+        @errors << "No secret provided. Use SignedRequest.secret= or the options hash"
       end
 
       unless @secret.is_a?( String )
-        raise ArgumentError, "Secret should be a String"
+        @errors << "Secret should be a String"
       end
     end
 
     def base64_url_decode( encoded_string )
       encoded_string << '=' until ( encoded_string.length % 4 == 0 )
       Base64.urlsafe_decode64(encoded_string)
+    rescue
+      nil
     end
 
     def extract_request_signature
@@ -99,6 +110,8 @@ module Facebook
       computed_signature  = OpenSSL::HMAC.digest(
         digestor, @secret, @encoded_data
       )
+    rescue
+      nil
     end
 
     def validate_signature

data/lib/facebook-signed-request/version.rb

@@ -1,5 +1,5 @@
 module Facebook
   class SignedRequest
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/test/signed_request_test.rb

@@ -31,45 +31,29 @@ class SignedRequestTest < Test::Unit::TestCase
   test "parsing a request with invalid signature" do
     request = Facebook::SignedRequest.new( @invalid_request_1 )
     assert_equal false, request.valid?
-    assert_equal 2, request.errors.length
+    assert_equal 1, request.errors.length
   end
 
   test "parsing a request with invalid payload" do
     request = Facebook::SignedRequest.new( @invalid_request_2 )
     assert_equal false, request.valid?
-    assert_equal 4, request.errors.length
+    assert_equal 3, request.errors.length
   end
 
   test "new request with invalid secret" do
-    exception = assert_raise ArgumentError do
-      request = Facebook::SignedRequest.new( "foo.bar", :secret => 2 )
-    end
-
-    expected = "Secret should be a String"
-
-    assert_equal expected, exception.message
+    request = Facebook::SignedRequest.new( "foo.bar", :secret => 2 )
+    assert request.invalid?
   end
 
   test "new request with missing secret" do
     Facebook::SignedRequest.secret = nil
-
-    exception = assert_raise ArgumentError do
-      request = Facebook::SignedRequest.new( "foo.bar" )
-    end
-
-    expected = "No secret provided. Use SignedRequest.secret= or the options hash"
-
-    assert_equal expected, exception.message
+    request = Facebook::SignedRequest.new( "foo.bar" )
+    assert request.invalid?
   end
 
   test "new request with invalid parameters" do
-    exception = assert_raise ArgumentError do
-      request = Facebook::SignedRequest.new( "foobar" )
-    end
-
-    expected = "Invalid Format. See http://developers.facebook.com/docs/authentication/signed_request/"
-
-    assert_equal expected, exception.message
+    request = Facebook::SignedRequest.new( "foobar" )
+    assert request.invalid?
   end
 
   test "request with :strict => true fails for expired oauth token" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-signed-request
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-01 00:00:00.000000000 +02:00
+date: 2011-07-04 00:00:00.000000000 +02:00
 default_executable: 
 dependencies: []
 description: Parses and validates Facebook signed requests