systeminformation 5.24.1 → 5.24.3

package/lib/docker.js

@@ -453,9 +453,13 @@ function dockerContainerStats(containerIDs, callback) {
           return resolve([]);
         }
         let containerIDsSanitized = '';
-        containerIDsSanitized.__proto__.toLowerCase = util.stringToLower;
-        containerIDsSanitized.__proto__.replace = util.stringReplace;
-        containerIDsSanitized.__proto__.trim = util.stringTrim;
+        try {
+          containerIDsSanitized.__proto__.toLowerCase = util.stringToLower;
+          containerIDsSanitized.__proto__.replace = util.stringReplace;
+          containerIDsSanitized.__proto__.trim = util.stringTrim;
+        } catch (e) {
+          Object.setPrototypeOf(containerIDsSanitized, util.stringObj);
+        }
 
         containerIDsSanitized = containerIDs;
         containerIDsSanitized = containerIDsSanitized.trim();

package/lib/internet.js

@@ -47,7 +47,12 @@ function inetChecksite(url, callback) {
       const l = util.mathMin(s.length, 2000);
       for (let i = 0; i <= l; i++) {
         if (s[i] !== undefined) {
-          s[i].__proto__.toLowerCase = util.stringToLower;
+          try {
+            s[i].__proto__.toLowerCase = util.stringToLower;
+          } catch (e) {
+            Object.setPrototypeOf(s[i], util.stringObj);
+          }
+
           const sl = s[i].toLowerCase();
           if (sl && sl[0] && !sl[1] && sl[0].length === 1) {
             urlSanitized = urlSanitized + sl[0];
@@ -57,7 +62,12 @@ function inetChecksite(url, callback) {
       result.url = urlSanitized;
       try {
         if (urlSanitized && !util.isPrototypePolluted()) {
-          urlSanitized.__proto__.startsWith = util.stringStartWith;
+          try {
+            urlSanitized.__proto__.startsWith = util.stringStartWith;
+          } catch (e) {
+            Object.setPrototypeOf(urlSanitized, util.stringObj);
+          }
+
           if (urlSanitized.startsWith('file:') || urlSanitized.startsWith('gopher:') || urlSanitized.startsWith('telnet:') || urlSanitized.startsWith('mailto:') || urlSanitized.startsWith('news:') || urlSanitized.startsWith('nntp:')) {
             if (callback) { callback(result); }
             return resolve(result);
@@ -108,14 +118,24 @@ function inetLatency(host, callback) {
       const l = util.mathMin(s.length, 2000);
       for (let i = 0; i <= l; i++) {
         if (!(s[i] === undefined)) {
-          s[i].__proto__.toLowerCase = util.stringToLower;
+          try {
+            s[i].__proto__.toLowerCase = util.stringToLower;
+          } catch (e) {
+            Object.setPrototypeOf(s[i], util.stringObj);
+          }
+
           const sl = s[i].toLowerCase();
           if (sl && sl[0] && !sl[1]) {
             hostSanitized = hostSanitized + sl[0];
           }
         }
       }
-      hostSanitized.__proto__.startsWith = util.stringStartWith;
+      try {
+        hostSanitized.__proto__.startsWith = util.stringStartWith;
+      } catch (e) {
+        Object.setPrototypeOf(hostSanitized, util.stringObj);
+      }
+
       if (hostSanitized.startsWith('file:') || hostSanitized.startsWith('gopher:') || hostSanitized.startsWith('telnet:') || hostSanitized.startsWith('mailto:') || hostSanitized.startsWith('news:') || hostSanitized.startsWith('nntp:')) {
         if (callback) { callback(null); }
         return resolve(null);

package/lib/network.js

@@ -1174,9 +1174,13 @@ function networkStats(ifaces, callback) {
         }
         ifaces = ifaces || getDefaultNetworkInterface();
 
-        ifaces.__proto__.toLowerCase = util.stringToLower;
-        ifaces.__proto__.replace = util.stringReplace;
-        ifaces.__proto__.trim = util.stringTrim;
+        try {
+          ifaces.__proto__.toLowerCase = util.stringToLower;
+          ifaces.__proto__.replace = util.stringReplace;
+          ifaces.__proto__.trim = util.stringTrim;
+        } catch (e) {
+          Object.setPrototypeOf(ifaces, util.stringObj);
+        }
 
         ifaces = ifaces.trim().toLowerCase().replace(/,+/g, '|');
         ifacesArray = ifaces.split('|');

package/lib/osinfo.js

@@ -328,23 +328,23 @@ function osInfo(callback) {
           result.build = util.getValue(lines, 'BuildVersion');
           result.logofile = getLogoFile(result.distro);
           result.codename = 'macOS';
-          result.codename = (result.release.indexOf('10.4') > -1 ? 'Mac OS X Tiger' : result.codename);
-          result.codename = (result.release.indexOf('10.5') > -1 ? 'Mac OS X Leopard' : result.codename);
-          result.codename = (result.release.indexOf('10.6') > -1 ? 'Mac OS X Snow Leopard' : result.codename);
-          result.codename = (result.release.indexOf('10.7') > -1 ? 'Mac OS X Lion' : result.codename);
+          result.codename = (result.release.indexOf('10.4') > -1 ? 'OS X Tiger' : result.codename);
+          result.codename = (result.release.indexOf('10.5') > -1 ? 'OS X Leopard' : result.codename);
+          result.codename = (result.release.indexOf('10.6') > -1 ? 'OS X Snow Leopard' : result.codename);
+          result.codename = (result.release.indexOf('10.7') > -1 ? 'OS X Lion' : result.codename);
           result.codename = (result.release.indexOf('10.8') > -1 ? 'OS X Mountain Lion' : result.codename);
           result.codename = (result.release.indexOf('10.9') > -1 ? 'OS X Mavericks' : result.codename);
           result.codename = (result.release.indexOf('10.10') > -1 ? 'OS X Yosemite' : result.codename);
           result.codename = (result.release.indexOf('10.11') > -1 ? 'OS X El Capitan' : result.codename);
-          result.codename = (result.release.indexOf('10.12') > -1 ? 'macOS Sierra' : result.codename);
-          result.codename = (result.release.indexOf('10.13') > -1 ? 'macOS High Sierra' : result.codename);
-          result.codename = (result.release.indexOf('10.14') > -1 ? 'macOS Mojave' : result.codename);
-          result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
-          result.codename = (result.release.startsWith('11.') ? 'macOS Big Sur' : result.codename);
-          result.codename = (result.release.startsWith('12.') ? 'macOS Monterey' : result.codename);
-          result.codename = (result.release.startsWith('13.') ? 'macOS Ventura' : result.codename);
-          result.codename = (result.release.startsWith('14.') ? 'macOS Sonoma' : result.codename);
-          result.codename = (result.release.startsWith('15.') ? 'macOS Sequoia' : result.codename);
+          result.codename = (result.release.indexOf('10.12') > -1 ? 'Sierra' : result.codename);
+          result.codename = (result.release.indexOf('10.13') > -1 ? 'High Sierra' : result.codename);
+          result.codename = (result.release.indexOf('10.14') > -1 ? 'Mojave' : result.codename);
+          result.codename = (result.release.indexOf('10.15') > -1 ? 'Catalina' : result.codename);
+          result.codename = (result.release.startsWith('11.') ? 'Big Sur' : result.codename);
+          result.codename = (result.release.startsWith('12.') ? 'Monterey' : result.codename);
+          result.codename = (result.release.startsWith('13.') ? 'Ventura' : result.codename);
+          result.codename = (result.release.startsWith('14.') ? 'Sonoma' : result.codename);
+          result.codename = (result.release.startsWith('15.') ? 'Sequoia' : result.codename);
           result.uefi = true;
           result.codepage = util.getCodepage();
           if (callback) {
@@ -467,7 +467,7 @@ function versions(apps, callback) {
     mongodb: '',
     mysql: '',
     nginx: '',
-    node: process.versions.node,
+    node: '', //process.versions.node,
     npm: '',
     openssl: '',
     perl: '',
@@ -799,6 +799,13 @@ function versions(apps, callback) {
                 if (!error) {
                   const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
                   appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
+                } else {
+                  exec('pg_config --version', function (error, stdout) {
+                    if (!error) {
+                      const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
+                      appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
+                    }
+                  });
                 }
                 functionProcessed();
               });
@@ -1050,6 +1057,16 @@ function versions(apps, callback) {
             functionProcessed();
           });
         }
+        if ({}.hasOwnProperty.call(appsObj.versions, 'node')) {
+          exec('node -v', function (error, stdout) {
+            if (!error) {
+              let line = stdout.toString().split('\n')[0].trim();
+              if (line.startsWith('v')) { line = line.slice(1); }
+              appsObj.versions.node = line;
+            }
+            functionProcessed();
+          });
+        }
         if ({}.hasOwnProperty.call(appsObj.versions, 'powershell')) {
           if (_windows) {
             util.powerShell('$PSVersionTable').then(stdout => {

package/lib/processes.js

@@ -126,9 +126,13 @@ function services(srv, callback) {
 
       if (srv) {
         let srvString = '';
-        srvString.__proto__.toLowerCase = util.stringToLower;
-        srvString.__proto__.replace = util.stringReplace;
-        srvString.__proto__.trim = util.stringTrim;
+        try {
+          srvString.__proto__.toLowerCase = util.stringToLower;
+          srvString.__proto__.replace = util.stringReplace;
+          srvString.__proto__.trim = util.stringTrim;
+        } catch (e) {
+          Object.setPrototypeOf(srvString, util.stringObj);
+        }
 
         const s = util.sanitizeShellString(srv);
         const l = util.mathMin(s.length, 2000);
@@ -982,9 +986,13 @@ function processLoad(proc, callback) {
       }
 
       let processesString = '';
-      processesString.__proto__.toLowerCase = util.stringToLower;
-      processesString.__proto__.replace = util.stringReplace;
-      processesString.__proto__.trim = util.stringTrim;
+      try {
+        processesString.__proto__.toLowerCase = util.stringToLower;
+        processesString.__proto__.replace = util.stringReplace;
+        processesString.__proto__.trim = util.stringTrim;
+      } catch (e) {
+        Object.setPrototypeOf(processesString, util.stringObj);
+      }
 
       const s = util.sanitizeShellString(proc);
       const l = util.mathMin(s.length, 2000);

package/lib/util.js

@@ -84,6 +84,7 @@ function splitByNumber(str) {
   return [cpart, num];
 }
 
+const stringObj = new String();
 const stringReplace = new String().replace;
 const stringToLower = new String().toLowerCase;
 const stringToString = new String().toString;
@@ -758,11 +759,14 @@ function isPrototypePolluted() {
   let notPolluted = true;
   let st = '';
 
-  st.__proto__.replace = stringReplace;
-  st.__proto__.toLowerCase = stringToLower;
-  st.__proto__.toString = stringToString;
-  st.__proto__.substr = stringSubstr;
-
+  try {
+    st.__proto__.replace = stringReplace;
+    st.__proto__.toLowerCase = stringToLower;
+    st.__proto__.toString = stringToString;
+    st.__proto__.substr = stringSubstr;
+  } catch (e) {
+    Object.setPrototypeOf(st, stringObj);
+  }
   notPolluted = notPolluted || (s.length !== 62);
   const ms = Date.now();
   if (typeof ms === 'number' && ms > 1600000000000) {
@@ -782,7 +786,11 @@ function isPrototypePolluted() {
     // string manipulation
     let p = Math.random() * l * 0.9999999999;
     let stm = st.substr(0, p) + ' ' + st.substr(p, 2000);
-    stm.__proto__.replace = stringReplace;
+    try {
+      stm.__proto__.replace = stringReplace;
+    } catch (e) {
+      Object.setPrototypeOf(stm, stringObj);
+    }
     let sto = stm.replace(/ /g, '');
     notPolluted = notPolluted && st === sto;
     p = Math.random() * l * 0.9999999999;
@@ -803,7 +811,11 @@ function isPrototypePolluted() {
     notPolluted = notPolluted && (stl.length === l) && stl[l - 1] && !(stl[l]);
     for (let i = 0; i < l; i++) {
       const s1 = st[i];
-      s1.__proto__.toLowerCase = stringToLower;
+      try {
+        s1.__proto__.toLowerCase = stringToLower;
+      } catch (e) {
+        Object.setPrototypeOf(st, stringObj);
+      }
       const s2 = stl ? stl[i] : '';
       const s1l = s1.toLowerCase();
       notPolluted = notPolluted && s1l[0] === s2 && s1l[0] && !(s1l[1]);
@@ -2561,6 +2573,7 @@ exports.smartMonToolsInstalled = smartMonToolsInstalled;
 exports.linuxVersion = linuxVersion;
 exports.plistParser = plistParser;
 exports.plistReader = plistReader;
+exports.stringObj = stringObj;
 exports.stringReplace = stringReplace;
 exports.stringToLower = stringToLower;
 exports.stringToString = stringToString;

package/package.json

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