Added user last access support, #3319
Ylian Saint-Hilaire committed
Dec 4, 2021 at 13:08 UTC
4fa629f825ce6d4bb0aed309f0e3144edea0b7f0
5 files changed
+62
-10
meshdesktopmultiplex.js
+19
@@ -131,6 +131,25 @@ function CreateDesktopMultiplexor(parent, domain, nodeid, func) {
131
if ((typeof sr == 'number') && (sr > 0) && (sr < 1000)) { peer.slowRelay = sr; }
132
}
133
134
+ // Update user last access time
135
+ if ((peer.user != null) && (peer.guestName == null)) {
136
+ const user = parent.users[peer.user._id];
137
+ if (user != null) {
138
+ const timeNow = Math.floor(Date.now() / 1000);
139
+ if (user.access < (timeNow - 300)) { // Only update user access time if longer than 5 minutes
140
+ user.access = timeNow;
141
+ parent.db.SetUser(user);
142
+
143
+ // Event the change
144
+ var message = { etype: 'user', userid: user._id, username: user.name, account: parent.CloneSafeUser(user), action: 'accountchange', domain: domain.id, nolog: 1 };
145
+ if (parent.db.changeStream) { message.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
146
+ var targets = ['*', 'server-users', user._id];
147
+ if (user.groups) { for (var i in user.groups) { targets.push('server-users:' + i); } }
148
+ parent.parent.DispatchEvent(targets, obj, message);
149
+ }
150
+ }
151
+ }
152
+
153
// Check session recording
154
var startRecord = false;
155
if (typeof domain.sessionrecording == 'object') {
meshrelay.js
+16
@@ -508,6 +508,22 @@ function CreateMeshRelayEx(parent, ws, req, domain, user, cookie) {
508
var event = { etype: 'relay', action: 'relaylog', domain: domain.id, userid: sessionUser._id, username: sessionUser.name, msgid: msgid, msgArgs: [obj.id, obj.peer.req.clientIp, req.clientIp], msg: msg + ' \"' + obj.id + '\" from ' + obj.peer.req.clientIp + ' to ' + req.clientIp, protocol: req.query.p, nodeid: req.query.nodeid };
509
if (obj.guestname) { event.guestname = obj.guestname; } else if (relayinfo.peer1.guestname) { event.guestname = relayinfo.peer1.guestname; } // If this is a sharing session, set the guest name here.
510
parent.parent.DispatchEvent(['*', sessionUser._id], obj, event);
511
+
512
+ // Update user last access time
513
+ if ((obj.user != null) && (obj.guestname == null)) {
514
+ const timeNow = Math.floor(Date.now() / 1000);
515
+ if (obj.user.access < (timeNow - 300)) { // Only update user access time if longer than 5 minutes
516
+ obj.user.access = timeNow;
517
+ parent.db.SetUser(obj.user);
518
+
519
+ // Event the change
520
+ var message = { etype: 'user', userid: obj.user._id, username: obj.user.name, account: parent.CloneSafeUser(obj.user), action: 'accountchange', domain: domain.id, nolog: 1 };
521
+ if (parent.db.changeStream) { message.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
522
+ var targets = ['*', 'server-users', obj.user._id];
523
+ if (obj.user.groups) { for (var i in obj.user.groups) { targets.push('server-users:' + i); } }
524
+ parent.parent.DispatchEvent(targets, obj, message);
525
+ }
526
+ }
527
}
528
} else {
529
// Connected already, drop (TODO: maybe we should re-connect?)
meshuser.js
+16
@@ -186,6 +186,22 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
186
187
obj.ws.xclosed = 10; // DEBUG
188
189
+ // Update user last access time
190
+ if (obj.user != null) {
191
+ const timeNow = Math.floor(Date.now() / 1000);
192
+ if (obj.user.access < (timeNow - 300)) { // Only update user access time if longer than 5 minutes
193
+ obj.user.access = timeNow;
194
+ parent.db.SetUser(user);
195
+
196
+ // Event the change
197
+ var message = { etype: 'user', userid: obj.user._id, username: obj.user.name, account: parent.CloneSafeUser(obj.user), action: 'accountchange', domain: domain.id, nolog: 1 };
198
+ if (parent.db.changeStream) { message.noact = 1; } // If DB change stream is active, don't use this event to change the user. Another event will come.
199
+ var targets = ['*', 'server-users', obj.user._id];
200
+ if (obj.user.groups) { for (var i in obj.user.groups) { targets.push('server-users:' + i); } }
201
+ parent.parent.DispatchEvent(targets, obj, message);
202
+ }
203
+ }
204
+
205
// Aggressive cleanup
206
delete obj.user;
207
delete obj.domain;
views/default.handlebars
+2
-1
@@ -13492,7 +13492,8 @@
13492
}
13493
if (sessions == 1) { lastAccess += nobreak("1 session"); } else { lastAccess += nobreak(format("{0} sessions", sessions)); }
13494
} else {
13495
- if (user.login) { lastAccess += '<span title="' + format("Last login: {0}", printDateTime(new Date(user.login * 1000))) + '">' + printDate(new Date(user.login * 1000)) + '</span>'; }
13495
+ if (user.access) { lastAccess += '<span title="' + format("Last access: {0}", printDateTime(new Date(user.access * 1000))) + '">' + printDate(new Date(user.access * 1000)) + '</span>'; }
13496
+ else if (user.login) { lastAccess += '<span title="' + format("Last login: {0}", printDateTime(new Date(user.login * 1000))) + '">' + printDate(new Date(user.login * 1000)) + '</span>'; }
13497
}
13498
if (self) { permissions += '<a href=# style=cursor:pointer onclick=\'return showUserAdminDialog(event,"' + encodeURIComponentEx(user._id) + '")\'>'; }
13499
if ((user.siteadmin != null) && ((user.siteadmin & 32) != 0) && (user.siteadmin != 0xFFFFFFFF)) { permissions += "Locked" + ', '; }
webserver.js
+9
-9
@@ -476,7 +476,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
476
477
if (user == null) {
478
// Create a new user
479
- var user = { type: 'user', _id: userid, name: username, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), domain: domain.id };
479
+ var user = { type: 'user', _id: userid, name: username, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), access: Math.floor(Date.now() / 1000), domain: domain.id };
480
if (email) { user['email'] = email; user['emailVerified'] = true; }
481
if (domain.newaccountsrights) { user.siteadmin = domain.newaccountsrights; }
482
if (obj.common.validateStrArray(domain.newaccountrealms)) { user.groups = domain.newaccountrealms; }
@@ -586,7 +586,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
586
587
if (user == null) {
588
// This user does not exist, create a new account.
589
- var user = { type: 'user', _id: userid, name: username, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), domain: domain.id };
589
+ var user = { type: 'user', _id: userid, name: username, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), access: Math.floor(Date.now() / 1000), domain: domain.id };
590
if (email) { user['email'] = email; user['emailVerified'] = true; }
591
if (domain.newaccountsrights) { user.siteadmin = domain.newaccountsrights; }
592
if (obj.common.validateStrArray(domain.newaccountrealms)) { user.groups = domain.newaccountrealms; }
@@ -1221,7 +1221,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
1221
1222
// Save login time
1223
user.pastlogin = user.login;
1224
- user.login = Math.floor(Date.now() / 1000);
1224
+ user.login = user.access = Math.floor(Date.now() / 1000);
1225
obj.db.SetUser(user);
1226
1227
// Notify account login
@@ -1381,7 +1381,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
1381
req.session.loginmode = 2;
1382
req.session.messageid = 104; // Username already exists.
1383
} else {
1384
- var user = { type: 'user', _id: 'user/' + domain.id + '/' + req.body.username.toLowerCase(), name: req.body.username, email: req.body.email, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), domain: domain.id };
1384
+ var user = { type: 'user', _id: 'user/' + domain.id + '/' + req.body.username.toLowerCase(), name: req.body.username, email: req.body.email, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), access: Math.floor(Date.now() / 1000), domain: domain.id };
1385
if (domain.newaccountsrights) { user.siteadmin = domain.newaccountsrights; }
1386
if (obj.common.validateStrArray(domain.newaccountrealms)) { user.groups = domain.newaccountrealms; }
1387
if ((domain.passwordrequirements != null) && (domain.passwordrequirements.hint === true) && (req.body.apasswordhint)) { var hint = req.body.apasswordhint; if (hint.length > 250) { hint = hint.substring(0, 250); } user.passhint = hint; }
@@ -1508,7 +1508,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
1508
1509
user.salt = salt;
1510
user.hash = hash;
1511
- user.passchange = nowSeconds;
1511
+ user.passchange = user.access = nowSeconds;
1512
delete user.passtype;
1513
obj.db.SetUser(user);
1514
@@ -1819,7 +1819,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
1819
userinfo.salt = salt;
1820
userinfo.hash = hash;
1821
delete userinfo.passtype;
1822
- userinfo.passchange = Math.floor(Date.now() / 1000);
1822
+ userinfo.passchange = userinfo.access = Math.floor(Date.now() / 1000);
1823
delete userinfo.passhint;
1824
obj.db.SetUser(userinfo);
1825
@@ -2323,7 +2323,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
2323
}
2324
user.salt = salt;
2325
user.hash = hash;
2326
- user.passchange = nowSeconds;
2326
+ user.passchange = user.access = nowSeconds;
2327
delete user.passtype;
2328
2329
obj.db.SetUser(user);
@@ -2361,7 +2361,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
2361
if (newAccountAllowed === true) {
2362
// Create the user
2363
parent.debug('web', 'handleStrategyLogin: creating new user: ' + userid);
2364
- user = { type: 'user', _id: userid, name: req.user.name, email: req.user.email, creation: Math.floor(Date.now() / 1000), domain: domain.id };
2364
+ user = { type: 'user', _id: userid, name: req.user.name, email: req.user.email, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), access: Math.floor(Date.now() / 1000), domain: domain.id };
2365
if (req.user.email != null) { user.email = req.user.email; user.emailVerified = true; }
2366
if (domain.newaccountsrights) { user.siteadmin = domain.newaccountsrights; } // New accounts automatically assigned server rights.
2367
if (domain.authstrategies[req.user.strategy].newaccountsrights) { user.siteadmin = obj.common.meshServerRightsArrayToNumber(domain.authstrategies[req.user.strategy].newaccountsrights); } // If there are specific SSO server rights, use these instead.
@@ -2554,7 +2554,7 @@ module.exports.CreateWebServer = function (parent, db, args, certificates, doneF
2554
user = obj.users[req.session.userid];
2555
if ((user == null) || (user.sid != req.session.usersid)) {
2556
// Create the domain user
2557
- var usercount = 0, user2 = { type: 'user', _id: req.session.userid, name: req.connection.user, domain: domain.id, sid: req.session.usersid, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000) };
2557
+ var usercount = 0, user2 = { type: 'user', _id: req.session.userid, name: req.connection.user, domain: domain.id, sid: req.session.usersid, creation: Math.floor(Date.now() / 1000), login: Math.floor(Date.now() / 1000), access: Math.floor(Date.now() / 1000) };
2558
if (domain.newaccountsrights) { user2.siteadmin = domain.newaccountsrights; }
2559
if (obj.common.validateStrArray(domain.newaccountrealms)) { user2.groups = domain.newaccountrealms; }
2560
for (var i in obj.users) { if (obj.users[i].domain == domain.id) { usercount++; } }