From 14c3816fc90375e70348ee88f2fd81db6f03fdbf Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Wed, 4 Oct 2023 18:51:02 +0000 Subject: [PATCH 1/2] add bios serial for windows Signed-off-by: Simon Smith --- agents/meshcore.js | 4 ++++ views/default-mobile.handlebars | 1 + views/default.handlebars | 1 + 3 files changed, 6 insertions(+) diff --git a/agents/meshcore.js b/agents/meshcore.js index 07370b88..92c79ae8 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -1825,6 +1825,10 @@ function getSystemInformation(func) { if (results.hardware.windows.osinfo) { delete results.hardware.windows.osinfo.Node; } if (results.hardware.windows.partitions) { for (var i in results.hardware.windows.partitions) { delete results.hardware.windows.partitions[i].Node; } } } catch (ex) { } + try { + var values = require('win-wmi').query('ROOT\\CIMV2', "SELECT * FROM Win32_Bios", ['SerialNumber']); + results.hardware.identifiers['bios_serial'] = values[0]['SerialNumber']; + } catch (ex) { } } results.hardware.agentvers = process.versions; replaceSpacesWithUnderscoresRec(results); diff --git a/views/default-mobile.handlebars b/views/default-mobile.handlebars index 5ce93198..e9f49dd5 100644 --- a/views/default-mobile.handlebars +++ b/views/default-mobile.handlebars @@ -5969,6 +5969,7 @@ // BIOS if (ident.bios_vendor) { x += addDetailItem("Vendor", EscapeHtml(ident.bios_vendor), s); } if (ident.bios_version) { x += addDetailItem("Version", EscapeHtml(ident.bios_version), s); } + if (ident.bios_serial) { x += addDetailItem("Serial", EscapeHtml(ident.bios_serial), s); } if (x != '') { sections.push({ name: "BIOS", html: x, img: 'chip' }); } // Motherboard diff --git a/views/default.handlebars b/views/default.handlebars index 6e4ac0b0..b7c2ac00 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -11654,6 +11654,7 @@ // BIOS if (ident.bios_vendor) { x += addDetailItem("Vendor", EscapeHtml(ident.bios_vendor), s); } if (ident.bios_version) { x += addDetailItem("Version", EscapeHtml(ident.bios_version), s); } + if (ident.bios_serial) { x += addDetailItem("Serial", EscapeHtml(ident.bios_serial), s); } if (x != '') { sections.push({ name: "BIOS", html: x, img: 'chip64.png' }); } // Motherboard From 75a92ce48509c516adb34f7de507b8e86d278b57 Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Wed, 4 Oct 2023 19:51:59 +0000 Subject: [PATCH 2/2] add linux bios serial Signed-off-by: Simon Smith --- agents/meshcore.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/agents/meshcore.js b/agents/meshcore.js index 92c79ae8..174a7c04 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -1830,6 +1830,11 @@ function getSystemInformation(func) { results.hardware.identifiers['bios_serial'] = values[0]['SerialNumber']; } catch (ex) { } } + if(results.hardware && results.hardware.linux) { + if (require('fs').statSync('/sys/class/dmi/id/product_serial').isFile()){ + results.hardware.identifiers['bios_serial'] = require('fs').readFileSync('/sys/class/dmi/id/product_serial').toString().trim(); + } + } results.hardware.agentvers = process.versions; replaceSpacesWithUnderscoresRec(results); var hasher = require('SHA384Stream').create();