pelle-oauth 0.2.7 → 0.3.0

data/test/cases/spec/1_0-final/test_parameter_encodings.rb

@@ -0,0 +1,86 @@
+require File.dirname(__FILE__) + '/../../oauth_case'
+
+# See http://oauth.net/core/1.0/#encoding_parameters
+#
+# 5.1.  Parameter Encoding
+# 
+# All parameter names and values are escaped using the [RFC3986] percent-encoding (%xx) mechanism. 
+# Characters not in the unreserved character set ([RFC3986] section 2.3) MUST be encoded. Characters 
+# in the unreserved character set MUST NOT be encoded. Hexadecimal characters in encodings MUST be 
+# upper case. Text names and values MUST be encoded as UTF-8 octets before percent-encoding them per [RFC3629].
+# 
+#   unreserved = ALPHA, DIGIT, '-', '.', '_', '~'
+# 
+
+class ParameterEncodingTest < OAuthCase
+  def test_encodings_alpha_num
+    assert_encoding 'abcABC123', 'abcABC123'
+  end
+
+  def test_encodings_non_escaped
+    assert_encoding '-._~', '-._~'
+  end
+
+  def test_encodings_percent
+    assert_encoding '%25', '%'
+  end
+
+  def test_encodings_plus
+    assert_encoding '%2B', '+'
+  end
+
+  def test_encodings_space
+    assert_encoding '%20', ' '
+  end
+
+  def test_encodings_query_param_symbols
+    assert_encoding '%26%3D%2A', '&=*'
+  end
+
+  def test_encodings_unicode_lf
+    assert_encoding '%0A', unicode_to_utf8('U+000A')
+  end
+
+  def test_encodings_unicode_space
+    assert_encoding '%20', unicode_to_utf8('U+0020')
+  end
+
+  def test_encodings_unicode_007f
+    assert_encoding '%7F', unicode_to_utf8('U+007F')
+  end
+
+  def test_encodings_unicode_0080
+    assert_encoding '%C2%80', unicode_to_utf8('U+0080')
+  end
+
+  def test_encoding_unicode_2708
+    assert_encoding '%E2%9C%88', unicode_to_utf8('U+2708')
+  end
+
+  def test_encodings_unicode_3001
+    assert_encoding '%E3%80%81', unicode_to_utf8('U+3001')
+  end
+
+protected
+
+  def unicode_to_utf8(unicode)
+    return unicode if unicode =~ /\A[[:space:]]*\z/m
+
+    str = ''
+
+    unicode.scan(/(U\+(?:[[:digit:][:xdigit:]]{4,5}|10[[:digit:][:xdigit:]]{4})|.)/mu) do
+      c = $1
+      if c =~ /^U\+/
+        str << [c[2..-1].hex].pack('U*')
+      else
+        str << c
+      end
+    end
+
+    str
+  end
+
+  def assert_encoding(expected, given, message = nil)
+    assert_equal expected, OAuth::Helper.escape(given), message
+  end
+end

data/test/cases/spec/1_0-final/test_signature_base_strings.rb

@@ -0,0 +1,77 @@
+require File.dirname(__FILE__) + '/../../oauth_case'
+
+# See http://oauth.net/core/1.0/#anchor14
+#
+# 9.1.  Signature Base String
+# 
+# The Signature Base String is a consistent reproducible concatenation of the request elements
+# into a single string. The string is used as an input in hashing or signing algorithms. The 
+# HMAC-SHA1 signature method provides both a standard and an example of using the Signature 
+# Base String with a signing algorithm to generate signatures. All the request parameters MUST 
+# be encoded as described in Parameter Encoding prior to constructing the Signature Base String.
+# 
+
+class SignatureBaseStringTest < OAuthCase
+  
+  def test_A_5_1
+    parameters={ 
+      'oauth_consumer_key'=>'dpf43f3p2l4k3l03',
+      'oauth_token'=>'nnch734d00sl2jdk',
+      'oauth_signature_method'=>'HMAC-SHA1',
+      'oauth_timestamp'=>'1191242096',
+      'oauth_nonce'=>'kllo9940pd9333jh',
+      'oauth_version'=>'1.0',
+      'file'=>'vacation.jpg',
+      'size'=>'original'
+    }
+    sbs='GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacation.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dkllo9940pd9333jh%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1191242096%26oauth_token%3Dnnch734d00sl2jdk%26oauth_version%3D1.0%26size%3Doriginal'
+    
+    assert_signature_base_string sbs,parameters,'GET',"http://photos.example.net/photos"
+  end
+  
+  # These are from the wiki http://wiki.oauth.net/TestCases
+  # in the section Concatenate Test Elements
+  
+  def test_wiki_1_simple_with_ending_slash
+    parameters={ 
+      'n'=>'v'
+    }
+    sbs='GET&http%3A%2F%2Fexample.com%2F&n%3Dv'
+    
+    assert_signature_base_string sbs,parameters,'GET',"http://example.com/"
+  end
+
+  
+  def test_wiki_2_simple_without_ending_slash
+    parameters={ 
+      'n'=>'v'
+    }
+    sbs='GET&http%3A%2F%2Fexample.com%2F&n%3Dv'
+    
+    assert_signature_base_string sbs,parameters,'GET',"http://example.com"
+  end
+
+  def test_wiki_2_request_token
+    parameters={ 
+'oauth_version'=>'1.0',
+'oauth_consumer_key'=>'dpf43f3p2l4k3l03',
+'oauth_timestamp'=>'1191242090',
+'oauth_nonce'=>'hsu94j3884jdopsl',
+'oauth_signature_method'=>'PLAINTEXT',
+'oauth_signature'=>'ignored'    }
+    sbs='POST&https%3A%2F%2Fphotos.example.net%2Frequest_token&oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3Dhsu94j3884jdopsl%26oauth_signature_method%3DPLAINTEXT%26oauth_timestamp%3D1191242090%26oauth_version%3D1.0'
+    
+    assert_signature_base_string sbs,parameters,'POST',"https://photos.example.net/request_token"
+  end
+  
+  protected
+  
+  
+  def assert_signature_base_string(expected,params={},method='GET',uri="http://photos.example.net/photos",message="Signature Base String does not match")
+    assert_equal expected, signature_base_string(params,method,uri), message
+  end
+  
+  def signature_base_string(params={},method='GET',uri="http://photos.example.net/photos")
+    request(params,method,uri).signature_base_string
+  end
+end

data/test/keys/rsa.cert

@@ -0,0 +1,11 @@
+-----BEGIN CERTIFICATE-----
+MIIBpjCCAQ+gAwIBAgIBATANBgkqhkiG9w0BAQUFADAZMRcwFQYDVQQDDA5UZXN0
+IFByaW5jaXBhbDAeFw03MDAxMDEwODAwMDBaFw0zODEyMzEwODAwMDBaMBkxFzAV
+BgNVBAMMDlRlc3QgUHJpbmNpcGFsMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB
+gQC0YjCwIfYoprq/FQO6lb3asXrxLlJFuCvtinTF5p0GxvQGu5O3gYytUvtC2JlY
+zypSRjVxwxrsuRcP3e641SdASwfrmzyvIgP08N4S0IFzEURkV1wp/IpH7kH41Etb
+mUmrXSwfNZsnQRE5SYSOhh+LcK2wyQkdgcMv11l4KoBkcwIDAQABMA0GCSqGSIb3
+DQEBBQUAA4GBAGZLPEuJ5SiJ2ryq+CmEGOXfvlTtEL2nuGtr9PewxkgnOjZpUy+d
+4TvuXJbNQc8f4AMWL/tO9w0Fk80rWKp9ea8/df4qMq5qlFWlx6yOLQxumNOmECKb
+WpkUQDIDJEoFUzKMVuJf4KO/FJ345+BNLGgbJ6WujreoM1X/gYfdnJ/J
+-----END CERTIFICATE-----

data/test/keys/rsa.pem

@@ -0,0 +1,16 @@
+-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALRiMLAh9iimur8V
+A7qVvdqxevEuUkW4K+2KdMXmnQbG9Aa7k7eBjK1S+0LYmVjPKlJGNXHDGuy5Fw/d
+7rjVJ0BLB+ubPK8iA/Tw3hLQgXMRRGRXXCn8ikfuQfjUS1uZSatdLB81mydBETlJ
+hI6GH4twrbDJCR2Bwy/XWXgqgGRzAgMBAAECgYBYWVtleUzavkbrPjy0T5FMou8H
+X9u2AC2ry8vD/l7cqedtwMPp9k7TubgNFo+NGvKsl2ynyprOZR1xjQ7WgrgVB+mm
+uScOM/5HVceFuGRDhYTCObE+y1kxRloNYXnx3ei1zbeYLPCHdhxRYW7T0qcynNmw
+rn05/KO2RLjgQNalsQJBANeA3Q4Nugqy4QBUCEC09SqylT2K9FrrItqL2QKc9v0Z
+zO2uwllCbg0dwpVuYPYXYvikNHHg+aCWF+VXsb9rpPsCQQDWR9TT4ORdzoj+Nccn
+qkMsDmzt0EfNaAOwHOmVJ2RVBspPcxt5iN4HI7HNeG6U5YsFBb+/GZbgfBT3kpNG
+WPTpAkBI+gFhjfJvRw38n3g/+UeAkwMI2TJQS4n8+hid0uus3/zOjDySH3XHCUno
+cn1xOJAyZODBo47E+67R4jV1/gzbAkEAklJaspRPXP877NssM5nAZMU0/O/NGCZ+
+3jPgDUno6WbJn5cqm8MqWhW1xGkImgRk+fkDBquiq4gPiT898jusgQJAd5Zrr6Q8
+AO/0isr/3aa6O6NLQxISLKcPDk2NOccAfS/xOtfOz4sJYM3+Bs4Io9+dZGSDCA54
+Lw03eHTNQghS0A==
+-----END PRIVATE KEY-----

data/test/test_action_controller_request_proxy.rb

@@ -5,9 +5,10 @@ require 'action_controller/test_process'
 
 class ActionControllerRequestProxyTest < Test::Unit::TestCase
 
-  def request_proxy(parameters)
+  def request_proxy(parameters={})
     request = ActionController::TestRequest.new({}, parameters)
     request.env['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'
+    yield request if block_given?
     OAuth::RequestProxy.proxy(request)
   end
  

data/test/test_consumer.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-gem 'oauth'
 require 'test/unit'
 require 'oauth/consumer'
 require 'oauth/signature/rsa/sha1'
@@ -88,7 +87,7 @@ class ConsumerTest < Test::Unit::TestCase
     
     assert_equal 'GET', request.method
     assert_equal '/test?key=value', request.path
-    assert_equal "OAuth realm=\"\", oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
+    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=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
   end
 
   def test_that_setting_signature_method_on_consumer_effects_signing
@@ -135,7 +134,7 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal 'POST', request.method
     assert_equal '/test', request.path
     assert_equal 'key=value', request.body
-    assert_equal "OAuth realm=\"\", 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
+    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_signing_post_params_works
@@ -154,7 +153,7 @@ class ConsumerTest < Test::Unit::TestCase
     
     assert_equal 'GET', request.method
     assert_equal '/test?key=value', request.path
-    assert_equal "OAuth realm=\"\", oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
+    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=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
   end
 
   def test_that_using_auth_headers_on_post_on_create_signed_requests_works
@@ -162,7 +161,7 @@ class ConsumerTest < Test::Unit::TestCase
     assert_equal 'POST', request.method
     assert_equal '/test', request.path
     assert_equal 'key=value', request.body
-    assert_equal "OAuth realm=\"\", 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
+    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_signing_post_params_works
@@ -189,7 +188,7 @@ class ConsumerTest < Test::Unit::TestCase
  
     request = Net::HTTP::Get.new("/oauth/example/request_token.php")
     signature_base_string=@consumer.signature_base_string(request,nil,options)
-    assert_equal "GET&http%3A%2F%2Fterm.ie%2Foauth%2Fexample%2Frequest_token.php&oauth_consumer_key%3Dkey%26oauth_nonce%3D#{options[:nonce]}%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D#{options[:timestamp]}%26oauth_token%3D%26oauth_version%3D1.0",signature_base_string
+    assert_equal "GET&http%3A%2F%2Fterm.ie%2Foauth%2Fexample%2Frequest_token.php&oauth_consumer_key%3Dkey%26oauth_nonce%3D#{options[:nonce]}%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D#{options[:timestamp]}%26oauth_version%3D1.0",signature_base_string
     @consumer.sign!(request, nil,options)
 
     assert_equal 'GET', request.method
@@ -239,18 +238,18 @@ class ConsumerTest < Test::Unit::TestCase
   #
   # It also generates "warning: using default DH parameters." which I
   # don't know how to get rid of
-  def test_serialization_with_https
-    consumer = OAuth::Consumer.new('token', 'secret', :site => 'https://plazes.net')
-    consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    consumer.http.get('/')
-    
-    assert_nothing_raised do
-      # Specifically this should not raise TypeError: no marshal_dump
-      # is defined for class OpenSSL::SSL::SSLContext
-      Marshal.dump(consumer)
-    end
-  end
-  
+#  def test_serialization_with_https
+#    consumer = OAuth::Consumer.new('token', 'secret', :site => 'https://plazes.net')
+#    consumer.http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+#    consumer.http.get('/')
+#    
+#    assert_nothing_raised do
+#      # Specifically this should not raise TypeError: no marshal_dump
+#      # is defined for class OpenSSL::SSL::SSLContext
+#      Marshal.dump(consumer)
+#    end
+#  end
+#  
   def test_get_request_token_with_custom_arguments
     @consumer=OAuth::Consumer.new( 
         "key",

data/test/test_helper.rb

@@ -1,6 +1,14 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/oauth'
 
+begin
+  # load redgreen unless running from within TextMate (in which case ANSI
+  # color codes mess with the output)
+  require 'redgreen' unless ENV['TM_CURRENT_LINE']
+rescue LoadError
+  nil
+end
+
 def requests(request)
   Marshal.load(File.read(File.dirname(__FILE__) + '/fixtures/' + request))
 end

data/test/test_net_http_client.rb

@@ -19,7 +19,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     
     assert_equal 'GET', request.method
     assert_equal '/test?key=value', request.path
-    assert_equal "OAuth realm=\"\", oauth_nonce=\"225579211881198842005988698334675835446\", oauth_signature_method=\"HMAC-SHA1\", oauth_token=\"token_411a7f\", oauth_timestamp=\"1199645624\", oauth_consumer_key=\"consumer_key_86cad9\", oauth_signature=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
+    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=\"1oO2izFav1GP4kEH2EskwXkCRFg%3D\", oauth_version=\"1.0\"".split(', ').sort, request['authorization'].split(', ').sort
   end
 
   def test_that_using_auth_headers_on_post_requests_works
@@ -30,7 +30,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     assert_equal 'POST', request.method
     assert_equal '/test', request.path
     assert_equal 'key=value', request.body
-    assert_equal "OAuth realm=\"\", 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
+    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
@@ -115,7 +115,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
  
     request = Net::HTTP::Get.new(request_uri.path)
     signature_base_string=request.signature_base_string(http, consumer, nil, {:scheme=>:query_string,:nonce => nonce, :timestamp => timestamp})
-    assert_equal "GET&http%3A%2F%2Fterm.ie%2Foauth%2Fexample%2Frequest_token.php&oauth_consumer_key%3Dkey%26oauth_nonce%3D#{nonce}%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D#{timestamp}%26oauth_token%3D%26oauth_version%3D1.0",signature_base_string
+    assert_equal "GET&http%3A%2F%2Fterm.ie%2Foauth%2Fexample%2Frequest_token.php&oauth_consumer_key%3Dkey%26oauth_nonce%3D#{nonce}%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D#{timestamp}%26oauth_version%3D1.0",signature_base_string
  
 #    request = Net::HTTP::Get.new(request_uri.path)
     request.oauth!(http, consumer, nil, {:scheme=>:query_string,:nonce => nonce, :timestamp => timestamp})
@@ -135,21 +135,21 @@ class NetHTTPClientTest < Test::Unit::TestCase
     request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
     request["Content-Type"] = "application/xml"
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_token%3D%26oauth_version%3D1.0", signature_base_string
+    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
 
   def test_that_put_bodies_not_signed_even_if_form_urlencoded
     request = Net::HTTP::Put.new(@request_uri.path)
     request.set_form_data( { 'key2' => 'value2' } )
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_token%3D%26oauth_version%3D1.0", signature_base_string
+    assert_equal "PUT&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
   
   def test_that_post_bodies_signed_if_form_urlencoded
     request = Net::HTTP::Post.new(@request_uri.path)
     request.set_form_data( { 'key2' => 'value2' } )
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&key2%3Dvalue2%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_token%3D%26oauth_version%3D1.0", signature_base_string
+    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&key2%3Dvalue2%26oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
   
   def test_that_post_bodies_not_signed_if_other_content_type
@@ -157,7 +157,7 @@ class NetHTTPClientTest < Test::Unit::TestCase
     request.body = "<?xml version=\"1.0\"?><foo><bar>baz</bar></foo>"
     request["Content-Type"] = "application/xml"
     signature_base_string=request.signature_base_string(@http, @consumer, nil, { :nonce => @nonce, :timestamp => @timestamp })
-    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_token%3D%26oauth_version%3D1.0", signature_base_string
+    assert_equal "POST&http%3A%2F%2Fexample.com%2Ftest&oauth_consumer_key%3Dconsumer_key_86cad9%26oauth_nonce%3D225579211881198842005988698334675835446%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1199645624%26oauth_version%3D1.0", signature_base_string
   end
 
   protected

data/test/test_net_http_request_proxy.rb

@@ -9,7 +9,7 @@ class NetHTTPRequestProxyTest < Test::Unit::TestCase
 
     expected_parameters = {'key' => ['value']}
     assert_equal expected_parameters, request_proxy.parameters
-    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'GET', request_proxy.method
   end
 
@@ -20,7 +20,7 @@ class NetHTTPRequestProxyTest < Test::Unit::TestCase
 
     expected_parameters = {'key' => ['value']}
     assert_equal expected_parameters, request_proxy.parameters
-    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'POST', request_proxy.method
   end
 
@@ -31,7 +31,7 @@ class NetHTTPRequestProxyTest < Test::Unit::TestCase
 
     expected_parameters = {'key' => ['value'], 'key2' => ['value2']}
     assert_equal expected_parameters, request_proxy.parameters
-    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'POST', request_proxy.method
   end
 

data/test/test_rack_request_proxy.rb

@@ -11,7 +11,7 @@ class RackRequestProxyTest < Test::Unit::TestCase
 
     expected_parameters = {'key' => 'value'}
     assert_equal expected_parameters, request_proxy.parameters
-    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'GET', request_proxy.method
   end
 
@@ -22,7 +22,7 @@ class RackRequestProxyTest < Test::Unit::TestCase
 
     expected_parameters = {'key' => 'value'}
     assert_equal expected_parameters, request_proxy.parameters
-    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'POST', request_proxy.method
   end
 
@@ -33,7 +33,7 @@ class RackRequestProxyTest < Test::Unit::TestCase
 
     expected_parameters = {'key' => 'value', 'key2' => 'value2'}
     assert_equal expected_parameters, request_proxy.parameters
-    assert_equal 'http://example.com/test', request_proxy.uri
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
     assert_equal 'POST', request_proxy.method
   end
 

data/test/test_rsa_sha1.rb

@@ -0,0 +1,59 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+require 'oauth/consumer'
+require 'oauth/signature/rsa/sha1'
+
+class TestSignatureRsaSha1 < Test::Unit::TestCase
+  
+  def setup
+    @request = Net::HTTP::Get.new('/photos?file=vacaction.jpg&size=original&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&oauth_signature_method=RSA-SHA1')
+
+    @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03', OpenSSL::PKey::RSA.new(IO.read(File.dirname(__FILE__) + "/keys/rsa.pem")))
+    
+  end
+  
+  def test_that_rsa_sha1_implements_rsa_sha1
+    assert OAuth::Signature.available_methods.include?('rsa-sha1')
+  end
+  
+  def test_that_get_request_from_oauth_test_cases_produces_matching_signature_base_string
+    sbs = OAuth::Signature.signature_base_string(@request, { :consumer => @consumer,
+                                                 :uri => 'http://photos.example.net/photos' } )
+
+    assert_equal 'GET&http%3A%2F%2Fphotos.example.net%2Fphotos&file%3Dvacaction.jpg%26oauth_consumer_key%3Ddpf43f3p2l4k3l03%26oauth_nonce%3D13917289812797014437%26oauth_signature_method%3DRSA-SHA1%26oauth_timestamp%3D1196666512%26oauth_version%3D1.0%26size%3Doriginal', sbs
+  end
+
+  def test_that_get_request_from_oauth_test_cases_produces_matching_signature
+    signature = OAuth::Signature.sign(@request, { :consumer => @consumer,
+                                                 :uri => 'http://photos.example.net/photos' } )
+
+    assert_equal 'jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE=', signature
+    
+  end
+
+  def test_that_get_request_from_oauth_test_cases_produces_matching_signature_using_private_key_file
+    @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03',nil)
+
+    signature = OAuth::Signature.sign(@request, { :consumer => @consumer,
+                                                  :private_key_file=>File.dirname(__FILE__) + "/keys/rsa.pem",
+                                                 :uri => 'http://photos.example.net/photos' } )
+
+    assert_equal 'jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE=', signature
+  end
+
+  def test_that_get_request_from_oauth_test_cases_verifies_signature
+    @request = Net::HTTP::Get.new('/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D')
+    @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03',OpenSSL::X509::Certificate.new(IO.read(File.dirname(__FILE__) + "/keys/rsa.cert")))
+
+    assert OAuth::Signature.verify(@request, { :consumer => @consumer,
+                                                 :uri => 'http://photos.example.net/photos' } )
+
+  end
+  
+  def test_that_get_request_from_oauth_test_cases_verifies_signature_with_pem
+    @request = Net::HTTP::Get.new('/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D')
+    assert OAuth::Signature.verify(@request, { :consumer => @consumer,
+                                                 :uri => 'http://photos.example.net/photos' } )
+
+  end
+
+end