systeminformation 5.31.16 → 5.32.0

package/lib/dockerSocket.js

@@ -15,307 +15,102 @@
 
 const net = require('net');
 const isWin = require('os').type() === 'Windows_NT';
-const socketPath = isWin ? '//./pipe/docker_engine' : '/var/run/docker.sock';
+const socketPath = process.env.DOCKER_SOCKET || (isWin ? '//./pipe/docker_engine' : '/var/run/docker.sock');
+const socketTimeout = +process.env.DOCKER_SOCKET_TIMEOUT || 30000;
+
+function fetchJson(path, callback) {
+  let done = false;
+  const finish = (result) => {
+    if (!done) {
+      done = true;
+      callback(result);
+    }
+  };
+  try {
+    const socket = net.createConnection({ path: socketPath });
+    let alldata = '';
+
+    socket.setTimeout(socketTimeout, () => {
+      socket.destroy();
+      finish({});
+    });
+
+    socket.on('connect', () => {
+      socket.write(`GET ${path} HTTP/1.0\r\n\r\n`);
+    });
+
+    socket.on('data', (data) => {
+      alldata = alldata + data.toString();
+    });
+
+    socket.on('error', () => {
+      finish({});
+    });
+
+    socket.on('end', () => {
+      const startbody = alldata.indexOf('\r\n\r\n');
+      const status = parseInt(alldata.split(' ')[1], 10);
+      if (startbody < 0 || isNaN(status) || status < 200 || status >= 300) {
+        return finish({});
+      }
+      try {
+        finish(JSON.parse(alldata.substring(startbody + 4)));
+      } catch {
+        finish({});
+      }
+    });
+  } catch {
+    finish({});
+  }
+}
 
 class DockerSocket {
   getInfo(callback) {
-    try {
-      let socket = net.createConnection({ path: socketPath });
-      let alldata = '';
-      let data;
-
-      socket.on('connect', () => {
-        socket.write('GET http:/info HTTP/1.0\r\n\r\n');
-      });
-
-      socket.on('data', (data) => {
-        alldata = alldata + data.toString();
-      });
-
-      socket.on('error', () => {
-        socket = false;
-        callback({});
-      });
-
-      socket.on('end', () => {
-        const startbody = alldata.indexOf('\r\n\r\n');
-        alldata = alldata.substring(startbody + 4);
-        socket = false;
-        try {
-          data = JSON.parse(alldata);
-          callback(data);
-        } catch {
-          callback({});
-        }
-      });
-    } catch {
-      callback({});
-    }
+    fetchJson('http:/info', callback);
   }
 
   listImages(all, callback) {
-    try {
-      let socket = net.createConnection({ path: socketPath });
-      let alldata = '';
-      let data;
-
-      socket.on('connect', () => {
-        socket.write('GET http:/images/json' + (all ? '?all=1' : '') + ' HTTP/1.0\r\n\r\n');
-      });
-
-      socket.on('data', (data) => {
-        alldata = alldata + data.toString();
-      });
-
-      socket.on('error', () => {
-        socket = false;
-        callback({});
-      });
-
-      socket.on('end', () => {
-        const startbody = alldata.indexOf('\r\n\r\n');
-        alldata = alldata.substring(startbody + 4);
-        socket = false;
-        try {
-          data = JSON.parse(alldata);
-          callback(data);
-        } catch {
-          callback({});
-        }
-      });
-    } catch {
-      callback({});
-    }
+    fetchJson(`http:/images/json${all ? '?all=1' : ''}`, callback);
   }
 
   inspectImage(id, callback) {
-    id = id || '';
     if (id) {
-      try {
-        let socket = net.createConnection({ path: socketPath });
-        let alldata = '';
-        let data;
-
-        socket.on('connect', () => {
-          socket.write('GET http:/images/' + id + '/json?stream=0 HTTP/1.0\r\n\r\n');
-        });
-
-        socket.on('data', (data) => {
-          alldata = alldata + data.toString();
-        });
-
-        socket.on('error', () => {
-          socket = false;
-          callback({});
-        });
-
-        socket.on('end', () => {
-          const startbody = alldata.indexOf('\r\n\r\n');
-          alldata = alldata.substring(startbody + 4);
-          socket = false;
-          try {
-            data = JSON.parse(alldata);
-            callback(data);
-          } catch {
-            callback({});
-          }
-        });
-      } catch {
-        callback({});
-      }
+      fetchJson(`http:/images/${id}/json?stream=0`, callback);
     } else {
       callback({});
     }
   }
 
   listContainers(all, callback) {
-    try {
-      let socket = net.createConnection({ path: socketPath });
-      let alldata = '';
-      let data;
-
-      socket.on('connect', () => {
-        socket.write('GET http:/containers/json' + (all ? '?all=1' : '') + ' HTTP/1.0\r\n\r\n');
-      });
-
-      socket.on('data', (data) => {
-        alldata = alldata + data.toString();
-      });
-
-      socket.on('error', () => {
-        socket = false;
-        callback({});
-      });
-
-      socket.on('end', () => {
-        const startbody = alldata.indexOf('\r\n\r\n');
-        alldata = alldata.substring(startbody + 4);
-        socket = false;
-        try {
-          data = JSON.parse(alldata);
-          callback(data);
-        } catch {
-          callback({});
-        }
-      });
-    } catch {
-      callback({});
-    }
+    fetchJson(`http:/containers/json${all ? '?all=1' : ''}`, callback);
   }
 
   getStats(id, callback) {
-    id = id || '';
     if (id) {
-      try {
-        let socket = net.createConnection({ path: socketPath });
-        let alldata = '';
-        let data;
-
-        socket.on('connect', () => {
-          socket.write('GET http:/containers/' + id + '/stats?stream=0 HTTP/1.0\r\n\r\n');
-        });
-
-        socket.on('data', (data) => {
-          alldata = alldata + data.toString();
-        });
-
-        socket.on('error', () => {
-          socket = false;
-          callback({});
-        });
-
-        socket.on('end', () => {
-          const startbody = alldata.indexOf('\r\n\r\n');
-          alldata = alldata.substring(startbody + 4);
-          socket = false;
-          try {
-            data = JSON.parse(alldata);
-            callback(data);
-          } catch {
-            callback({});
-          }
-        });
-      } catch {
-        callback({});
-      }
+      fetchJson(`http:/containers/${id}/stats?stream=0`, callback);
     } else {
       callback({});
     }
   }
 
   getInspect(id, callback) {
-    id = id || '';
     if (id) {
-      try {
-        let socket = net.createConnection({ path: socketPath });
-        let alldata = '';
-        let data;
-
-        socket.on('connect', () => {
-          socket.write('GET http:/containers/' + id + '/json?stream=0 HTTP/1.0\r\n\r\n');
-        });
-
-        socket.on('data', (data) => {
-          alldata = alldata + data.toString();
-        });
-
-        socket.on('error', () => {
-          socket = false;
-          callback({});
-        });
-
-        socket.on('end', () => {
-          const startbody = alldata.indexOf('\r\n\r\n');
-          alldata = alldata.substring(startbody + 4);
-          socket = false;
-          try {
-            data = JSON.parse(alldata);
-            callback(data);
-          } catch {
-            callback({});
-          }
-        });
-      } catch {
-        callback({});
-      }
+      fetchJson(`http:/containers/${id}/json?stream=0`, callback);
     } else {
       callback({});
     }
   }
 
   getProcesses(id, callback) {
-    id = id || '';
     if (id) {
-      try {
-        let socket = net.createConnection({ path: socketPath });
-        let alldata = '';
-        let data;
-
-        socket.on('connect', () => {
-          socket.write('GET http:/containers/' + id + '/top?ps_args=-opid,ppid,pgid,vsz,time,etime,nice,ruser,user,rgroup,group,stat,rss,args HTTP/1.0\r\n\r\n');
-        });
-
-        socket.on('data', (data) => {
-          alldata = alldata + data.toString();
-        });
-
-        socket.on('error', () => {
-          socket = false;
-          callback({});
-        });
-
-        socket.on('end', () => {
-          const startbody = alldata.indexOf('\r\n\r\n');
-          alldata = alldata.substring(startbody + 4);
-          socket = false;
-          try {
-            data = JSON.parse(alldata);
-            callback(data);
-          } catch {
-            callback({});
-          }
-        });
-      } catch {
-        callback({});
-      }
+      fetchJson(`http:/containers/${id}/top?ps_args=-opid,ppid,pgid,vsz,time,etime,nice,ruser,user,rgroup,group,stat,rss,args`, callback);
     } else {
       callback({});
     }
   }
 
   listVolumes(callback) {
-    try {
-      let socket = net.createConnection({ path: socketPath });
-      let alldata = '';
-      let data;
-
-      socket.on('connect', () => {
-        socket.write('GET http:/volumes HTTP/1.0\r\n\r\n');
-      });
-
-      socket.on('data', (data) => {
-        alldata = alldata + data.toString();
-      });
-
-      socket.on('error', () => {
-        socket = false;
-        callback({});
-      });
-
-      socket.on('end', () => {
-        const startbody = alldata.indexOf('\r\n\r\n');
-        alldata = alldata.substring(startbody + 4);
-        socket = false;
-        try {
-          data = JSON.parse(alldata);
-          callback(data);
-        } catch {
-          callback({});
-        }
-      });
-    } catch {
-      callback({});
-    }
+    fetchJson('http:/volumes', callback);
   }
 }
 

package/lib/filesystem.js

@@ -72,7 +72,7 @@ function fsSize(drive, callback) {
   function filterLines(stdout) {
     const lines = stdout.toString().split('\n');
     lines.shift();
-    if (stdout.toString().toLowerCase().indexOf('filesystem')) {
+    if (stdout.toString().toLowerCase().indexOf('filesystem') >= 0) {
       let removeLines = 0;
       for (let i = 0; i < lines.length; i++) {
         if (lines[i] && lines[i].toLowerCase().startsWith('filesystem')) {
@@ -88,19 +88,23 @@ function fsSize(drive, callback) {
 
   function parseDf(lines) {
     const data = [];
+    // filesystem (first column) and mount point (last column) may contain spaces:
+    // anchor parsing on the numeric columns in between (blocks, used, available, capacity)
+    const dfWithType = /^(.+?)\s+(\S+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:\d+%|-)\s+(.+)$/;
+    const dfNoType = /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(?:\d+%|-)\s+(.+)$/;
+    const hasType = _linux || _freebsd || _openbsd || _netbsd;
     lines.forEach((line) => {
       if (line !== '') {
-        line = line.replace(/ +/g, ' ').split(' ');
-        if (line && (line[0].startsWith('/') || (line[6] && line[6] === '/') || line[0].indexOf('/') > 0 || line[0].indexOf(':') === 1 || (!_darwin && !isLinuxTmpFs(line[1])))) {
-          const fs = line[0];
-          const fsType = _linux || _freebsd || _openbsd || _netbsd ? line[1] : getmacOsFsType(line[0]);
-          const size = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[2] : line[1], 10) * 1024;
-          const used = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[3] : line[2], 10) * 1024;
-          const available = parseInt(_linux || _freebsd || _openbsd || _netbsd ? line[4] : line[3], 10) * 1024;
+        const parts = line.trim().match(hasType ? dfWithType : dfNoType);
+        if (parts && (parts[1].startsWith('/') || parts[hasType ? 6 : 5] === '/' || parts[1].indexOf('/') > 0 || parts[1].indexOf(':') === 1 || (!_darwin && !isLinuxTmpFs(parts[2])))) {
+          const fs = parts[1];
+          const fsType = hasType ? parts[2] : getmacOsFsType(parts[1]);
+          const size = parseInt(parts[hasType ? 3 : 2], 10) * 1024;
+          const used = parseInt(parts[hasType ? 4 : 3], 10) * 1024;
+          const available = parseInt(parts[hasType ? 5 : 4], 10) * 1024;
           const use = parseFloat((100.0 * (used / (used + available))).toFixed(2));
           const rw = osMounts && Object.keys(osMounts).length > 0 ? osMounts[fs] || false : null;
-          line.splice(0, _linux || _freebsd || _openbsd || _netbsd ? 6 : 5);
-          const mount = line.join(' ');
+          const mount = parts[hasType ? 6 : 5];
           if (!data.find((el) => el.fs === fs && el.type === fsType && el.mount === mount)) {
             data.push({
               fs,
@@ -158,9 +162,11 @@ function fsSize(drive, callback) {
                 return line.startsWith('/');
               })
               .forEach((line) => {
-                osMounts[line.split(' ')[0]] = osMounts[line.split(' ')[0]] || false;
+                // /proc/mounts escapes spaces as \040
+                const fs = line.split(' ')[0].replace(/\\040/g, ' ');
+                osMounts[fs] = osMounts[fs] || false;
                 if (line.toLowerCase().indexOf('/snap/') === -1) {
-                  osMounts[line.split(' ')[0]] = line.toLowerCase().indexOf('rw,') >= 0 || line.toLowerCase().indexOf(' rw ') >= 0;
+                  osMounts[fs] = line.toLowerCase().indexOf('rw,') >= 0 || line.toLowerCase().indexOf(' rw ') >= 0;
                 }
               });
           } catch {
@@ -341,7 +347,9 @@ exports.fsOpenFiles = fsOpenFiles;
 // disks
 
 function parseBytes(s) {
-  return parseInt(s.substr(s.indexOf(' (') + 2, s.indexOf(' Bytes)') - 10), 10);
+  const start = s.indexOf(' (') + 2;
+  const end = s.indexOf(' Bytes)');
+  return parseInt(s.substr(start, end - start), 10);
 }
 
 function parseDevices(lines) {
@@ -836,8 +844,9 @@ function fsStats(callback) {
               lines.forEach((line) => {
                 if (line !== '') {
                   line = line.trim().split(' ');
-                  if (fs_filter.indexOf(line[0]) === -1) {
-                    fs_filter.push(line[0]);
+                  const dev = util.sanitizeShellString(line[0], true);
+                  if (dev && fs_filter.indexOf(dev) === -1) {
+                    fs_filter.push(dev);
                   }
                 }
               });
@@ -1193,7 +1202,7 @@ function diskLayout(callback) {
               let devices = [];
               try {
                 const outJSON = JSON.parse(out);
-                if (outJSON && Object.hasOwn(outJSON, 'blockdevices')) {
+                if (outJSON && {}.hasOwnProperty.call(outJSON, 'blockdevices')) {
                   devices = outJSON.blockdevices.filter((item) => {
                     return (
                       item.type === 'disk' &&
@@ -1229,8 +1238,8 @@ function diskLayout(callback) {
               }
               devices.forEach((device) => {
                 let mediumType = '';
-                const BSDName = '/dev/' + device.name;
-                const logical = device.name;
+                const logical = util.sanitizeShellString(device.name, true);
+                const BSDName = '/dev/' + logical;
                 try {
                   mediumType = execSync('cat /sys/block/' + logical + '/queue/rotational 2>/dev/null', util.execOptsLinux)
                     .toString()
@@ -1387,7 +1396,7 @@ function diskLayout(callback) {
                 const lines = device.split('\n');
                 const mediumType = util.getValue(lines, 'Medium Type', ':', true).trim();
                 const sizeStr = util.getValue(lines, 'capacity', ':', true).trim();
-                const BSDName = util.getValue(lines, 'BSD Name', ':', true).trim();
+                const BSDName = util.sanitizeShellString(util.getValue(lines, 'BSD Name', ':', true).trim(), true);
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
@@ -1443,7 +1452,7 @@ function diskLayout(callback) {
                 const lines = device.split('\n');
                 const linkWidth = util.getValue(lines, 'link width', ':', true).trim();
                 const sizeStr = util.getValue(lines, '!capacity', ':', true).trim();
-                const BSDName = util.getValue(lines, 'BSD Name', ':', true).trim();
+                const BSDName = util.sanitizeShellString(util.getValue(lines, 'BSD Name', ':', true).trim(), true);
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
@@ -1491,12 +1500,12 @@ function diskLayout(callback) {
             }
             // USB Drives (older macOS report storage devices under SPUSBDataType)
             try {
-              const devices = linesUSB.join('\n').replaceAll('Media:\n ', 'Model:').split('\n\n          Product ID:');
+              const devices = linesUSB.join('\n').replace(/Media:\n /g, 'Model:').split('\n\n          Product ID:');
               devices.shift();
               devices.forEach((device) => {
                 const lines = device.split('\n');
                 const sizeStr = util.getValue(lines, 'Capacity', ':', true).trim();
-                const BSDName = util.getValue(lines, 'BSD Name', ':', true).trim();
+                const BSDName = util.sanitizeShellString(util.getValue(lines, 'BSD Name', ':', true).trim(), true);
                 if (sizeStr) {
                   let sizeValue = 0;
                   if (sizeStr.indexOf('(') >= 0) {
@@ -1517,7 +1526,7 @@ function diskLayout(callback) {
                     result.push({
                       device: BSDName,
                       type: 'USB',
-                      name: util.getValue(lines, 'Model', ':', true).trim().replaceAll(':', ''),
+                      name: util.getValue(lines, 'Model', ':', true).trim().replace(/:/g, ''),
                       vendor: getVendorFromModel(util.getValue(lines, 'Model', ':', true).trim()),
                       size: sizeValue,
                       bytesPerSector: null,