@@ -18,6 +18,10 @@ module Videojuicer class RequestProxy + # Requests to the following ports will not include the port in the signature base string. + # See OAuth spec 1.0a section 9.1.2 for details. + EXCLUDED_BASE_STRING_PORTS = [80, 443].freeze + include Videojuicer::Exceptions include Videojuicer::Configurable @@ -218,7 +222,17 @@ module Videojuicer # Returns the unencrypted signature base string for this proxy object and the # given request properties. def signature_base_string(method, path, params) - s = [method.to_s.upcase, "#{protocol}://#{host}#{path}", normalize_params(params)].collect {|e| CGI.rfc3986_escape(e)}.join("&") + s = [method.to_s.upcase, "#{protocol}://#{signature_base_string_host}#{path}", normalize_params(params)].collect {|e| CGI.rfc3986_escape(e)}.join("&") + end + + def signature_base_string_host + if EXCLUDED_BASE_STRING_PORTS.include?(port.to_i) + # Natural port. Ignore the port + host + else + # Weird port. Expect a signature. + "#{host}:#{port}" + end end # Returns a string representing a normalised parameter hash. Supports nesting for lib/videojuicer/oauth/request_proxy.rb @@ -33,7 +33,7 @@ describe Videojuicer::OAuth::RequestProxy do @proxy.normalize_params(:a=>"1", :b=>"2", :c=>{:a=>"AAA", :b=>"BBB", :c=>"CCC"}, :d=>{:e=>"foo"}).should == "a=1&b=2&c%5Ba%5D=AAA&c%5Bb%5D=BBB&c%5Bc%5D=CCC&d%5Be%5D=foo" end it "escapes the signature base string elements and adjoins them with an ampersand" do - @proxy.signature_base_string(:get, "/test", :foo=>"bar", :bar=>"baz").should == "GET&#{CGI.rfc3986_escape "http://localhost/test"}&#{CGI.rfc3986_escape "bar=baz&foo=bar"}" + @proxy.signature_base_string(:get, "/test", :foo=>"bar", :bar=>"baz").should == "GET&#{CGI.rfc3986_escape "http://localhost:6666/test"}&#{CGI.rfc3986_escape "bar=baz&foo=bar"}" end describe "with no token supplied" do spec/request_proxy_spec.rb @@ -5,11 +5,11 @@ Gem::Specification.new do |s| s.name = %q{vj-sdk} - s.version = "0.1.15" + s.version = "0.2.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["danski", "thejohnny", "knowtheory", "sixones", "btab"] - s.date = %q{2009-10-07} + s.date = %q{2009-10-15} s.email = %q{dan@videojuicer.com} s.extra_rdoc_files = [ "LICENSE", vj-sdk.gemspec 6d2773f1bfc71f1c263ed9657a6c69c2b1f7363e Daniel Glegg danski@Jet-Jaguar.local http://github.com/videojuicer/core-sdk/commit/616ca0bfacd6f06aa48c7780e6b0c400ab089aab 616ca0bfacd6f06aa48c7780e6b0c400ab089aab 2009-10-15T08:18:40-07:00 2009-10-15T08:18:40-07:00 fix for OAuth proxy not properly including non-standard ports in the base signature string. version bump. gem rebuild. e3191fe146daac4e0783b54d6c8b11a11bfb2951 Daniel Glegg danski@Jet-Jaguar.local