mojodna-oauth 0.3.1.4 → 0.3.1.5

data/lib/oauth/cli.rb

@@ -106,7 +106,7 @@ module OAuth
         options[:oauth_signature_method] = "HMAC-SHA1"
         options[:oauth_timestamp] = OAuth::Helper.generate_timestamp
         options[:oauth_version] = "1.0"
-        options[:params] = ""
+        options[:params] = []
 
         opts.on("--consumer-key KEY", "Specifies the consumer key to use.") do |v|
           options[:oauth_consumer_key] = v
@@ -125,7 +125,7 @@ module OAuth
         end
 
         opts.on("--parameters PARAMS", "Specifies the parameters to use when signing.") do |v|
-          options[:params] = v
+          options[:params] << v
         end
 
         opts.on("--signature-method METHOD", "Specifies the signature method to use; defaults to HMAC-SHA1.") do |v|
@@ -176,9 +176,13 @@ module OAuth
     end
 
     def prepare_parameters
-      escaped_pairs = options[:params].split(/[&,]/).collect do |pair|
-        Hash[*pair.split("=")].collect do |k,v|
-          [CGI.escape(k.strip), CGI.escape(v.strip)] * "="
+      escaped_pairs = options[:params].collect do |pair|
+        if pair =~ /:/
+          Hash[*pair.split(":", 2)].collect do |k,v|
+            [CGI.escape(k.strip), CGI.escape(v.strip)] * "="
+          end
+        else
+          pair
         end
       end
 

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -37,7 +37,7 @@ module OAuth::RequestProxy
         params << header_params.to_query
         params << request.query_string unless request.query_string.blank?
         if request.content_type == Mime::Type.lookup("application/x-www-form-urlencoded")
-          params << CGI.unescape(request.raw_post)
+          params << request.raw_post
         end
       end
 
@@ -45,7 +45,7 @@ module OAuth::RequestProxy
         join('&').split('&').
         reject { |kv| kv =~ /^oauth_signature=.*/}.
         reject(&:blank?).
-        map { |p| p.split('=') }
+        map { |p| p.split('=').map{|esc| CGI.unescape(esc)} }
     end
 
   protected

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.1.4'
+  VERSION = '0.3.1.5'
 end

data/oauth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.3.1.4"
+  s.version = "0.3.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Pelle Braendgaard", "Blaine Cook", "Larry Halff", "Jesse Clark", "Jon Crosby", "Seth Fitzsimmons"]

data/test/test_action_controller_request_proxy.rb

@@ -18,6 +18,13 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
       request_proxy({ :message => { :body => 'This is a test' }}).parameters_for_signature
     )
   end
+  
+  def test_parameter_values_with_amps_should_not_break_parameter_parsing
+    assert_equal(
+      [['message[body]', 'http://foo.com/?a=b&c=d']],
+      request_proxy({ :message => { :body => 'http://foo.com/?a=b&c=d'}}).parameters_for_signature
+    )
+  end
 
   def test_parameter_keys_should_preserve_brackets_from_array
     assert_equal(
@@ -25,4 +32,14 @@ class ActionControllerRequestProxyTest < Test::Unit::TestCase
       request_proxy({ :foo => [123, 456] }).parameters_for_signature.sort
     )
   end
+  
+  def test_query_string_parameter_values_should_be_cgi_unescaped
+    request = request_proxy do |r|
+      r.env['QUERY_STRING'] = 'url=http%3A%2F%2Ffoo.com%2F%3Fa%3Db%26c%3Dd'
+    end
+    assert_equal(
+      [['url', 'http://foo.com/?a=b&c=d']],
+      request.parameters_for_signature.sort
+    )
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mojodna-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.4
+  version: 0.3.1.5
 platform: ruby
 authors: 
 - Pelle Braendgaard