Added security data to device export, #2760
Ylian Saint-Hilaire committed
Jun 10, 2021 at 13:54 UTC
bfc3126937f1e82705623c248433888ce2c09deb
2 files changed
+16
-4
meshuser.js
+7
-2
@@ -5910,7 +5910,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5910
if (type == 'csv') {
5911
try {
5912
// Create the CSV file
5913
- output = 'id,name,rname,host,icon,ip,osdesc,groupname,cpu,osbuild,biosDate,biosVendor,biosVersion,boardName,boardVendor,boardVersion,productUuid,agentOpenSSL,agentCommitDate,agentCommitHash,agentCompileTime,netIfCount,macs,addresses\r\n';
5913
+ output = 'id,name,rname,host,icon,ip,osdesc,groupname,av,update,firewall,cpu,osbuild,biosDate,biosVendor,biosVersion,boardName,boardVendor,boardVersion,productUuid,agentOpenSSL,agentCommitDate,agentCommitHash,agentCompileTime,netIfCount,macs,addresses\r\n';
5914
for (var i = 0; i < results.length; i++) {
5915
const nodeinfo = results[i];
5916
@@ -5918,8 +5918,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
5918
if (nodeinfo.node != null) {
5919
const n = nodeinfo.node;
5920
output += csvClean(n._id) + ',' + csvClean(n.name) + ',' + csvClean(n.rname ? n.rname : '') + ',' + csvClean(n.host ? n.host : '') + ',' + (n.icon ? n.icon : 1) + ',' + (n.ip ? n.ip : '') + ',' + (n.osdesc ? csvClean(n.osdesc) : '') + ',' + csvClean(parent.meshes[n.meshid].name);
5921
+ if (typeof n.wsc == 'object') {
5922
+ output += ',' + csvClean(n.wsc.antiVirus ? n.wsc.antiVirus : '') + ',' + csvClean(n.wsc.autoUpdate ? n.wsc.autoUpdate : '') + ',' + csvClean(n.wsc.firewall ? n.wsc.firewall : '')
5923
+ } else {
5924
+ output += ',,,';
5925
+ }
5926
} else {
5922
- output += ',,,,,,,';
5927
+ output += ',,,,,,,,,,';
5928
}
5929
5930
// System infomation
views/default.handlebars
+9
-2
@@ -5128,16 +5128,23 @@
5128
setDialogMode(2, "Device Information Export", 1, null, x);
5129
}
5130
5131
+ function csvClean(v) {
5132
+ if (v == null) return '';
5133
+ return v.split(',').join('');
5134
+ }
5135
+
5136
function p2downloadDeviceInfoCSV() {
5137
var chkNodeIds = getCheckedDevices();
5138
if (Q('d2DevInfoDetailsCheck').checked) {
5139
meshserver.send({ action: 'getDeviceDetails', nodeids: chkNodeIds, type: 'csv' }); // With details
5140
} else {
5141
// Without details
5137
- var csv = "id, name, rname, host, icon, ip, osdesc, state, groupname, conn, pwr" + '\r\n', r = [];
5142
+ var csv = "id, name, rname, host, icon, ip, osdesc, state, groupname, conn, pwr, av, update, firewall" + '\r\n', r = [];
5143
for (var i in chkNodeIds) {
5144
var n = getNodeFromId(chkNodeIds[i]);
5140
- 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:'') + '"\r\n';
5145
+ 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:'') + '"';
5146
+ if (typeof n.wsc == 'object') { csv += ',"' + csvClean(n.wsc.antiVirus) + '","' + csvClean(n.wsc.autoUpdate) + '","' + csvClean(n.wsc.firewall) + '"'; } else { csv += ',,,'; }
5147
+ csv += '\r\n';
5148
}
5149
saveAs(new Blob([csv], { type: 'application/octet-stream' }), "devicelist.csv");
5150
}