From eae865ab8d000a8c5e28843cc35c7893872fe6b4 Mon Sep 17 00:00:00 2001
From: Ylian Saint-Hilaire <ysainthilaire@hotmail.com>
Date: Tue, 1 Mar 2022 15:25:23 -0800
Subject: [PATCH] Added user login report.

---
 meshuser.js                |  79 +++++++++++++++++++++++++++++++++----
 public/images/notify16.png | Bin 0 -> 5914 bytes
 public/styles/style.css    |   9 +++++
 views/default.handlebars   |  24 +++++++++--
 4 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 public/images/notify16.png

diff --git a/meshuser.js b/meshuser.js
index 76f33da2..06301474 100644
--- a/meshuser.js
+++ b/meshuser.js
@@ -5914,18 +5914,27 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
     }
 
     function serverCommandReport(command) {
-        if (common.validateInt(command.type, 1, 2) == false) return; // Validate type
+        if (common.validateInt(command.type, 1, 3) == false) return; // Validate type
         if (common.validateInt(command.groupBy, 1, 3) == false) return; // Validate groupBy: 1 = User, 2 = Device, 3 = Day
         if ((typeof command.start != 'number') || (typeof command.end != 'number') || (command.start >= command.end)) return; // Validate start and end time
         const manageAllDeviceGroups = ((user.siteadmin == 0xFFFFFFFF) && (parent.parent.config.settings.managealldevicegroups.indexOf(user._id) >= 0));
         if ((command.devGroup != null) && (manageAllDeviceGroups == false) && ((user.links == null) || (user.links[command.devGroup] == null))) return; // Asking for a device group that is not allowed
 
         const msgIdFilter = [5, 10, 11, 12, 122, 123, 124, 125, 126];
-
-        if (command.type == 1)
-            remoteSessionReport(command, manageAllDeviceGroups, msgIdFilter);
-        if (command.type == 2)
-            trafficUsageReport(command, msgIdFilter);
+        switch (command.type) {
+            case 1: {
+                remoteSessionReport(command, manageAllDeviceGroups, msgIdFilter);
+                break;
+            }
+            case 2: {
+                trafficUsageReport(command, msgIdFilter);
+                break;
+            }
+            case 3: {
+                userLoginReport(command, msgIdFilter);
+                break;
+            }   
+        }
     }
 
     function serverCommandServerClearErrorLog(command) {
@@ -6939,7 +6948,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
 
                 // Fetch or create the user entry
                 var userEntry = userEntries[docs[i].userid];
-                if (userEntry == null) { userEntry = { userid: docs[i].userid, length: 0, bytesin: 0, bytesout: 0}; }
+                if (userEntry == null) { userEntry = { userid: docs[i].userid, length: 0, bytesin: 0, bytesout: 0 }; }
                 if (docs[i].bytesin) { userEntry.bytesin += docs[i].bytesin; }
                 if (docs[i].bytesout) { userEntry.bytesout += docs[i].bytesout; }
 
@@ -6959,6 +6968,62 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
         });
     }
 
+
+    function userLoginReport(command) {
+        // If we are not user administrator on this site, only search for events with our own user id.
+        var ids = [user._id]; // If we are nto user administrator, only count our own traffic.
+        if ((user.siteadmin & SITERIGHT_MANAGEUSERS) != 0) { ids = ['*']; } // If user administrator, count traffic of all users.
+
+        var showInvalidLoginAttempts = true;
+
+        // Get the events in the time range
+        // MySQL or MariaDB query will ignore the MsgID filter.
+        var msgIdFilter = [107];
+        if (showInvalidLoginAttempts) { msgIdFilter = [107, 108, 109, 110]; } // Includes invalid login attempts
+
+        db.GetEventsTimeRange(ids, domain.id, msgIdFilter, new Date(command.start * 1000), new Date(command.end * 1000), function (err, docs) {
+            if (err != null) return;
+
+            // Columns
+            var data = { groups: {} };
+            if (command.groupBy == 1) {
+                data.groupFormat = 'user';
+                data.columns = [{ id: 'time', title: "time", format: 'datetime' }, { id: 'ip', title: "ip" }, { id: 'browser', title: "browser" }, { id: 'os', title: "os" }];
+            } else if (command.groupBy == 3) {
+                data.columns = [{ id: 'time', title: "time", format: 'time' }, { id: 'userid', title: "user", format: 'user' }, { id: 'ip', title: "ip" }, { id: 'browser', title: "browser" }, { id: 'os', title: "os" }];
+            }
+            if (showInvalidLoginAttempts) { data.columns.push({ id: 'msg', title: "msg", format: 'msg' }); }
+
+            // Add all log entries
+            var entries = [];
+            for (var i in docs) {
+                // If MySQL or MariaDB query, we can't filter on MsgID, so we have to do it here.
+                if (msgIdFilter.indexOf(docs[i].msgid) < 0) continue;
+
+                if (command.groupBy == 1) { // Add entry per user
+                    if (data.groups[docs[i].userid] == null) { data.groups[docs[i].userid] = { entries: [] }; }
+                    const entry = { time: docs[i].time.valueOf(), ip: docs[i].msgArgs[0], browser: docs[i].msgArgs[1], os: docs[i].msgArgs[2] };
+                    if (showInvalidLoginAttempts) { entry.msg = docs[i].msgid }
+                    data.groups[docs[i].userid].entries.push(entry);
+                } else if (command.groupBy == 3) { // Add entry per day
+                    var day;
+                    if ((typeof command.l == 'string') && (typeof command.tz == 'string')) {
+                        day = new Date(docs[i].time).toLocaleDateString(command.l, { timeZone: command.tz });
+                    } else {
+                        day = docs[i].time; // TODO
+                    }
+                    if (data.groups[day] == null) { data.groups[day] = { entries: [] }; }
+                    const entry = { time: docs[i].time.valueOf(), userid: docs[i].userid, ip: docs[i].msgArgs[0], browser: docs[i].msgArgs[1], os: docs[i].msgArgs[2] };
+                    if (showInvalidLoginAttempts) { entry.msg = docs[i].msgid }
+                    data.groups[day].entries.push(entry);
+                }
+            }
+
+            try { ws.send(JSON.stringify({ action: 'report', data: data })); } catch (ex) { }
+        });
+    }
+
+
     // Return detailed information about an array of nodeid's
     function getDeviceDetailedInfo(nodeids, type, func) {
         if (nodeids == null) { getAllDeviceDetailedInfo(type, func); return; }
diff --git a/public/images/notify16.png b/public/images/notify16.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0af982c01cc80f7b583981b1acb90988859b603
GIT binary patch
literal 5914
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

literal 0
HcmV?d00001

diff --git a/public/styles/style.css b/public/styles/style.css
index 1a14d8ec..8b39ed80 100644
--- a/public/styles/style.css
+++ b/public/styles/style.css
@@ -848,6 +848,15 @@ NoMeshesPanel img {
 .NotifyIconSmall7 { width:24px; height:24px; background: url(../images/notify24.png) -144px 0px; }
 .NotifyIconSmall8 { width:24px; height:24px; background: url(../images/notify24.png) -168px 0px; }
 .NotifyIconSmall9 { width:24px; height:24px; background: url(../images/notify24.png) -192px 0px; }
+.NotifyIconTiny1 { width:16px; height:16px; background: url(../images/notify16.png) 0px 0px; }
+.NotifyIconTiny2 { width:16px; height:16px; background: url(../images/notify16.png) -16px 0px; }
+.NotifyIconTiny3 { width:16px; height:16px; background: url(../images/notify16.png) -32px 0px; }
+.NotifyIconTiny4 { width:16px; height:16px; background: url(../images/notify16.png) -48px 0px; }
+.NotifyIconTiny5 { width:16px; height:16px; background: url(../images/notify16.png) -64px 0px; }
+.NotifyIconTiny6 { width:16px; height:16px; background: url(../images/notify16.png) -80px 0px; }
+.NotifyIconTiny7 { width:16px; height:16px; background: url(../images/notify16.png) -96px 0px; }
+.NotifyIconTiny8 { width:16px; height:16px; background: url(../images/notify16.png) -112px 0px; }
+.NotifyIconTiny9 { width:16px; height:16px; background: url(../images/notify16.png) -128px 0px; }
 
 .deviceBatteryLarge {
     position:absolute;
diff --git a/views/default.handlebars b/views/default.handlebars
index 283964c4..7f241e66 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -15623,7 +15623,7 @@
             if (xxdialogMode) return;
             var y = '', x = '', settings = JSON.parse(getstore('_ReportSettings', '{}'));
 
-            var options = { 1 : "Remote Sessions", 2 : "User Traffic Usage" }
+            var options = { 1 : "Remote Sessions", 2 : "User Traffic Usage", 3 : "User Logins" }
             for (var i in options) { y += '<option value=' + i + ((settings.type == i)?' selected':'') + '>' + options[i] + '</option>'; }
             x += addHtmlValue("Type", '<select id=d2reportType style=float:right;width:250px onchange=generateReportDialogValidate()>' + y + '</select>');
 
@@ -15634,6 +15634,13 @@
             x += addHtmlValue("Group by", '<select id=d2groupBy style=float:right;width:250px onchange=generateReportDialogValidate()>' + y + '</select>');
             x += '</div>';
 
+            x += '<div id=d2GroupByDiv2 style=display:none>';
+            y = '';
+            var options = { 1 : "User", 3: "Day" }
+            for (var i in options) { y += '<option value=' + i + ((settings.groupBy2 == i)?' selected':'') + '>' + options[i] + '</option>'; }
+            x += addHtmlValue("Group by", '<select id=d2groupBy2 style=float:right;width:250px onchange=generateReportDialogValidate()>' + y + '</select>');
+            x += '</div>';
+
             x += '<div id=d2DeviceGroupDiv style=display:none>';
             y = '<option value=0' + ((settings.devGroup == 0)?' selected':'') + '>' + "All" + '</option>';
             var omeshs = getOrderedList(meshes, 'name');
@@ -15667,6 +15674,7 @@
         function generateReportDialogValidate() {
             QV('d2timeRangeDiv', Q('d2timeRange').value == 0);
             QV('d2GroupByDiv', Q('d2reportType').value == 1);
+            QV('d2GroupByDiv2', Q('d2reportType').value == 3);
             QV('d2DeviceGroupDiv', Q('d2reportType').value == 1);
             QV('d2showTrafficDiv', Q('d2reportType').value == 1);
         }
@@ -15685,12 +15693,14 @@
             try { tz = Intl.DateTimeFormat().resolvedOptions().timeZone; } catch (ex) {}
             var devGroup = decodeURIComponent(Q('d2groupId').value);
             if (devGroup == 0) { devGroup = null; }
-            putstore('_ReportSettings', JSON.stringify({ type: parseInt(Q('d2reportType').value), groupBy: parseInt(Q('d2groupBy').value), timeRange: parseInt(Q('d2timeRange').value), devGroup: devGroup, showTraffic: Q('d2showTraffic').checked }));
-            meshserver.send({ action: 'report', type: parseInt(Q('d2reportType').value), groupBy: parseInt(Q('d2groupBy').value), start: start, end: end, tz: tz, tf: new Date().getTimezoneOffset(), l: getLang(), devGroup: devGroup, showTraffic: Q('d2showTraffic').checked });
+            putstore('_ReportSettings', JSON.stringify({ type: parseInt(Q('d2reportType').value), groupBy: parseInt(Q('d2groupBy').value), groupBy2: parseInt(Q('d2groupBy2').value), timeRange: parseInt(Q('d2timeRange').value), devGroup: devGroup, showTraffic: Q('d2showTraffic').checked }));
+            var groupBy = parseInt(Q('d2groupBy').value);
+            if (Q('d2reportType').value == 3) { groupBy = parseInt(Q('d2groupBy2').value); }
+            meshserver.send({ action: 'report', type: parseInt(Q('d2reportType').value), groupBy: groupBy, start: start, end: end, tz: tz, tf: new Date().getTimezoneOffset(), l: getLang(), devGroup: devGroup, showTraffic: Q('d2showTraffic').checked });
         }
 
         function renderReport(r) {
-            var colTranslation = { time: "Time", device: "Device", session: "Session", user: "User", devgroup: "Device Group", guest: "Guest", length: "Length", bytesin: "Bytes In", bytesout: "Bytes Out" }
+            var colTranslation = { time: "Time", device: "Device", session: "Session", user: "User", devgroup: "Device Group", guest: "Guest", length: "Length", bytesin: "Bytes In", bytesout: "Bytes Out", os: "Operating System", ip: "IP Address", browser: "Browser", msg: "Message" }
             var x = '<table style=width:100%>', firstItem;
             var sumByCol = null; // Indicate by what colum we sum by
             var sumByValues = []; // Indicate by what values we sum by
@@ -15844,6 +15854,12 @@
                     return '<i>' + "Unknown User" + '</i>';
                 }
             }
+            if (f == 'msg') {
+                if (v == 107) return '<div style=float:left;margin-right:4px;cursor:pointer class="NotifyIconTiny1"></div>' + "Succesful login";
+                if (v == 108) return '<div style=float:left;margin-right:4px;cursor:pointer class="NotifyIconTiny2"></div>' + "Incorrect 2nd factor";
+                if (v == 109) return '<div style=float:left;margin-right:4px;cursor:pointer class="NotifyIconTiny4"></div>' + "Locked account";
+                if (v == 110) return '<div style=float:left;margin-right:4px;cursor:pointer class="NotifyIconTiny3"></div>' + "Invalid login attempt";
+            }
             return EscapeHtml(v);
         }