Merge branch '0.0.10-alpha' of ssh://numinibsd/git/base/enigma-bbs into security-updates

This commit is contained in:
Bryan Ashby
2019-05-06 20:49:16 -06:00
7 changed files with 29 additions and 19 deletions

View File

@@ -113,7 +113,7 @@ exports.getModule = class GopherModule extends ServerModule {
return cb(Errors.Invalid(`Invalid port: ${config.contentServers.gopher.port}`));
}
return this.server.listen(port, cb);
return this.server.listen(port, config.contentServers.gopher.address, cb);
}
get enabled() {

View File

@@ -138,7 +138,7 @@ exports.getModule = class WebServerModule extends ServerModule {
return nextService(Errors.Invalid(`Invalid port: ${config.contentServers.web[service].port}`));
}
this[name].listen(port, err => {
this[name].listen(port, config.contentServers.web[service].address, err => {
return nextService(err);
});
} else {

View File

@@ -380,7 +380,7 @@ exports.getModule = class SSHServerModule extends LoginServerModule {
return cb(Errors.Invalid(`Invalid port: ${config.loginServers.ssh.port}`));
}
this.server.listen(port, err => {
this.server.listen(port, config.loginServers.ssh.address, err => {
if(!err) {
Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
}

View File

@@ -875,7 +875,7 @@ exports.getModule = class TelnetServerModule extends LoginServerModule {
return cb(Errors.Invalid(`Invalid port: ${config.loginServers.telnet.port}`));
}
this.server.listen(port, err => {
this.server.listen(port, config.loginServers.telnet.address, err => {
if(!err) {
Log.info( { server : ModuleInfo.name, port : port }, 'Listening for connections' );
}

View File

@@ -200,7 +200,8 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
}
const serverName = `${ModuleInfo.name} (${serverType})`;
const confPort = _.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws', 'port' ] );
const conf = _.get(Config(), [ 'loginServers', 'webSocket', 'secure' === serverType ? 'wss' : 'ws' ] );
const confPort = conf.port;
const port = parseInt(confPort);
if(isNaN(port)) {
@@ -208,7 +209,7 @@ exports.getModule = class WebSocketLoginServer extends LoginServerModule {
return nextServerType(Errors.Invalid(`Invalid port: ${confPort}`));
}
server.httpServer.listen(port, err => {
server.httpServer.listen(port, conf.address, err => {
if(err) {
return nextServerType(err);
}