systeminformation 5.21.6 → 5.21.8

package/lib/battery.js

@@ -127,6 +127,7 @@ module.exports = function (callback) {
               const energy = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_ENERGY_NOW', '='), 10);
               const power = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_POWER_NOW', '='), 10);
               const current = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CURRENT_NOW', '='), 10);
+              const charge = parseInt('0' + util.getValue(lines, 'POWER_SUPPLY_CHARGE_NOW', '='), 10);
 
               result.percent = parseInt('0' + percent, 10);
               if (result.maxCapacity && result.currentCapacity) {
@@ -140,6 +141,8 @@ module.exports = function (callback) {
               }
               if (energy && power) {
                 result.timeRemaining = Math.floor(energy / power * 60);
+              } else if (current && charge) {
+                result.timeRemaining = Math.floor(charge / current * 60);
               } else if (current && result.currentCapacity) {
                 result.timeRemaining = Math.floor(result.currentCapacity / current * 60);
               }

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.6",
+  "version": "5.21.8",
   "description": "Advanced, lightweight system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",