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.

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

Verify request Origin #144

Merged
merged 1 commit into from
Aug 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ internals.schema = Joi.object({
timeout: Joi.number().integer().min(1).less(Joi.ref('interval')).required()
})
.allow(false),
maxConnections: Joi.number().integer().min(1).allow(false)
maxConnections: Joi.number().integer().min(1).allow(false),
origin: Joi.array().items(Joi.string())
});


Expand Down
6 changes: 5 additions & 1 deletion lib/listener.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ exports = module.exports = internals.Listener = function (connection, settings)

// WebSocket listener

this._wss = new Ws.Server({ server: connection.listener });
const serverOptions = { server: connection.listener };
if (settings.origin) {
serverOptions.verifyClient = (info) => settings.origin.indexOf(info.origin) >= 0;
}
this._wss = new Ws.Server(serverOptions);

this._wss.on('connection', (ws) => {

Expand Down
44 changes: 44 additions & 0 deletions test/listener.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,50 @@ describe('Listener', () => {
});
});

it('rejects unknown origin', (done) => {

const server = new Hapi.Server();
server.connection();
server.register({ register: Nes, options: { auth: false, origin: ['http://localhost:12345'] } }, (err) => {

expect(err).to.not.exist();

server.start((err) => {

expect(err).to.not.exist();
const client = new Nes.Client('http://localhost:' + server.info.port);
client.connect((err) => {

expect(err).to.exist();
client.disconnect();
server.stop(done);
});
});
});
});

it('accepts known origin', (done) => {

const server = new Hapi.Server();
server.connection();
server.register({ register: Nes, options: { auth: false, origin: ['http://localhost:12345'] } }, (err) => {

expect(err).to.not.exist();

server.start((err) => {

expect(err).to.not.exist();
const client = new Nes.Client('http://localhost:' + server.info.port, { ws: { origin: 'http://localhost:12345' } });
client.connect((err) => {

expect(err).not.to.exist();
client.disconnect();
server.stop(done);
});
});
});
});

describe('_beat()', () => {

it('disconnects client after timeout', (done) => {
Expand Down