crichardson/enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial sync up with master after Prettier

Browse Source
This commit is contained in:
Bryan Ashby
2022-06-12 13:57:46 -06:00
parent ba5775adc9 7c01946d6e
commit e0fca9f8f7
177 changed files with 23158 additions and 17630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
core/user_login.js
View File

@@ -2,29 +2,23 @@
'use strict';
// ENiGMA½
const setClientTheme = require('./theme.js').setClientTheme;
const setClientTheme = require('./theme.js').setClientTheme;
const clientConnections = require('./client_connections.js').clientConnections;
const StatLog = require('./stat_log.js');
const logger = require('./logger.js');
const Events = require('./events.js');
const Config = require('./config.js').get;
const {
Errors,
ErrorReasons
} = require('./enig_error.js');
const UserProps = require('./user_property.js');
const SysProps = require('./system_property.js');
const SystemLogKeys = require('./system_log.js');
const User = require('./user.js');
const StatLog = require('./stat_log.js');
const logger = require('./logger.js');
const Events = require('./events.js');
const Config = require('./config.js').get;
const { Errors, ErrorReasons } = require('./enig_error.js');
const UserProps = require('./user_property.js');
const SysProps = require('./system_property.js');
const SystemLogKeys = require('./system_log.js');
const User = require('./user.js');
const {
getMessageConferenceByTag,
getMessageAreaByTag,
getSuitableMessageConfAndAreaTags,
} = require('./message_area.js');
const {
getFileAreaByTag,
getDefaultFileAreaTag,
} = require('./file_base_area.js');
} = require('./message_area.js');
const { getFileAreaByTag, getDefaultFileAreaTag } = require('./file_base_area.js');
// deps
const async = require('async');
@@ -32,12 +26,12 @@ const _ = require('lodash');
const assert = require('assert');
const moment = require('moment');
exports.userLogin = userLogin;
exports.recordLogin = recordLogin;
exports.transformLoginError = transformLoginError;
exports.userLogin = userLogin;
exports.recordLogin = recordLogin;
exports.transformLoginError = transformLoginError;
function userLogin(client, username, password, options, cb) {
if(!cb && _.isFunction(options)) {
if (!cb && _.isFunction(options)) {
cb = options;
options = {};
}
@@ -48,7 +42,7 @@ function userLogin(client, username, password, options, cb) {
client.log.info( { username, ip : client.remoteAddress }, `Attempt to login with banned username "${username}"`);
// slow down a bit to thwart brute force attacks
return setTimeout( () => {
return setTimeout(() => {
return cb(Errors.BadLogin('Disallowed username', ErrorReasons.NotAllowed));
}, 2000);
}
@@ -58,11 +52,11 @@ function userLogin(client, username, password, options, cb) {
password,
};
authInfo.type = options.authType || User.AuthFactor1Types.Password;
authInfo.type = options.authType || User.AuthFactor1Types.Password;
authInfo.pubKey = options.ctx;
client.user.authenticateFactor1(authInfo, err => {
if(err) {
if (err) {
return cb(transformLoginError(err, client, username));
}
@@ -75,50 +69,52 @@ function userLogin(client, username, password, options, cb) {
// Ensure this user is not already logged in.
//
const existingClientConnection = clientConnections.find(cc => {
return user !== cc.user && // not current connection
user.userId === cc.user.userId; // ...but same user
return (
user !== cc.user && // not current connection
user.userId === cc.user.userId
); // ...but same user
});
if(existingClientConnection) {
client.log.warn(
{
existingNodeId : existingClientConnection.node,
username : user.username,
userId : user.userId
existingNodeId: existingClientConnection.node,
username: user.username,
userId: user.userId,
},
`User "${user.username}" already logged in on node ${existingClientConnection.node}`
);
return cb(Errors.BadLogin(
`User ${user.username} already logged in.`,
ErrorReasons.AlreadyLoggedIn
));
return cb(
Errors.BadLogin(
`User ${user.username} already logged in.`,
ErrorReasons.AlreadyLoggedIn
)
);
}
// update client logger with addition of username
client.log = logger.log.child(
{
nodeId : client.log.fields.nodeId,
sessionId : client.log.fields.sessionId,
username : user.username,
}
);
client.log = logger.log.child({
nodeId: client.log.fields.nodeId,
sessionId: client.log.fields.sessionId,
username: user.username,
});
client.log.info(`User "${user.username}" successfully logged in`);
// User's unique session identifier is the same as the connection itself
user.sessionId = client.session.uniqueId; // convenience
user.sessionId = client.session.uniqueId; // convenience
Events.emit(Events.getSystemEvents().UserLogin, { user } );
Events.emit(Events.getSystemEvents().UserLogin, { user });
setClientTheme(client, user.properties[UserProps.ThemeId]);
postLoginPrep(client, err => {
if(err) {
if (err) {
return cb(err);
}
if(user.authenticated) {
if (user.authenticated) {
return recordLogin(client, cb);
}
@@ -131,33 +127,45 @@ function userLogin(client, username, password, options, cb) {
function postLoginPrep(client, cb) {
async.series(
[
(callback) => {
callback => {
//
// User may (no longer) have read (view) rights to their current
// message, conferences and/or areas. Move them out if so.
//
const confTag = client.user.getProperty(UserProps.MessageConfTag);
const conf = getMessageConferenceByTag(confTag) || {};
const area = getMessageAreaByTag(client.user.getProperty(UserProps.MessageAreaTag), confTag) || {};
const confTag = client.user.getProperty(UserProps.MessageConfTag);
const conf = getMessageConferenceByTag(confTag) || {};
const area =
getMessageAreaByTag(
client.user.getProperty(UserProps.MessageAreaTag),
confTag
) || {};
if(!client.acs.hasMessageConfRead(conf) || !client.acs.hasMessageAreaRead(area)) {
if (
!client.acs.hasMessageConfRead(conf) ||
!client.acs.hasMessageAreaRead(area)
) {
// move them out of both area and possibly conf to something suitable, hopefully.
const [newConfTag, newAreaTag] = getSuitableMessageConfAndAreaTags(client);
client.user.persistProperties({
[ UserProps.MessageConfTag ] : newConfTag,
[ UserProps.MessageAreaTag ] : newAreaTag,
},
err => {
return callback(err);
});
const [newConfTag, newAreaTag] =
getSuitableMessageConfAndAreaTags(client);
client.user.persistProperties(
{
[UserProps.MessageConfTag]: newConfTag,
[UserProps.MessageAreaTag]: newAreaTag,
},
err => {
return callback(err);
}
);
} else {
return callback(null);
}
},
(callback) => {
callback => {
// Likewise for file areas
const area = getFileAreaByTag(client.user.getProperty(UserProps.FileAreaTag)) || {};
if(!client.acs.hasFileAreaRead(area)) {
const area =
getFileAreaByTag(client.user.getProperty(UserProps.FileAreaTag)) ||
{};
if (!client.acs.hasFileAreaRead(area)) {
const areaTag = getDefaultFileAreaTag(client) || '';
client.user.persistProperty(UserProps.FileAreaTag, areaTag, err => {
return callback(err);
@@ -165,7 +173,7 @@ function postLoginPrep(client, cb) {
} else {
return callback(null);
}
}
},
],
err => {
return cb(err);
@@ -174,28 +182,28 @@ function postLoginPrep(client, cb) {
}
function recordLogin(client, cb) {
assert(client.user.authenticated); // don't get in situations where this isn't true
assert(client.user.authenticated); // don't get in situations where this isn't true
const user = client.user;
const loginTimestamp = StatLog.now;
async.parallel(
[
(callback) => {
callback => {
StatLog.incrementNonPersistentSystemStat(SysProps.LoginsToday, 1);
return StatLog.incrementSystemStat(SysProps.LoginCount, 1, callback);
},
(callback) => {
return StatLog.setUserStat(user, UserProps.LastLoginTs, loginTimestamp, callback);
},
(callback) => {
callback => {
return StatLog.incrementUserStat(user, UserProps.LoginCount, 1, callback);
},
(callback) => {
callback => {
const loginHistoryMax = Config().statLog.systemEvents.loginHistoryMax;
const historyItem = JSON.stringify({
userId : user.userId,
sessionId : user.sessionId,
userId: user.userId,
sessionId: user.sessionId,
});
return StatLog.appendSystemLogEntry(
@@ -232,12 +240,13 @@ function recordLogin(client, cb) {
}
function transformLoginError(err, client, username) {
client.sessionFailedLoginAttempts = _.get(client, 'sessionFailedLoginAttempts', 0) + 1;
client.sessionFailedLoginAttempts =
_.get(client, 'sessionFailedLoginAttempts', 0) + 1;
const disconnect = Config().users.failedLogin.disconnect;
if(disconnect > 0 && client.sessionFailedLoginAttempts >= disconnect) {
if (disconnect > 0 && client.sessionFailedLoginAttempts >= disconnect) {
err = Errors.BadLogin('To many failed login attempts', ErrorReasons.TooMany);
}
client.log.warn( { username, ip : client.remoteAddress, reason : err.message }, `Failed login attempt for user "${username}", ${client.friendlyRemoteAddress()}`);
return err;
}
}