MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-01-12 23:43:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added security data to device export, #2760

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2021-06-10 13:54:06 -07:00
parent 28242e9670
commit bfc3126937
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meshuser.js
View File

@ -5910,7 +5910,7 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (type == 'csv') { if (type == 'csv') {
try { try {
// Create the CSV file // Create the CSV file
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'; 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';
for (var i = 0; i < results.length; i++) { for (var i = 0; i < results.length; i++) {
const nodeinfo = results[i]; const nodeinfo = results[i];
@ -5918,8 +5918,13 @@ module.exports.CreateMeshUser = function (parent, db, ws, req, args, domain, use
if (nodeinfo.node != null) { if (nodeinfo.node != null) {
const n = nodeinfo.node; const n = nodeinfo.node;
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); 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);
if (typeof n.wsc == 'object') {
output += ',' + csvClean(n.wsc.antiVirus ? n.wsc.antiVirus : '') + ',' + csvClean(n.wsc.autoUpdate ? n.wsc.autoUpdate : '') + ',' + csvClean(n.wsc.firewall ? n.wsc.firewall : '')
} else { } else {
output += ',,,,,,,'; output += ',,,';
}
} else {
output += ',,,,,,,,,,';
} }
// System infomation // System infomation

11
views/default.handlebars
View File

@ -5128,16 +5128,23 @@
setDialogMode(2, "Device Information Export", 1, null, x); setDialogMode(2, "Device Information Export", 1, null, x);
} }
function csvClean(v) {
if (v == null) return '';
return v.split(',').join('');
}
function p2downloadDeviceInfoCSV() { function p2downloadDeviceInfoCSV() {
var chkNodeIds = getCheckedDevices(); var chkNodeIds = getCheckedDevices();
if (Q('d2DevInfoDetailsCheck').checked) { if (Q('d2DevInfoDetailsCheck').checked) {
meshserver.send({ action: 'getDeviceDetails', nodeids: chkNodeIds, type: 'csv' }); // With details meshserver.send({ action: 'getDeviceDetails', nodeids: chkNodeIds, type: 'csv' }); // With details
} else { } else {
// Without details // Without details
var csv = "id, name, rname, host, icon, ip, osdesc, state, groupname, conn, pwr" + '\r\n', r = []; var csv = "id, name, rname, host, icon, ip, osdesc, state, groupname, conn, pwr, av, update, firewall" + '\r\n', r = [];
for (var i in chkNodeIds) { for (var i in chkNodeIds) {
var n = getNodeFromId(chkNodeIds[i]); var n = getNodeFromId(chkNodeIds[i]);
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'; 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:'') + '"';
if (typeof n.wsc == 'object') { csv += ',"' + csvClean(n.wsc.antiVirus) + '","' + csvClean(n.wsc.autoUpdate) + '","' + csvClean(n.wsc.firewall) + '"'; } else { csv += ',,,'; }
csv += '\r\n';
} }
saveAs(new Blob([csv], { type: 'application/octet-stream' }), "devicelist.csv"); saveAs(new Blob([csv], { type: 'application/octet-stream' }), "devicelist.csv");
} }