Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds changeOrigin flag to http-server proxy. #2615

Merged
merged 3 commits into from
Dec 3, 2014
Merged

Adds changeOrigin flag to http-server proxy. #2615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5a1820
Adds changeOrigin flag to http-server proxy.
typeoneerror Dec 2, 2014
75ff63d
Doesn't parse proxy url
typeoneerror Dec 3, 2014
c0840f5
Test that proxying to subdomains uses the right host.
abuiles Dec 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions lib/tasks/server/middleware/proxy-server/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@ ProxyServerAddon.prototype.serverMiddleware = function(options) {
options = options.options;

if (options.proxy) {
var urlOpts = require('url').parse(options.proxy);
var proxy = require('http-proxy').createProxyServer({
target: {
host: urlOpts.hostname,
port: urlOpts.port
},
ws: true
var proxy = require('http-proxy').createProxyServer({
target: options.proxy,
ws: true,
changeOrigin: true
});

var morgan = require('morgan');
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@
"chai-as-promised": "^4.1.1",
"mocha": "^1.18.0",
"mocha-jshint": "0.0.9",
"nock": "^0.51.0",
"node-require-timings": "0.0.2",
"supertest": "0.14.0",
"tmp-sync": "^1.0.1",
Expand Down
167 changes: 145 additions & 22 deletions tests/unit/tasks/server/express-server-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ var chalk = require('chalk');
var request = require('supertest');
var net = require('net');
var EOL = require('os').EOL;
var nock = require('nock');


describe('express-server', function() {
var subject, ui, project, proxy;
var subject, ui, project, proxy, nockProxy;

beforeEach(function() {
ui = new MockUI();
Expand Down Expand Up @@ -100,18 +102,18 @@ describe('express-server', function() {
preexistingServer.listen(1337);

return subject.start({
host: '0.0.0.0',
port: '1337'
})
host: '0.0.0.0',
port: '1337'
})
.then(function() {
assert(false, 'should have rejected');
})
.catch(function(reason) {
assert.equal(reason, 'Could not serve on http://0.0.0.0:1337. It is either in use or you do not have permission.');
})
.finally(function() {
preexistingServer.close(done);
});
.finally(function() {
preexistingServer.close(done);
});
});
});

Expand All @@ -133,21 +135,21 @@ describe('express-server', function() {
port: '1337',
baseURL: '/'
})
.then(function() {
request(subject.app)
.get('/foo')
.set('accept', 'application/json, */*')
.expect(function(res) {
assert.equal(res.text, expected);
})
.end(function(err) {
if (err) {
return done(err);
}
assert(!proxy.called);
done();
});
});
.then(function() {
request(subject.app)
.get('/foo')
.set('accept', 'application/json, */*')
.expect(function(res) {
assert.equal(res.text, expected);
})
.end(function(err) {
if (err) {
return done(err);
}
assert(!proxy.called);
done();
});
});
});

describe('with proxy', function() {
Expand Down Expand Up @@ -192,6 +194,7 @@ describe('express-server', function() {
if (err) {
return done(err);
}

assert(proxy.called, 'proxy receives the request');
assert.equal(proxy.lastReq.method, method.toUpperCase());
assert.equal(proxy.lastReq.url, url);
Expand Down Expand Up @@ -225,6 +228,126 @@ describe('express-server', function() {
});
});

describe('proxy with subdomain', function() {
beforeEach(function() {
nockProxy = {
called: null,
method: null,
url: null
};

return subject.start({
proxy: 'http://api.lvh.me',
host: '0.0.0.0',
port: '1337',
baseURL: '/'
});
});

function apiTest(app, method, url, done) {
var req = request(app);
return req[method].call(req, url)
.set('accept', 'text/json')
.end(function(err) {
if (err) {
return done(err);
}
assert(nockProxy.called, 'proxy receives the request');
assert.equal(nockProxy.method, method.toUpperCase());
assert.equal(nockProxy.url, url);
done();
});
}

it('proxies GET', function(done) {
nock('http://api.lvh.me', {
reqheaders: {
'host': 'api.lvh.me'
}
}).get('/api/get')
.reply(200, function() {
nockProxy.called = true;
nockProxy.method = 'GET';
nockProxy.url = '/api/get';

return '';
});

apiTest(subject.app, 'get', '/api/get', done);
});
it('proxies PUT', function(done) {
nock('http://api.lvh.me', {
reqheaders: {
'host': 'api.lvh.me'
}
}).put('/api/put')
.reply(204, function() {
nockProxy.called = true;
nockProxy.method = 'PUT';
nockProxy.url = '/api/put';

return '';
});

apiTest(subject.app, 'put', '/api/put', done);
});
it('proxies POST', function(done) {
nock('http://api.lvh.me', {
reqheaders: {
'host': 'api.lvh.me'
}
}).post('/api/post')
.reply(201, function() {
nockProxy.called = true;
nockProxy.method = 'POST';
nockProxy.url = '/api/post';

return '';
});

apiTest(subject.app, 'post', '/api/post', done);
});
it('proxies DELETE', function(done) {
nock('http://api.lvh.me', {
reqheaders: {
'host': 'api.lvh.me'
}
}).delete('/api/delete')
.reply(204, function() {
nockProxy.called = true;
nockProxy.method = 'DELETE';
nockProxy.url = '/api/delete';

return '';
});

apiTest(subject.app, 'delete', '/api/delete', done);
});
// test for #1263
it('proxies when accept contains */*', function(done) {
nock('http://api.lvh.me')
.get('/api/get')
.reply(200, function() {
nockProxy.called = true;
nockProxy.method = 'GET';
nockProxy.url = '/api/get';

return '';
});

request(subject.app)
.get('/api/get')
.set('accept', 'application/json, */*')
.end(function(err) {
if (err) {
return done(err);
}
assert(nockProxy.called, 'proxy receives the request');
done();
});
});
});

describe('without proxy', function() {
function startServer(baseURL) {
return subject.start({
Expand Down