From 337b6c7fa625b6e4d1ad78dfefbb08cefbf359ab Mon Sep 17 00:00:00 2001 From: ciaranj Date: Tue, 27 Apr 2010 21:04:58 +0100 Subject: [PATCH] Added support in for dealing with servers using non-default ports. --- lib/oauth.js | 13 ++++++----- spec/spec.oauth.js | 55 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 6 deletions(-) diff --git a/lib/oauth.js b/lib/oauth.js index 71ae3c9..055e96c 100644 --- a/lib/oauth.js +++ b/lib/oauth.js @@ -119,6 +119,10 @@ exports.OAuth.prototype.NONCE_CHARS= ['a','b','c','d','e','f','g','h','i','j','k 'Q','R','S','T','U','V','W','X','Y','Z','0','1','2','3', '4','5','6','7','8','9']; +exports.OAuth.prototype._createClient= function( port, hostname ) { + return http.createClient(port, hostname); +} + exports.OAuth.prototype._getNonce= function(nonceSize) { var result = []; var chars= this.NONCE_CHARS; @@ -166,9 +170,8 @@ exports.OAuth.prototype._performSecureRequest= function( oauth_token, oauth_toke } query= query.substring(0, query.length-1); - - var oauthProvider= http.createClient(parsedUrl.port, parsedUrl.hostname); - var headers= {'Host': parsedUrl.hostname} + var oauthProvider= this._createClient(parsedUrl.port, parsedUrl.hostname) + var headers= {'Host': parsedUrl.host} var request = oauthProvider.request(method, parsedUrl.pathname + "?" + query, headers); var data=""; @@ -236,14 +239,14 @@ exports.OAuth.prototype.getOAuthRequestToken= function(callback) { authHeader= authHeader.substring(0, authHeader.length-1); headers["Authorization"]= authHeader; - headers["Host"] = parsedUrl.hostname + headers["Host"] = parsedUrl.host headers["Accept"]= "*/*" headers["Connection"]= "close" headers["User-Agent"]= "Express authentication" headers["Content-length"]= 0 headers["Content-Type"]= "application/x-www-form-urlencoded" - var oauthProvider= http.createClient(parsedUrl.port, parsedUrl.hostname); + var oauthProvider= this._createClient(parsedUrl.port, parsedUrl.hostname); var request = oauthProvider.request(method, parsedUrl.pathname, headers); var data=""; var self= this; diff --git a/spec/spec.oauth.js b/spec/spec.oauth.js index 3ba75ee..47e698a 100644 --- a/spec/spec.oauth.js +++ b/spec/spec.oauth.js @@ -1,16 +1,20 @@ describe 'node-oauth' before_each OAuth= require('oauth').OAuth - oa= new OAuth(null, null, null, null, null, "HMAC-SHA1"); end describe 'Auth' describe 'OAuth' it 'should generate the signature base string described in http://oauth.net/core/1.0/#sig_base_example' + oa= new OAuth(null, null, null, null, null, "HMAC-SHA1"); + var result= oa._createSignatureBase("GET", "http://photos.example.net/photos", "file=vacation.jpg&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_nonce=kllo9940pd9333jh&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1191242096&oauth_token=nnch734d00sl2jdk&oauth_version=1.0&size=original") result.should.eql "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" end describe 'Url normalisation' + before_each + oa= new OAuth(null, null, null, null, null, "HMAC-SHA1"); + end it 'should strip default ports from urls for use in signature generation' oa._normalizeUrl("https://somehost.com:443/foo/bar").should_be "https://somehost.com/foo/bar" end @@ -22,6 +26,55 @@ describe 'node-oauth' oa._normalizeUrl("http://somehost.com").should_be "http://somehost.com/" end end + describe 'host headers for non default ports should contain the port' + before_each + end + + describe 'when getProtectedResource is called' + it 'should set the correct Host header when provided with an unusual port' + oa2= new OAuth(null, null, null, null, null, "HMAC-SHA1"); + var mockProvider= {}, + mockRequest= {addListener:function(){}, + end:function(){}}; + + stub(mockProvider, 'request').and_return(mockRequest) + mockProvider.should.receive('request', 'once').with_args('GET', an_instance_of(String), {Host:"somehost.com:8080"}) + stub(oa2, '_createClient').and_return(mockProvider) + oa2.should.receive('_createClient', 'once').with_args('8080', 'somehost.com') + oa2.getProtectedResource("http://somehost.com:8080", "GET", "oauth_token", null, function(){}) + end + end + + describe 'when getOAuthRequestToken is called' + it 'should set the correct Host header when provided with an unusual port' + oa2= new OAuth(null, null, null, null, null, "HMAC-SHA1"); + var mockProvider= {}, + mockRequest= {addListener:function(){}, + end:function(){}}; + + stub(mockProvider, 'request').and_return(mockRequest) + mockProvider.should.receive('request', 'once').with_args('GET', an_instance_of(String), {Host:"somehost.com:8080"}) + stub(oa2, '_createClient').and_return(mockProvider) + oa2.should.receive('_createClient', 'once').with_args('8080', 'somehost.com') + oa2.getProtectedResource("http://somehost.com:8080", "GET", "oauth_token", null, function(){}) + end + end + + describe 'when getOauthAccessToken is called' + it 'should set the correct Host header when provided with an unusual port' + oa2= new OAuth(null, null, null, null, null, "HMAC-SHA1"); + var mockProvider= {}, + mockRequest= {addListener:function(){}, + end:function(){}}; + + stub(mockProvider, 'request').and_return(mockRequest) + mockProvider.should.receive('request', 'once').with_args('GET', an_instance_of(String), {Host:"somehost.com:8080"}) + stub(oa2, '_createClient').and_return(mockProvider) + oa2.should.receive('_createClient', 'once').with_args('8080', 'somehost.com') + oa2.getProtectedResource("http://somehost.com:8080", "GET", "oauth_token", null, function(){}) + end + end + end end end end \ No newline at end of file