systeminformation 5.21.5 → 5.21.7

package/lib/system.js

@@ -318,10 +318,11 @@ function system(callback) {
 exports.system = system;
 
 function cleanDefaults(s) {
-  if (s === 'Default string') { s = ''; }
-  if (s.toLowerCase().indexOf('o.e.m.') !== -1) { s = ''; }
-  
-  return s
+  const cmpStr = s.toLowerCase();
+  if (cmpStr.indexOf('o.e.m.') === -1 && cmpStr.indexOf('default string') === -1 && cmpStr !== 'default') {
+    return s || '';
+  }
+  return '';
 }
 function bios(callback) {
 
@@ -561,7 +562,7 @@ function baseboard(callback) {
           const workload = [];
           const win10plus = parseInt(os.release()) >= 10;
           const maxCapacityAttribute = win10plus ? 'MaxCapacityEx' : 'MaxCapacity';
-          workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU,SMBIOSAssetTag | fl'));
+          workload.push(util.powerShell('Get-CimInstance Win32_baseboard | select Model,Manufacturer,Product,Version,SerialNumber,PartNumber,SKU | fl'));
           workload.push(util.powerShell(`Get-CimInstance Win32_physicalmemoryarray | select ${maxCapacityAttribute}, MemoryDevices | fl`));
           util.promiseAll(
             workload
@@ -579,9 +580,6 @@ function baseboard(callback) {
             if (!result.assetTag) {
               result.assetTag = cleanDefaults(util.getValue(lines, 'sku', ':'));
             }
-            if (!result.assetTag) {
-              result.assetTag = cleanDefaults(util.getValue(lines, 'SMBIOSAssetTag', ':'));
-            }
 
             // memphysical
             lines = data.results[1] ? data.results[1].toString().split('\r\n') : [''];

package/lib/util.js

@@ -709,6 +709,7 @@ function sanitizeShellString(str, strict) {
       (strict && s[i] === '@') ||
       (strict && s[i] === ' ') ||
       (strict && s[i] == '{') ||
+      (strict && s[i] == ';') ||
       (strict && s[i] == ')'))) {
       result = result + s[i];
     }

package/lib/wifi.js

@@ -401,7 +401,15 @@ function wifiNetworks(callback) {
               }
             });
             if (iface) {
-              const res = getWifiNetworkListIw(iface);
+              let ifaceSanitized = '';
+              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface, true);
+              for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+                if (s[i] !== undefined) {
+                  ifaceSanitized = ifaceSanitized + s[i];
+                }
+              }
+
+              const res = getWifiNetworkListIw(ifaceSanitized);
               if (res === -1) {
                 // try again after 4 secs
                 setTimeout(function (iface) {
@@ -529,11 +537,27 @@ function wifiConnections(callback) {
         const ifaces = ifaceListLinux();
         const networkList = getWifiNetworkListNmi();
         ifaces.forEach(ifaceDetail => {
-          const nmiDetails = nmiDeviceLinux(ifaceDetail.iface);
-          const wpaDetails = wpaConnectionLinux(ifaceDetail.iface);
+          let ifaceSanitized = '';
+          const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface, true);
+          for (let i = 0; i <= util.mathMin(s.length, 2000); i++) {
+            if (s[i] !== undefined) {
+              ifaceSanitized = ifaceSanitized + s[i];
+            }
+          }
+
+          const nmiDetails = nmiDeviceLinux(ifaceSanitized);
+          const wpaDetails = wpaConnectionLinux(ifaceSanitized);
           const ssid = nmiDetails.ssid || wpaDetails.ssid;
           const network = networkList.filter(nw => nw.ssid === ssid);
-          const nmiConnection = nmiConnectionLinux(ssid);
+          let ssidSanitized = '';
+          const t = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ssid, true);
+          for (let i = 0; i <= util.mathMin(t.length, 2000); i++) {
+            if (t[i] !== undefined) {
+              ssidSanitized = ssidSanitized + t[i];
+            }
+          }
+
+          const nmiConnection = nmiConnectionLinux(ssidSanitized);
           const channel = network && network.length && network[0].channel ? network[0].channel : (wpaDetails.channel ? wpaDetails.channel : null);
           const bssid = network && network.length && network[0].bssid ? network[0].bssid : (wpaDetails.bssid ? wpaDetails.bssid : null);
           if (ssid && bssid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.21.5",
+  "version": "5.21.7",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",