twilio-rb 2.1.2 → 2.1.3

data/lib/twilio/request_filter.rb

@@ -6,20 +6,20 @@ module Twilio
   module RequestFilter
     def filter(controller)
       request = controller.request
-      if request.format.voice? && request.ssl?
-        controller.head(:forbidden) if expected_signature_for(request) != request.env['X-Twilio-Signature']
+      if request.format.try(:voice?)
+        controller.head(:forbidden) if expected_signature_for(request) != (request.env['HTTP_X_TWILIO_SIGNATURE'] || request.env['X-Twilio-Signature'])
       end
     end
 
     private
     def expected_signature_for(request)
-      string_to_sign = request.url + request.params.sort.join
-      digest         = OpenSSL::Digest::Digest.new 'sha1'
-      hash           = OpenSSL::HMAC.digest digest, Twilio::AUTH_TOKEN, string_to_sign
+      string_to_sign = request.url + request.request_parameters.sort.join
+      digest         = OpenSSL::Digest::Digest.new('sha1')
+      hash           = OpenSSL::HMAC.digest(digest, Twilio::AUTH_TOKEN, string_to_sign)
 
       Base64.encode64(hash).strip
     end
 
     extend self
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twilio-rb
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-11 00:00:00.000000000Z
+date: 2011-11-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70244694859720 !ruby/object:Gem::Requirement
+  requirement: &70260329895920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244694859720
+  version_requirements: *70260329895920
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70244694859260 !ruby/object:Gem::Requirement
+  requirement: &70260329895460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *70244694859260
+  version_requirements: *70260329895460
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70244694858800 !ruby/object:Gem::Requirement
+  requirement: &70260329895000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70244694858800
+  version_requirements: *70260329895000
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70244694858340 !ruby/object:Gem::Requirement
+  requirement: &70260329894540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,21 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70244694858340
+  version_requirements: *70260329894540
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70244694857880 !ruby/object:Gem::Requirement
+  requirement: &70260329894080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70244694857880
+  version_requirements: *70260329894080
 - !ruby/object:Gem::Dependency
   name: jwt
-  requirement: &70244694857420 !ruby/object:Gem::Requirement
+  requirement: &70260329893620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70244694857420
+  version_requirements: *70260329893620
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70244694856960 !ruby/object:Gem::Requirement
+  requirement: &70260329893160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.1
   type: :development
   prerelease: false
-  version_requirements: *70244694856960
+  version_requirements: *70260329893160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70244694856500 !ruby/object:Gem::Requirement
+  requirement: &70260329892700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.2.0
   type: :development
   prerelease: false
-  version_requirements: *70244694856500
+  version_requirements: *70260329892700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70244694856040 !ruby/object:Gem::Requirement
+  requirement: &70260329892240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70244694856040
+  version_requirements: *70260329892240
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70244694880140 !ruby/object:Gem::Requirement
+  requirement: &70260329891780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.5
   type: :development
   prerelease: false
-  version_requirements: *70244694880140
+  version_requirements: *70260329891780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70244694879680 !ruby/object:Gem::Requirement
+  requirement: &70260329891320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70244694879680
+  version_requirements: *70260329891320
 description: A nice Ruby wrapper for the Twilio REST API
 email: sjtgraham@mac.com
 executables: []