facebook-signed-request 0.2.6 → 0.2.7

data/.travis.yml

@@ -0,0 +1,4 @@
+rvm:
+  - 1.9.2
+  - 1.8.7
+  - ree

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in facebook-signed-request.gemspec
 gemspec
+gem 'rake'
+gem 'json'

data/README.md

@@ -22,7 +22,7 @@ Usage
     #  "Invalid Base64 Encoding for data",
     #  "Invalid JSON object",
     #  "Invalid Algorithm. Expected: HMAC-SHA256",
-    #  "Signatures do not match. #{expected} but was #{computed}"
+    #  "Signatures do not match.
     #]
 
     request.data

data/Rakefile

@@ -1,12 +1,12 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
-namespace :test do
-  Rake::TestTask.new(:units) do |t|
-    t.libs << "test"
-    t.test_files = FileList['test/*_test.rb']
+task :default => [:test]
 
-    t.verbose = true
-  end
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/unit/test_*.rb']
+
+  t.verbose = true
 end
 

data/lib/base64_backport.rb

@@ -0,0 +1,27 @@
+module Base64
+  module_function
+
+  def encode64(bin)
+    [bin].pack("m")
+  end
+
+  def decode64(str)
+    str.unpack("m").first
+  end
+
+  def strict_encode64(bin)
+    encode64(bin).gsub(/\n/, "")
+  end
+
+  def strict_decode64(str)
+    decode64( str.gsub(/\n/, "") ).first
+  end
+
+  def urlsafe_encode64(bin)
+    strict_encode64(bin).tr("+/", "-_")
+  end
+
+  def urlsafe_decode64(str)
+    strict_decode64(str.tr("-_", "+/"))
+  end
+end

data/lib/facebook-signed-request.rb

@@ -1,8 +1,10 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), 'facebook-signed-request'))
 
-require "facebook-signed-request/version"
+require 'rubygems'
+require 'facebook-signed-request/version'
 require 'openssl'
 require 'base64'
+require 'base64_backport' if RUBY_VERSION < "1.9.0"
 require 'json'
 require 'signed_request'
 

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

@@ -4,13 +4,13 @@ module Facebook
     class << self
       attr_accessor :secret
 
-      # Creates a signed_request with correctly padded Base64 encoding.
+      # Creates a signed_request without padding, just like facebook.
       # Mostly useful for testing.
       def encode_and_sign options
         encoded_data      = Base64.urlsafe_encode64( options.to_json ).tr('=', '')
         digestor          = OpenSSL::Digest::Digest.new('sha256')
         signature         = OpenSSL::HMAC.digest( digestor, @secret, encoded_data )
-        encoded_signature = Base64.urlsafe_encode64( signature )
+        encoded_signature = Base64.strict_encode64( signature ).tr("+/", "-_")
         encoded_signature = encoded_signature.tr('=', '')
 
         "#{encoded_signature}.#{encoded_data}"
@@ -67,7 +67,7 @@ module Facebook
 
     def base64_url_decode( encoded_string )
       encoded_string << '=' until ( encoded_string.length % 4 == 0 )
-      Base64.urlsafe_decode64(encoded_string)
+      Base64.strict_decode64(encoded_string.tr("-_", "+/"))
     rescue
       nil
     end
@@ -116,9 +116,7 @@ module Facebook
 
     def validate_signature
       if @signature != @computed_signature
-        message = "Signatures do not match. " \
-                  "Computed: #{@computed_signature} but was #{@signature}"
-
+        message = "Signatures do not match."
         @errors << message
       end
     end

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

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

data/test/{signed_request_test.rb → unit/test_signed_request.rb}

@@ -69,21 +69,32 @@ class SignedRequestTest < Test::Unit::TestCase
   end
 
   test "encode and sign request params" do
-    request_1 = Facebook::SignedRequest.new( @valid_request )
 
-    reencoded_request = Facebook::SignedRequest.encode_and_sign(request_1.data)
+    request_params = {
+      :expires      => 1308988800,
+      :algorithm    => "HMAC-SHA256",
+      :user_id      => "111111111111111",
+      :oauth_token  => "111111111111111|2.AQBAttR11|T49w3BqoZUegypru1Gra70hED8",
+      :user         => {
+        :country  => "de",
+        :locale   => "en_US",
+        :age      => { :min => 21 }
+      },
+      :issued_at    => 1308985018
+    }
 
-    sig_1, data_1 = @valid_request.split(".", 2)
-    sig_2, data_2 = reencoded_request.split(".", 2)
+    request_json = request_params.to_json
+    encoded_json = Base64.urlsafe_encode64( request_json )
 
-    # Simulate invalid raw Base64 from Facebook by removing padding
-    assert_equal sig_1, sig_2
-    assert_equal data_1, data_2
+    reencoded_request = Facebook::SignedRequest.encode_and_sign( request_params )
 
-    request_2 = Facebook::SignedRequest.new( reencoded_request )
+    signature, payload = reencoded_request.split(".", 2)
 
-    assert_equal request_1.signature, request_2.signature
-    assert_equal request_1.data,      request_2.data
+    assert_equal encoded_json, payload
+
+    new_request = Facebook::SignedRequest.new( reencoded_request )
+
+    assert_equal new_request.data, request_params
   end
 
   test "ring encoding request with invalid base64 signature and payload" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-signed-request
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-04 00:00:00.000000000 +02:00
-default_executable: 
+date: 2011-10-14 00:00:00.000000000Z
 dependencies: []
 description: Parses and validates Facebook signed requests
 email:
@@ -20,16 +19,17 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
 - facebook-signed-request.gemspec
+- lib/base64_backport.rb
 - lib/facebook-signed-request.rb
 - lib/facebook-signed-request/signed_request.rb
 - lib/facebook-signed-request/version.rb
-- test/signed_request_test.rb
 - test/test_helper.rb
-has_rdoc: true
+- test/unit/test_signed_request.rb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -50,10 +50,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: facebook-signed-request
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Parses and validates Facebook signed requests
 test_files:
-- test/signed_request_test.rb
 - test/test_helper.rb
+- test/unit/test_signed_request.rb