Skip to content

Commit

Permalink
[test] Continued work around Origin mismatch tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@indexzero
indexzero committed May 18, 2011
1 parent 9ab54ab commit 44a8566
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 115 deletions.
7 changes: 4 additions & 3 deletions lib/node-http-proxy.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,12 +588,13 @@ HttpProxy.prototype.proxyWebSocketRequest = function (req, socket, head, options
_socket(socket);

// Remote host address
var agent = _getAgent(options.host, options.port),
remoteHost = options.host + (options.port - 80 === 0 ? '' : ':' + options.port);
var protocolName = options.https || this.https ? 'https' : 'http',
agent = _getAgent(options.host, options.port),
remoteHost = options.host + (options.port - 80 === 0 ? '' : ':' + options.port);

// Change headers
req.headers.host = remoteHost;
req.headers.origin = 'http://' + options.host;
req.headers.origin = protocolName + '://' + options.host;

outgoing = {
host: options.host,
Expand Down
14 changes: 9 additions & 5 deletions test/web-socket-proxy-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var vows = require('vows'),
colors = require('colors'),
request = require('request'),
assert = require('assert'),
argv = require('optimist').argv,
websocket = require('./../vendor/websocket'),
helpers = require('./helpers');

Expand All @@ -42,8 +43,11 @@ catch (ex) {
process.exit(1);
}

var runner = new helpers.TestRunner();
var protocol = argv.https ? 'https' : 'http',
wsprotocol = argv.https ? 'wss' : 'ws',
runner = new helpers.TestRunner(protocol);

require('eyes').inspect(protocol);
vows.describe('node-http-proxy/websocket').addBatch({
"When using server created by httpProxy.createServer()": {
"with no latency" : {
Expand All @@ -65,8 +69,8 @@ vows.describe('node-http-proxy/websocket').addBatch({
//
// Setup the web socket against our proxy
//
var ws = new websocket.WebSocket('ws://localhost:8131/socket.io/websocket/', 'borf', {
origin: 'http://localhost'
var ws = new websocket.WebSocket(wsprotocol + '://localhost:8131/socket.io/websocket/', 'borf', {
origin: 'https://localhost'
});

ws.on('wsupgrade', function (req, res) {
Expand Down Expand Up @@ -101,8 +105,8 @@ vows.describe('node-http-proxy/websocket').addBatch({
//
// Setup the web socket against our proxy
//
var ws = new websocket.WebSocket('ws://localhost:8133/socket.io/websocket/', 'borf', {
origin: 'http://localhost'
var ws = new websocket.WebSocket(wsprotocol + '://localhost:8133/socket.io/websocket/', 'borf', {
origin: 'https://localhost'
});

ws.on('wsupgrade', function (req, res) {
Expand Down
220 changes: 113 additions & 107 deletions vendor/websocket.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ var buffer = require('buffer');
var crypto = require('crypto');
var events = require('events');
var http = require('http');
var https = require('https');
var net = require('net');
var urllib = require('url');
var sys = require('sys');
Expand Down Expand Up @@ -178,16 +179,6 @@ var str2hex = function(str) {
return out.trim();
};

// Get the scheme for a URL, undefined if none is found
var getUrlScheme = function(url) {
var i = url.indexOf(':');
if (i == -1) {
return undefined;
}

return url.substring(0, i);
};

// Set a constant on the given object
var setConstant = function(obj, name, value) {
Object.defineProperty(obj, name, {
Expand Down Expand Up @@ -501,125 +492,140 @@ var WebSocket = function(url, proto, opts) {
// that http.Client passes its constructor arguments through,
// un-inspected to net.Stream.connect(). The latter accepts a
// string as its first argument to connect to a UNIX socket.
var httpClient = undefined;
switch (getUrlScheme(url)) {
case 'ws':
var u = urllib.parse(url);
httpClient = http.createClient(u.port || 80, u.hostname);
var protocol, agent, port, u = urllib.parse(url);
if (u.protocol === 'ws:' || u.protocol === 'wss:') {
require('eyes').inspect(u);
protocol = u.protocol === 'ws:' ? http : https;
port = u.protocol === 'ws:' ? 80 : 443;
agent = u.protocol === 'ws:' ? protocol.getAgent(u.hostname, u.port || port) : protocol.getAgent({
host: u.hostname,
port: u.port || port
});

httpPath = (u.pathname || '/') + (u.search || '');
httpHeaders.Host = u.hostname + (u.port ? (":" + u.port) : "");
break;

case 'ws+unix':
var sockPath = url.substring('ws+unix://'.length, url.length);
httpClient = http.createClient(sockPath);
httpHeaders.Host = 'localhost';
break;

default:
}
else if (urlScheme === 'ws+unix') {
throw new Error('ws+unix is not implemented');
// var sockPath = url.substring('ws+unix://'.length, url.length);
// httpClient = http.createClient(sockPath);
// httpHeaders.Host = 'localhost';
}
else {
throw new Error('Invalid URL scheme \'' + urlScheme + '\' specified.');
}

httpClient.on('upgrade', (function() {
var data = undefined;

return function(res, s, head) {
stream = s;

//
// Emit the `wsupgrade` event to inspect the raw
// arguments returned from the websocket request.
//
self.emit('wsupgrade', httpHeaders, res, s, head);

if (!agent._events || agent._events['upgrade'].length === 0) {
agent.on('upgrade', (function() {
var data = undefined;

return function(res, s, head) {
stream = s;

//
// Emit the `wsupgrade` event to inspect the raw
// arguments returned from the websocket request.
//
self.emit('wsupgrade', httpHeaders, res, s, head);

stream.on('data', function(d) {
if (d.length <= 0) {
return;
}
stream.on('data', function(d) {
if (d.length <= 0) {
return;
}

if (!data) {
data = d;
} else {
var data2 = new buffer.Buffer(data.length + d.length);
if (!data) {
data = d;
} else {
var data2 = new buffer.Buffer(data.length + d.length);

data.copy(data2, 0, 0, data.length);
d.copy(data2, data.length, 0, d.length);
data.copy(data2, 0, 0, data.length);
d.copy(data2, data.length, 0, d.length);

data = data2;
}

if (data.length >= 16) {
var expected = computeSecretKeySignature(key1, key2, challenge);
var actual = data.slice(0, 16).toString('binary');
data = data2;
}

// Handshaking fails; we're donezo
if (actual != expected) {
debug(
'expected=\'' + str2hex(expected) + '\'; ' +
'actual=\'' + str2hex(actual) + '\''
);
if (data.length >= 16) {
var expected = computeSecretKeySignature(key1, key2, challenge);
var actual = data.slice(0, 16).toString('binary');

process.nextTick(function() {
// N.B. Emit 'wserror' here, as 'error' is a reserved word in the
// EventEmitter world, and gets thrown.
self.emit(
'wserror',
new Error('Invalid handshake from server:' +
'expected \'' + str2hex(expected) + '\', ' +
'actual \'' + str2hex(actual) + '\''
)
// Handshaking fails; we're donezo
if (actual != expected) {
debug(
'expected=\'' + str2hex(expected) + '\'; ' +
'actual=\'' + str2hex(actual) + '\''
);

if (self.onerror) {
self.onerror();
}
process.nextTick(function() {
// N.B. Emit 'wserror' here, as 'error' is a reserved word in the
// EventEmitter world, and gets thrown.
self.emit(
'wserror',
new Error('Invalid handshake from server:' +
'expected \'' + str2hex(expected) + '\', ' +
'actual \'' + str2hex(actual) + '\''
)
);

if (self.onerror) {
self.onerror();
}

finishClose();
});
}

finishClose();
});
}
//
// Un-register our data handler and add the one to be used
// for the normal, non-handshaking case. If we have extra
// data left over, manually fire off the handler on
// whatever remains.
//
stream.removeAllListeners('data');
stream.on('data', dataListener);

// Un-register our data handler and add the one to be used
// for the normal, non-handshaking case. If we have extra
// data left over, manually fire off the handler on
// whatever remains.
//
// XXX: This is lame. We should only remove the listeners
// that we added.
httpClient.removeAllListeners('upgrade');
stream.removeAllListeners('data');
stream.on('data', dataListener);
readyState = OPEN;

readyState = OPEN;
process.nextTick(function() {
self.emit('open');

process.nextTick(function() {
self.emit('open');
if (self.onopen) {
self.onopen();
}
});

if (self.onopen) {
self.onopen();
// Consume any leftover data
if (data.length > 16) {
stream.emit('data', data.slice(16, data.length));
}
});

// Consume any leftover data
if (data.length > 16) {
stream.emit('data', data.slice(16, data.length));
}
}
});
stream.on('fd', fdListener);
stream.on('error', errorListener);
stream.on('close', function() {
errorListener(new Error('Stream closed unexpectedly.'));
});

stream.emit('data', head);
};
})());
httpClient.on('error', function(e) {
httpClient.end();
});
stream.on('fd', fdListener);
stream.on('error', errorListener);
stream.on('close', function() {
errorListener(new Error('Stream closed unexpectedly.'));
});

stream.emit('data', head);
};
})());
}

agent.on('error', function (e) {
errorListener(e);
});

var httpReq = httpClient.request(httpPath, httpHeaders);

var x = {
host: u.hostname,
method: 'GET',
agent: agent,
port: u.port,
path: httpPath,
headers: httpHeaders
};
require('eyes').inspect(x);
var httpReq = protocol.request(x);

httpReq.write(challenge, 'binary');
httpReq.end();
})();
Expand Down

0 comments on commit 44a8566

Please sign in to comment.