adding origin to new local ioConfig var, as per @barisusakli, re: #5472

This commit is contained in:
Julian Lam
2017-02-23 12:46:59 -05:00
parent 9079ee5b14
commit c1b1ff5c6e

View File

@@ -22,6 +22,10 @@ Sockets.init = function (server) {
var SocketIO = require('socket.io'); var SocketIO = require('socket.io');
var socketioWildcard = require('socketio-wildcard')(); var socketioWildcard = require('socketio-wildcard')();
var ioConfig = {
transports: nconf.get('socket.io:transports')
};
io = new SocketIO({ io = new SocketIO({
path: nconf.get('relative_path') + '/socket.io' path: nconf.get('relative_path') + '/socket.io'
}); });
@@ -47,17 +51,15 @@ Sockets.init = function (server) {
} }
if (!override) { if (!override) {
io.set('origins', parsedUrl.protocol + '//' + domain + ':*'); ioConfig.origins = parsedUrl.protocol + '//' + domain + ':*';
winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*'); winston.info('[socket.io] Restricting access to origin: ' + parsedUrl.protocol + '//' + domain + ':*');
} else { } else {
io.set('origins', override); ioConfig.origins = override;
winston.info('[socket.io] Restricting access to origin: ' + override); winston.info('[socket.io] Restricting access to origin: ' + override);
} }
} }
io.listen(server, { io.listen(server, ioConfig);
transports: nconf.get('socket.io:transports')
});
Sockets.server = io; Sockets.server = io;
}; };