metavida-oauth 0.3.2 → 0.3.2.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.3 / 0.4.0
+
+* Corrected OAuth XMPP namespace (Seth)
+* Fixed edge cases in  ActionoControllerRequest proxy where params were being
+  incorrectly signed (Marcos Wright Kuhns)
+
 == 0.3.2 2009-03-23
 
 * 2xx statuses should be treated as success (Anders Conbere)

data/Rakefile

@@ -7,7 +7,7 @@ require 'oauth/version'
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.new('oauth', OAuth::VERSION) do |p|
   p.author = ['Pelle Braendgaard','Blaine Cook','Larry Halff','Jesse Clark','Jon Crosby', 'Seth Fitzsimmons']
-  p.email = "pelleb@gmail.com"
+  p.email = "oauth-ruby@googlegroups.com"
   p.description = "OAuth Core Ruby implementation"
   p.summary = p.description
   p.changes              = p.paragraphs_of("History.txt", 0..1).join("\n\n")

data/lib/oauth/cli.rb

@@ -111,7 +111,7 @@ module OAuth
               stdout.puts
               stdout.puts "XMPP Stanza:"
               stdout.puts <<-EOS
-  <oauth xmlns='urn:xmpp:tmp:oauth'>
+  <oauth xmlns='urn:xmpp:oauth:0'>
     <oauth_consumer_key>#{request.oauth_consumer_key}</oauth_consumer_key>
     <oauth_token>#{request.oauth_token}</oauth_token>
     <oauth_signature_method>#{request.oauth_signature_method}</oauth_signature_method>

data/lib/oauth/request_proxy/action_controller_request.rb

@@ -42,7 +42,7 @@ module OAuth::RequestProxy
       unless options[:clobber_request]
         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")
+        if request.post? && request.content_type == Mime::Type.lookup("application/x-www-form-urlencoded")
           params << request.raw_post
         end
       end

data/lib/oauth/version.rb

@@ -1,3 +1,3 @@
 module OAuth #:nodoc:
-  VERSION = '0.3.2'
+  VERSION = '0.3.2.1'
 end

data/oauth.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{oauth}
-  s.version = "0.3.2"
+  s.version = "0.3.2.1"
 
   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

@@ -5,31 +5,113 @@ require 'action_controller/test_process'
 
 class ActionControllerRequestProxyTest < Test::Unit::TestCase
 
-  def request_proxy(parameters={})
-    request = ActionController::TestRequest.new({}, parameters)
+  def request_proxy(request_method = :get, uri_params = {}, body_params = {})
+    request = ActionController::TestRequest.new
+    
+    case request_method
+    when :post
+      request.env['REQUEST_METHOD'] = 'POST'
+    when :put
+      request.env['REQUEST_METHOD'] = 'PUT'
+    end
+    
+    request.env['RAW_POST_DATA'] = body_params.to_query
     request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'
+    
     yield request if block_given?
-    OAuth::RequestProxy.proxy(request)
+    OAuth::RequestProxy.proxy(request, :parameters=>uri_params)
+  end
+  
+  def test_that_proxy_simple_get_request_works_with_query_params
+    request_proxy = request_proxy(:get, {'key'=>'value'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'GET', request_proxy.method
   end
- 
+  
+  def test_that_proxy_simple_post_request_works_with_query_params
+    request_proxy = request_proxy(:post, {'key'=>'value'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'POST', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_query_params
+    request_proxy = request_proxy(:put, {'key'=>'value'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'PUT', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_post_params
+    request_proxy = request_proxy(:get, {}, {'key'=>'value'})
+
+    expected_parameters = []
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'GET', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_post_request_works_with_post_params
+    request_proxy = request_proxy(:post, {}, {'key'=>'value'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'POST', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_post_params
+    request_proxy = request_proxy(:put, {}, {'key'=>'value'})
+
+    expected_parameters = []
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'PUT', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_mixed_params
+    request_proxy = request_proxy(:get, {'key'=>'value'}, {'key2'=>'value2'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'GET', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_post_request_works_with_mixed_params
+    request_proxy = request_proxy(:post, {'key'=>'value'}, {'key2'=>'value2'})
+
+    expected_parameters = [["key", "value"],["key2", "value2"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'POST', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_mixed_params
+    request_proxy = request_proxy(:put, {'key'=>'value'}, {'key2'=>'value2'})
+
+    expected_parameters = [["key", "value"]]
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'PUT', request_proxy.method
+  end
+  
   def test_parameter_keys_should_preserve_brackets_from_hash
     assert_equal(
       [["message[body]", "This is a test"]],
-      request_proxy({ :message => { :body => 'This is a test' }}).parameters_for_signature
+      request_proxy(:post, { :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
+      request_proxy(:post, { :message => { :body => 'http://foo.com/?a=b&c=d'}}).parameters_for_signature
     )
   end
 
   def test_parameter_keys_should_preserve_brackets_from_array
     assert_equal(
       [["foo[]", "123"], ["foo[]", "456"]],
-      request_proxy({ :foo => [123, 456] }).parameters_for_signature.sort
+      request_proxy(:post, { :foo => [123, 456] }).parameters_for_signature.sort
     )
   end
   

data/test/test_net_http_client.rb

@@ -32,18 +32,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal 'key=value', request.body
     assert_equal "OAuth oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"26g7wHTtNO6ZWJaLltcueppHYiI%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
   end
- 
-  def test_that_using_post_params_works
-    request = Net::HTTP::Post.new(@request_uri.path)
-    request.set_form_data( @request_parameters )
-    request.oauth!(@http, @consumer, @token, {:scheme => 'body', :nonce => @nonce, :timestamp => @timestamp})
-
-    assert_equal 'POST', request.method
-    assert_equal '/test', request.path
-    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3d&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", request.body.split("&").sort.join("&")
-    assert_equal nil, request['authorization']
-  end
-
+  
   def test_that_using_get_params_works
     request = Net::HTTP::Get.new(@request_uri.path + "?" + request_parameters_to_s)
     request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp})
@@ -55,8 +44,19 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=1oO2izFav1GP4kEH2EskwXkCRFg%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", uri.query.split("&").sort.join("&")
     assert_equal nil, request['authorization']
   end
+  
+  def test_that_using_post_params_works
+    request = Net::HTTP::Post.new(@request_uri.path)
+    request.set_form_data( @request_parameters )
+    request.oauth!(@http, @consumer, @token, {:scheme => 'body', :nonce => @nonce, :timestamp => @timestamp})
+
+    assert_equal 'POST', request.method
+    assert_equal '/test', request.path
+    assert_equal "key=value&oauth_consumer_key=consumer_key_86cad9&oauth_nonce=225579211881198842005988698334675835446&oauth_signature=26g7wHTtNO6ZWJaLltcueppHYiI%3d&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1199645624&oauth_token=token_411a7f&oauth_version=1.0", request.body.split("&").sort.join("&")
+    assert_equal nil, request['authorization']
+  end
 
-  def test_that_using_get_params_works_with_post_requests
+  def test_that_using_post_with_uri_params_works
     request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
     request.oauth!(@http, @consumer, @token, {:scheme => 'query_string', :nonce => @nonce, :timestamp => @timestamp})
 
@@ -69,7 +69,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal nil, request['authorization']
   end
 
-  def test_that_using_get_params_works_with_post_requests_that_have_post_bodies
+  def test_that_using_post_with_uri_and_form_params_works
     request = Net::HTTP::Post.new(@request_uri.path + "?" + request_parameters_to_s)
     request.set_form_data( { 'key2' => 'value2' } )
     request.oauth!(@http, @consumer, @token, {:scheme => :query_string, :nonce => @nonce, :timestamp => @timestamp})

data/test/test_net_http_request_proxy.rb

@@ -8,29 +8,64 @@ class NetHTTPRequestProxyTest < Test::Unit::TestCase
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value'})
 
     expected_parameters = {'key' => ['value']}
-    assert_equal expected_parameters, request_proxy.parameters
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'GET', request_proxy.method
   end
 
-  def test_that_proxy_simple_post_request_works
+  def test_that_proxy_simple_post_request_works_with_arguments
     request = Net::HTTP::Post.new('/test')
     params = {'key' => 'value'}
     request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test', :parameters => params})
 
     expected_parameters = {'key' => ['value']}
-    assert_equal expected_parameters, request_proxy.parameters
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'POST', request_proxy.method
   end
 
-  def test_that_proxy_post_and_get_request_works
+  def test_that_proxy_simple_post_request_works_with_form_data
+    request = Net::HTTP::Post.new('/test')
+    params = {'key' => 'value'}
+    request.set_form_data(params)
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
+
+    expected_parameters = {'key' => ['value']}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'POST', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_argugments
+    request = Net::HTTP::Put.new('/test')
+    params = {'key' => 'value'}
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test', :parameters => params})
+
+    expected_parameters = {'key' => ['value']}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'PUT', request_proxy.method
+  end
+  
+  def test_that_proxy_simple_put_request_works_with_form_data
+    request = Net::HTTP::Put.new('/test')
+    params = {'key' => 'value'}
+    request.set_form_data(params)
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test'})
+
+    expected_parameters = {}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'PUT', request_proxy.method
+  end
+
+  def test_that_proxy_post_request_works_with_mixed_parameter_sources
     request = Net::HTTP::Post.new('/test?key=value')
-    params = {'key2' => 'value2'}
-    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => params})
+    request.set_form_data({'key2' => 'value2'})
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => {'key3' => 'value3'}})
 
-    expected_parameters = {'key' => ['value'], 'key2' => ['value2']}
-    assert_equal expected_parameters, request_proxy.parameters
+    expected_parameters = {'key' => ['value'], 'key2' => ['value2'], 'key3' => ['value3']}
+    assert_equal expected_parameters, request_proxy.parameters_for_signature
     assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'POST', request_proxy.method
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: metavida-oauth
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.3.2.1
 platform: ruby
 authors: 
 - Pelle Braendgaard