add bitlocker to csv
Signed-off-by: Simon Smith <simonsmith5521@gmail.com>
Simon Smith committed
Oct 3, 2023 at 20:11 UTC
128919b851b67f4601419768f2de3187eabaa687
2 files changed
+17
-3
meshuser.js
+8
-1
@@ -4939,6 +4939,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
4939
if (typeof n.wsc == 'object') {
4940
output += ',' + csvClean(n.wsc.antiVirus ? n.wsc.antiVirus : '') + ',' + csvClean(n.wsc.autoUpdate ? n.wsc.autoUpdate : '') + ',' + csvClean(n.wsc.firewall ? n.wsc.firewall : '')
4941
} else { output += ',,,'; }
4942
+ if (typeof n.volumes == 'object') {
4943
+ var bitlockerdetails = '', firstbitlocker = true;
4944
+ for (var a in n.volumes) { if (typeof n.volumes[a].protectionStatus !== 'undefined') { if (firstbitlocker) { firstbitlocker = false; } else { bitlockerdetails += '|'; } bitlockerdetails += a + '/' + n.volumes[a].volumeStatus; } }
4945
+ output += ',' + csvClean(bitlockerdetails);
4946
+ } else {
4947
+ output += ',';
4948
+ }
4949
if (typeof n.av == 'object') {
4950
var avdetails = '', firstav = true;
4951
for (var a in n.av) { if (typeof n.av[a].product == 'string') { if (firstav) { firstav = false; } else { avdetails += '|'; } avdetails += (n.av[a].product + '/' + ((n.av[a].enabled) ? 'enabled' : 'disabled') + '/' + ((n.av[a].updated) ? 'updated' : 'notupdated')); } }
@@ -4946,7 +4953,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
4953
}
4954
else { output += ','; }
4955
} else {
4949
- output += ',,,,,,,,,,,';
4956
+ output += ',,,,,,,,,,,,';
4957
}
4958
4959
// System infomation
views/default.handlebars
+9
-2
@@ -5744,13 +5744,20 @@
5744
meshserver.send({ action: 'getDeviceDetails', nodeids: chkNodeIds, tz: tz, tf: new Date().getTimezoneOffset(), l: getLang(), type: 'csv' }); // With details
5745
} else {
5746
// Without details
5747
- var csv = "id, name, rname, host, icon, ip, osdesc, state, groupname, conn, pwr, av, update, firewall, avdetails" + '\r\n', r = [];
5747
+ var csv = "id,name,rname,host,icon,ip,osdesc,state,groupname,conn,pwr,av,update,firewall,bitlocker,avdetails" + '\r\n', r = [];
5748
for (var i in chkNodeIds) {
5749
var n = getNodeFromId(chkNodeIds[i]);
5750
csv += '"' + n._id.split(',').join('') + '","' + n.name.split(',').join('') + '","' + (n.rname?(n.rname.split(',').join('')):'') + '","' + (n.host?(n.host.split(',').join('')):'') + '","' + n.icon + '","' + (n.ip?n.ip:'') + '","' + (n.osdesc?(n.osdesc.split(',').join('')):'') + '","' + n.state + '","' + meshes[n.meshid].name.split(',').join('') + '","' + (n.conn?n.conn:'') + '","' + (n.pwr?n.pwr:'') + '"';
5751
if (typeof n.wsc == 'object') { csv += ',"' + csvClean(n.wsc.antiVirus) + '","' + csvClean(n.wsc.autoUpdate) + '","' + csvClean(n.wsc.firewall) + '"'; } else { csv += ',,,'; }
5752
+ if (typeof n.volumes == 'object') {
5753
+ var bitlockerdetails = '', firstbitlocker = true;
5754
+ for (var a in n.volumes) { if (typeof n.volumes[a].protectionStatus !== 'undefined') { if (firstbitlocker) { firstbitlocker = false; } else { bitlockerdetails += '|'; } bitlockerdetails += a + '/' + n.volumes[a].volumeStatus; } }
5755
+ csv += ',"' + csvClean(bitlockerdetails) + '"'; }
5756
+ else {
5757
+ csv += ',';
5758
+ }
5759
if (typeof n.av == 'object') {
5753
- var avdetails = '', firstav= true;
5760
+ var avdetails = '', firstav = true;
5761
for (var a in n.av) { if (typeof n.av[a].product == 'string') { if (firstav) { firstav = false; } else { avdetails += '|'; } avdetails += (n.av[a].product + '/' + ((n.av[a].enabled)?'enabled':'disabled') + '/' + ((n.av[a].updated)?'updated':'notupdated')); } }
5762
csv += ',"' + csvClean(avdetails) + '"'; }
5763
else {