systeminformation 5.31.5 → 5.31.6

package/lib/network.js

@@ -16,6 +16,8 @@
 const os = require('os');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
+const execFileSync = require('child_process').execFileSync;
+
 const fs = require('fs');
 const util = require('./util');
 
@@ -416,15 +418,7 @@ function getWindowsIEEE8021x(connectionType, iface, ifaces) {
     try {
       const SSID = getWindowsWirelessIfaceSSID(iface);
       if (SSID !== 'Unknown') {
-        let ifaceSanitized = '';
-        const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(SSID);
-        const l = util.mathMin(s.length, 32);
-
-        for (let i = 0; i <= l; i++) {
-          if (s[i] !== undefined) {
-            ifaceSanitized = ifaceSanitized + s[i];
-          }
-        }
+        const ifaceSanitized = util.sanitizeString(SSID);
         const profiles = execSync(`netsh wlan show profiles "${ifaceSanitized}"`, util.execOptsWin).split('\r\n');
         i8021xState = (profiles.find((l) => l.indexOf('802.1X') >= 0) || '').trim();
         i8021xProtocol = (profiles.find((l) => l.indexOf('EAP') >= 0) || '').trim();
@@ -536,14 +530,16 @@ function getDarwinNics() {
 }
 
 function getLinuxIfaceConnectionName(interfaceName) {
-  const cmd = `nmcli device status 2>/dev/null | grep ${interfaceName}`;
-
   try {
-    const result = execSync(cmd, util.execOptsLinux).toString();
+    const output = execFileSync('nmcli', ['device', 'status'], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+    const result = util.grep(output, interfaceName);
+
     const resultFormat = result.replace(/\s+/g, ' ').trim();
     const connectionNameLines = resultFormat.split(' ').slice(3);
     const connectionName = connectionNameLines.join(' ');
-    return connectionName !== '--' ? connectionName : '';
+    const connectionNameSanitized = util.sanitizeString(connectionName, false);
+
+    return connectionNameSanitized !== '--' ? connectionNameSanitized : '';
   } catch {
     return '';
   }
@@ -617,9 +613,9 @@ function parseLinuxDHCPNics(sections) {
 function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
   let result = false;
   if (connectionName) {
-    const cmd = `nmcli connection show "${connectionName}" 2>/dev/null | grep ipv4.method;`;
     try {
-      const lines = execSync(cmd, util.execOptsLinux).toString();
+      const output = execFileSync('nmcli', ['connection', 'show', connectionName], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      const lines = util.grep(output, 'ipv4.method');
       const resultFormat = lines.replace(/\s+/g, ' ').trim();
 
       const dhcStatus = resultFormat.split(' ').slice(1).toString();
@@ -643,9 +639,10 @@ function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
 
 function getDarwinIfaceDHCPstatus(iface) {
   let result = false;
-  const cmd = `ipconfig getpacket "${iface}" 2>/dev/null | grep lease_time;`;
+
   try {
-    const lines = execSync(cmd).toString().split('\n');
+    const output = execFileSync('ipconfig', ['getpacket', iface], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+    const lines = util.grep(output, 'lease_time');
     if (lines.length && lines[0].startsWith('lease_time')) {
       result = true;
     }
@@ -657,9 +654,9 @@ function getDarwinIfaceDHCPstatus(iface) {
 
 function getLinuxIfaceDNSsuffix(connectionName) {
   if (connectionName) {
-    const cmd = `nmcli connection show "${connectionName}" 2>/dev/null | grep ipv4.dns-search;`;
     try {
-      const result = execSync(cmd, util.execOptsLinux).toString();
+      const output = execFileSync('nmcli', ['connection', 'show', connectionName], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      const result = util.grep(output, 'ipv4.dns-search');
       const resultFormat = result.replace(/\s+/g, ' ').trim();
       const dnsSuffix = resultFormat.split(' ').slice(1).toString();
       return dnsSuffix === '--' ? 'Not defined' : dnsSuffix;
@@ -673,9 +670,9 @@ function getLinuxIfaceDNSsuffix(connectionName) {
 
 function getLinuxIfaceIEEE8021xAuth(connectionName) {
   if (connectionName) {
-    const cmd = `nmcli connection show "${connectionName}" 2>/dev/null | grep 802-1x.eap;`;
     try {
-      const result = execSync(cmd, util.execOptsLinux).toString();
+      const output = execFileSync('nmcli', ['connection', 'show', connectionName], { ...util.execOptsLinux, stdio: ['ignore', 'pipe', 'ignore'] }).toString();
+      const result = util.grep(output, '802-1x.eap');
       const resultFormat = result.replace(/\s+/g, ' ').trim();
       const authenticationProtocol = resultFormat.split(' ').slice(1).toString();
 
@@ -825,14 +822,7 @@ function networkInterfaces(callback, rescan, defaultString) {
               nic.ip6subnet = ip6linksubnet;
             }
 
-            let ifaceSanitized = '';
-            const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(nic.iface);
-            const l = util.mathMin(s.length, 2000);
-            for (let i = 0; i <= l; i++) {
-              if (s[i] !== undefined) {
-                ifaceSanitized = ifaceSanitized + s[i];
-              }
-            }
+            const ifaceSanitized = util.sanitizeString(nic.iface);
 
             result.push({
               iface: nic.iface,
@@ -948,14 +938,7 @@ function networkInterfaces(callback, rescan, defaultString) {
                 ip6subnet = ip6linksubnet;
               }
               const iface = dev.split(':')[0].trim();
-              let ifaceSanitized = '';
-              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
-              const l = util.mathMin(s.length, 2000);
-              for (let i = 0; i <= l; i++) {
-                if (s[i] !== undefined) {
-                  ifaceSanitized = ifaceSanitized + s[i];
-                }
-              }
+              const ifaceSanitized = util.sanitizeString(iface);
               const cmd = `echo -n "addr_assign_type: "; cat /sys/class/net/${ifaceSanitized}/addr_assign_type 2>/dev/null; echo;
             echo -n "address: "; cat /sys/class/net/${ifaceSanitized}/address 2>/dev/null; echo;
             echo -n "addr_len: "; cat /sys/class/net/${ifaceSanitized}/addr_len 2>/dev/null; echo;
@@ -1087,14 +1070,7 @@ function networkInterfaces(callback, rescan, defaultString) {
             nics8021xInfo = getWindowsWiredProfilesInformation();
             dnsSuffixes = getWindowsDNSsuffixes();
             for (let dev in ifaces) {
-              let ifaceSanitized = '';
-              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(dev);
-              const l = util.mathMin(s.length, 2000);
-              for (let i = 0; i <= l; i++) {
-                if (s[i] !== undefined) {
-                  ifaceSanitized = ifaceSanitized + s[i];
-                }
-              }
+              const ifaceSanitized = util.sanitizeString(dev);
 
               let iface = dev;
               let ip4 = '';
@@ -1360,14 +1336,7 @@ function networkStatsSingle(iface) {
 
   return new Promise((resolve) => {
     process.nextTick(() => {
-      let ifaceSanitized = '';
-      const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface);
-      const l = util.mathMin(s.length, 2000);
-      for (let i = 0; i <= l; i++) {
-        if (s[i] !== undefined) {
-          ifaceSanitized = ifaceSanitized + s[i];
-        }
-      }
+      const ifaceSanitized = util.sanitizeString(iface);
 
       let result = {
         iface: ifaceSanitized,

package/lib/osinfo.js

@@ -18,6 +18,7 @@ const fs = require('fs');
 const util = require('./util');
 const exec = require('child_process').exec;
 const execSync = require('child_process').execSync;
+const execFile = require('child_process').execFile;
 
 const _platform = process.platform;
 
@@ -820,11 +821,17 @@ function versions(apps, callback) {
                 if (!error) {
                   const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
                   appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
+                  if (appsObj.versions.postgresql.includes('(') && postgresql.length >= 2 && !postgresql[postgresql.length - 2].includes('(')) {
+                    appsObj.versions.postgresql = postgresql[postgresql.length - 2];
+                  }
                 } else {
                   exec('pg_config --version', (error, stdout) => {
                     if (!error) {
                       const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
                       appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
+                      if (appsObj.versions.postgresql.includes('(') && postgresql.length >= 2 && !postgresql[postgresql.length - 2].includes('(')) {
+                        appsObj.versions.postgresql = postgresql[postgresql.length - 2];
+                      }
                     }
                   });
                 }

package/lib/util.js

@@ -830,6 +830,22 @@ function isPrototypePolluted() {
   return !notPolluted;
 }
 
+function sanitizeString(str, strict) {
+  if (typeof strict === 'undefined') {
+    strict = false;
+  }
+  let result = '';
+  const s = isPrototypePolluted() ? '---' : sanitizeShellString(str, strict);
+  const l = mathMin(s.length, 2000);
+
+  for (let i = 0; i <= l; i++) {
+    if (s[i] !== undefined) {
+      result = result + s[i];
+    }
+  }
+  return result;
+}
+
 function hex2bin(hex) {
   return ('00000000' + parseInt(hex, 16).toString(2)).substr(-8);
 }
@@ -2702,6 +2718,15 @@ function checkWebsite(url, timeout = 5000) {
 function cleanString(str) {
   return str.replace(/To Be Filled By O.E.M./g, '');
 }
+
+function grep(str, pattern) {
+  const result = str
+    .split('\n')
+    .filter((line) => line.includes(pattern))
+    .join('\n');
+  return result;
+}
+
 function noop() {}
 
 exports.toInt = toInt;
@@ -2733,6 +2758,7 @@ exports.isRaspberry = isRaspberry;
 exports.isRaspbian = isRaspbian;
 exports.sanitizeShellString = sanitizeShellString;
 exports.isPrototypePolluted = isPrototypePolluted;
+exports.sanitizeString = sanitizeString;
 exports.decodePiCpuinfo = decodePiCpuinfo;
 exports.getRpiGpu = getRpiGpu;
 exports.promiseAll = promiseAll;
@@ -2757,4 +2783,5 @@ exports.semverCompare = semverCompare;
 exports.getAppleModel = getAppleModel;
 exports.checkWebsite = checkWebsite;
 exports.cleanString = cleanString;
+exports.grep = grep;
 exports.getPowershell = getPowershell;

package/lib/wifi.js

@@ -424,15 +424,7 @@ function wifiNetworks(callback) {
               }
             });
             if (iface) {
-              let ifaceSanitized = '';
-              const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(iface, true);
-              const l = util.mathMin(s.length, 2000);
-
-              for (let i = 0; i <= l; i++) {
-                if (s[i] !== undefined) {
-                  ifaceSanitized = ifaceSanitized + s[i];
-                }
-              }
+              const ifaceSanitized = util.sanitizeString(iface, true);
 
               const res = getWifiNetworkListIw(ifaceSanitized);
               if (res === -1) {
@@ -585,28 +577,13 @@ function wifiConnections(callback) {
         const ifaces = ifaceListLinux();
         const networkList = getWifiNetworkListNmi();
         ifaces.forEach((ifaceDetail) => {
-          let ifaceSanitized = '';
-          const s = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ifaceDetail.iface, true);
-          const ll = util.mathMin(s.length, 2000);
-
-          for (let i = 0; i <= ll; i++) {
-            if (s[i] !== undefined) {
-              ifaceSanitized = ifaceSanitized + s[i];
-            }
-          }
+          const ifaceSanitized = util.sanitizeString(ifaceDetail.iface, true);
 
           const nmiDetails = nmiDeviceLinux(ifaceSanitized);
           const wpaDetails = wpaConnectionLinux(ifaceSanitized);
           const ssid = nmiDetails.ssid || wpaDetails.ssid;
           const network = networkList.filter((nw) => nw.ssid === ssid);
-          let ssidSanitized = '';
-          const t = util.isPrototypePolluted() ? '---' : util.sanitizeShellString(ssid, true);
-          const l = util.mathMin(t.length, 32);
-          for (let i = 0; i <= l; i++) {
-            if (t[i] !== undefined) {
-              ssidSanitized = ssidSanitized + t[i];
-            }
-          }
+          const ssidSanitized = util.sanitizeString(ssid, true);
 
           const nmiConnection = nmiConnectionLinux(ssidSanitized);
           const channel = network && network.length && network[0].channel ? network[0].channel : wpaDetails.channel ? wpaDetails.channel : null;
@@ -760,7 +737,9 @@ function wifiInterfaces(callback) {
       if (_linux) {
         const ifaces = ifaceListLinux();
         ifaces.forEach((ifaceDetail) => {
-          const nmiDetails = nmiDeviceLinux(ifaceDetail.iface);
+          const ifaceSanitized = util.sanitizeString(ifaceDetail.iface, true);
+
+          const nmiDetails = nmiDeviceLinux(ifaceSanitized);
           result.push({
             id: ifaceDetail.id,
             iface: ifaceDetail.iface,

package/package.json

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