Improved database query for account login events.
Ylian Saint-Hilaire committed
Mar 1, 2021 at 13:23 UTC
f5e22c10678627a076980f85f181ec37839f5c34
2 files changed
+44
-12
db.js
+9
@@ -981,6 +981,7 @@ module.exports.CreateDB = function (parent, func) {
981
sqlDbQuery('SELECT doc FROM meshcentral.events JOIN meshcentral.eventids ON id = fkid WHERE (domain = ? AND userid = ? AND target IN (?)) GROUP BY id ORDER BY time DESC LIMIT ?', [domain, userid, ids, limit], func);
982
}
983
};
984
+ //obj.GetUserLoginEvents = function (domain, username, func) { } // TODO
985
obj.GetNodeEventsWithLimit = function (nodeid, domain, limit, func) { sqlDbQuery('SELECT doc FROM meshcentral.events WHERE (nodeid = ?) AND (domain = ?) ORDER BY time DESC LIMIT ?', [nodeid, domain, limit], func); };
986
obj.GetNodeEventsSelfWithLimit = function (nodeid, domain, userid, limit, func) { sqlDbQuery('SELECT doc FROM meshcentral.events WHERE (nodeid = ?) AND (domain = ?) AND ((userid = ?) OR (userid IS NULL)) ORDER BY time DESC LIMIT ?', [nodeid, domain, userid, limit], func); };
987
obj.RemoveAllEvents = function (domain) { sqlDbQuery('DELETE FROM meshcentral.events', null, function (err, docs) { }); };
@@ -1206,6 +1207,7 @@ module.exports.CreateDB = function (parent, func) {
1207
obj.GetEventsWithLimit = function (ids, domain, limit, func) { obj.eventsfile.find({ domain: domain, ids: { $in: ids } }).project({ type: 0, _id: 0, domain: 0, ids: 0, node: 0 }).sort({ time: -1 }).limit(limit).toArray(func); };
1208
obj.GetUserEvents = function (ids, domain, username, func) { obj.eventsfile.find({ domain: domain, $or: [{ ids: { $in: ids } }, { username: username }] }).project({ type: 0, _id: 0, domain: 0, ids: 0, node: 0 }).sort({ time: -1 }).toArray(func); };
1209
obj.GetUserEventsWithLimit = function (ids, domain, username, limit, func) { obj.eventsfile.find({ domain: domain, $or: [{ ids: { $in: ids } }, { username: username }] }).project({ type: 0, _id: 0, domain: 0, ids: 0, node: 0 }).sort({ time: -1 }).limit(limit).toArray(func); };
1210
+ obj.GetUserLoginEvents = function (domain, username, func) { obj.eventsfile.find({ domain: domain, action: { $in: ['authfail', 'login'] }, msgArgs: { $exists: true } }).project({ action: 1, time: 1, msgid: 1, msgArgs: 1 }).sort({ time: -1 }).toArray(func); };
1211
obj.GetNodeEventsWithLimit = function (nodeid, domain, limit, func) { obj.eventsfile.find({ domain: domain, nodeid: nodeid }).project({ type: 0, etype: 0, _id: 0, domain: 0, ids: 0, node: 0, nodeid: 0 }).sort({ time: -1 }).limit(limit).toArray(func); };
1212
obj.GetNodeEventsSelfWithLimit = function (nodeid, domain, userid, limit, func) { obj.eventsfile.find({ domain: domain, nodeid: nodeid, userid: { $in: [userid, null] } }).project({ type: 0, etype: 0, _id: 0, domain: 0, ids: 0, node: 0, nodeid: 0 }).sort({ time: -1 }).limit(limit).toArray(func); };
1213
obj.RemoveAllEvents = function (domain) { obj.eventsfile.deleteMany({ domain: domain }, { multi: true }); };
@@ -1385,6 +1387,13 @@ module.exports.CreateDB = function (parent, func) {
1387
obj.eventsfile.find({ domain: domain, $or: [{ ids: { $in: ids } }, { username: username }] }, { type: 0, _id: 0, domain: 0, ids: 0, node: 0 }).sort({ time: -1 }).limit(limit, func);
1388
}
1389
};
1390
+ obj.GetUserLoginEvents = function (domain, username, func) {
1391
+ if (obj.databaseType == 1) {
1392
+ obj.eventsfile.find({ domain: domain, action: { $in: ['authfail', 'login'] }, msgArgs: { $exists: true } }, { action: 1, time: 1, msgid: 1, msgArgs: 1 }).sort({ time: -1 }).exec(func);
1393
+ } else {
1394
+ obj.eventsfile.find({ domain: domain, action: { $in: ['authfail', 'login'] }, msgArgs: { $exists: true } }, { action: 1, time: 1, msgid: 1, msgArgs: 1 }).sort({ time: -1 }, func);
1395
+ }
1396
+ };
1397
obj.GetNodeEventsWithLimit = function (nodeid, domain, limit, func) { if (obj.databaseType == 1) { obj.eventsfile.find({ domain: domain, nodeid: nodeid }, { type: 0, etype: 0, _id: 0, domain: 0, ids: 0, node: 0, nodeid: 0 }).sort({ time: -1 }).limit(limit).exec(func); } else { obj.eventsfile.find({ domain: domain, nodeid: nodeid }, { type: 0, etype: 0, _id: 0, domain: 0, ids: 0, node: 0, nodeid: 0 }).sort({ time: -1 }).limit(limit, func); } };
1398
obj.GetNodeEventsSelfWithLimit = function (nodeid, domain, userid, limit, func) { if (obj.databaseType == 1) { obj.eventsfile.find({ domain: domain, nodeid: nodeid, userid: { $in: [userid, null] } }, { type: 0, etype: 0, _id: 0, domain: 0, ids: 0, node: 0, nodeid: 0 }).sort({ time: -1 }).limit(limit).exec(func); } else { obj.eventsfile.find({ domain: domain, nodeid: nodeid }, { type: 0, etype: 0, _id: 0, domain: 0, ids: 0, node: 0, nodeid: 0 }).sort({ time: -1 }).limit(limit, func); } };
1399
obj.RemoveAllEvents = function (domain) { obj.eventsfile.remove({ domain: domain }, { multi: true }); };
meshuser.js
+35
-12
@@ -5387,23 +5387,46 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5387
// TODO: Make a better database call to get filtered data.
5388
if (command.userid == null) {
5389
// Get previous logins for self
5390
- db.GetUserEvents([user._id], domain.id, user._id.split('/')[2], function (err, docs) {
5391
- if (err != null) return;
5392
- var e = [];
5393
- for (var i in docs) { if ((docs[i].msgArgs) && ((docs[i].action == 'authfail') || (docs[i].action == 'login'))) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); } }
5394
- try { ws.send(JSON.stringify({ action: 'previousLogins', events: e })); } catch (ex) { }
5395
- });
5390
+ if (db.GetUserLoginEvents) {
5391
+ // New way
5392
+ db.GetUserLoginEvents(domain.id, user._id.split('/')[2], function (err, docs) {
5393
+ if (err != null) return;
5394
+ var e = [];
5395
+ for (var i in docs) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); }
5396
+ try { ws.send(JSON.stringify({ action: 'previousLogins', events: e })); } catch (ex) { }
5397
+ });
5398
+ } else {
5399
+ // Old way
5400
+ db.GetUserEvents([user._id], domain.id, user._id.split('/')[2], function (err, docs) {
5401
+ console.log(docs);
5402
+ if (err != null) return;
5403
+ var e = [];
5404
+ for (var i in docs) { if ((docs[i].msgArgs) && ((docs[i].action == 'authfail') || (docs[i].action == 'login'))) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); } }
5405
+ try { ws.send(JSON.stringify({ action: 'previousLogins', events: e })); } catch (ex) { }
5406
+ });
5407
+ }
5408
} else {
5409
// Get previous logins for specific userid
5410
if (user.siteadmin === SITERIGHT_ADMIN) {
5411
var splitUser = command.userid.split('/');
5412
if ((obj.crossDomain === true) || (splitUser[1] === domain.id)) {
5401
- db.GetUserEvents([command.userid], splitUser[1], splitUser[2], function (err, docs) {
5402
- if (err != null) return;
5403
- var e = [];
5404
- for (var i in docs) { if ((docs[i].msgArgs) && ((docs[i].action == 'authfail') || (docs[i].action == 'login'))) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); } }
5405
- try { ws.send(JSON.stringify({ action: 'previousLogins', userid: command.userid, events: e })); } catch (ex) { }
5406
- });
5413
+ if (db.GetUserLoginEvents) {
5414
+ // New way
5415
+ db.GetUserLoginEvents(splitUser[1], splitUser[2], function (err, docs) {
5416
+ if (err != null) return;
5417
+ var e = [];
5418
+ for (var i in docs) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); }
5419
+ try { ws.send(JSON.stringify({ action: 'previousLogins', userid: command.userid, events: e })); } catch (ex) { }
5420
+ });
5421
+ } else {
5422
+ // Old way
5423
+ db.GetUserEvents([command.userid], splitUser[1], splitUser[2], function (err, docs) {
5424
+ if (err != null) return;
5425
+ var e = [];
5426
+ for (var i in docs) { if ((docs[i].msgArgs) && ((docs[i].action == 'authfail') || (docs[i].action == 'login'))) { e.push({ t: docs[i].time, m: docs[i].msgid, a: docs[i].msgArgs }); } }
5427
+ try { ws.send(JSON.stringify({ action: 'previousLogins', userid: command.userid, events: e })); } catch (ex) { }
5428
+ });
5429
+ }
5430
}
5431
}
5432
}