zydronium/enigma-bbs
1
0
Fork 0
mirror of https://github.com/NuSkooler/enigma-bbs.git synced 2025-07-21 10:15:55 +02:00
Code Issues Projects Releases Packages Wiki Activity

* User idle timeout

Browse source 
* Only allow one session per user at a time
* user 'timestamp' property -> 'account_created'
* Better User.getLegacySecurityLevel() using group membership
* Client connection management -> client_connections.js
* Minor changes & cleanup
This commit is contained in:
Bryan Ashby 2015-08-04 22:35:59 -06:00
parent 36a8d771e8
commit 8d1fac41a9
11 changed files with 164 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

55
core/bbs.js
View file

@ -6,6 +6,7 @@ var conf = require('./config.js');
var logger = require('./logger.js');
var miscUtil = require('./misc_util.js');
var database = require('./database.js');
var clientConns = require('./client_connections.js');
var iconv = require('iconv-lite');
var paths = require('path');
@ -152,8 +153,6 @@ function initialize(cb) {
);
}
var clientConnections = [];
function startListening() {
if(!conf.config.servers) {
// :TODO: Log error ... output to stderr as well. We can do it all with the logger
@ -189,7 +188,7 @@ function startListening() {
client.runtime = {};
}
addNewClient(client);
clientConns.addNewClient(client);
client.on('ready', function onClientReady() {
// Go to module -- use default error handler
@ -199,7 +198,7 @@ function startListening() {
});
client.on('end', function onClientEnd() {
removeClient(client);
clientConns.removeClient(client);
});
client.on('error', function onClientError(err) {
@ -209,7 +208,20 @@ function startListening() {
client.on('close', function onClientClose(hadError) {
var l = hadError ? logger.log.info : logger.log.debug;
l( { clientId : client.runtime.id }, 'Connection closed');
removeClient(client);
clientConns.removeClient(client);
});
client.on('idle timeout', function idleTimeout() {
client.log.info('User idle timeout expired');
client.gotoMenuModule( { name : 'idleLogoff' }, function goMenuRes(err) {
if(err) {
// likely just doesn't exist
client.term.write('\nIdle timeout expired. Goodbye!\n');
client.end();
}
});
});
});
@ -222,39 +234,6 @@ function startListening() {
});
}
function addNewClient(client) {
var id = client.runtime.id = clientConnections.push(client) - 1;
// Create a client specific logger
client.log = logger.log.child( { clientId : id } );
var connInfo = { ip : client.input.remoteAddress };
if(client.log.debug()) {
connInfo.port = client.input.localPort;
connInfo.family = client.input.localFamily;
}
client.log.info(connInfo, 'Client connected');
return id;
}
function removeClient(client) {
var i = clientConnections.indexOf(client);
if(i > -1) {
clientConnections.splice(i, 1);
logger.log.info(
{
connectionCount : clientConnections.length,
clientId : client.runtime.id
},
'Client disconnected'
);
}
}
function prepareClient(client, cb) {
// :TODO: it feels like this should go somewhere else... and be a bit more elegant.
if('*' === conf.config.preLoginTheme) {