@iobroker/js-controller-common 4.0.3 → 4.0.6-alpha.0-20220209-3a6580b2

package/lib/common/logger.js

@@ -65,19 +65,19 @@ const IoSeq =
             ioInfo.props = ioInfo.props || {};
 
             // map our log levels to Seq levels
-            const level = (info.level || '').toLowerCase();
+            const level = (ioInfo.level || '').toLowerCase();
             if (level.includes('error')) {
-                info.level = 'Error';
+                ioInfo.level = 'Error';
             } else if (level.includes('warn')) {
-                info.level = 'Warning';
+                ioInfo.level = 'Warning';
             } else if (level.includes('info')) {
-                info.level = 'Information';
+                ioInfo.level = 'Information';
             } else if (level.includes('debug')) {
-                info.level = 'Debug';
+                ioInfo.level = 'Debug';
             } else if (level.includes('silly')) {
-                info.level = 'Verbose';
+                ioInfo.level = 'Verbose';
             } else {
-                info.level = 'Information';
+                ioInfo.level = 'Information';
             }
 
             // we add own properties

package/lib/common/tools.js

@@ -10,7 +10,7 @@ const cpPromise = require('promisify-child-process');
 const jwt = require('jsonwebtoken');
 const { createInterface } = require('readline');
 const { PassThrough } = require('stream');
-const { detectPackageManager } = require('@alcalzone/pak');
+const { detectPackageManager, packageManagers } = require('@alcalzone/pak');
 const EXIT_CODES = require('./exitCodes');
 const zlib = require('zlib');
 
@@ -1258,34 +1258,32 @@ function getRepositoryFile(urlOrPath, additionalInfo, callback) {
  */
 async function getRepositoryFileAsync(url, hash, force, _actualRepo) {
     let _hash;
-    if (_actualRepo && !force && hash && (url.startsWith('http://') || url.startsWith('https://'))) {
-        axios = axios || require('axios');
-        _hash = await axios({ url: url.replace(/\.json$/, '-hash.json'), timeout: 10000 });
-        if (_hash && _hash.data && hash === _hash.data.hash) {
-            return _actualRepo;
-        }
-    }
-
     let data;
 
     if (url.startsWith('http://') || url.startsWith('https://')) {
         axios = axios || require('axios');
-        if (!_hash) {
+        try {
             _hash = await axios({ url: url.replace(/\.json$/, '-hash.json'), timeout: 10000 });
+        } catch {
+            // ignore missing hash file
         }
 
-        if (_actualRepo && hash && _hash && _hash.data && _hash.data.hash === hash) {
+        if (_actualRepo && !force && hash && _hash && _hash.data && _hash.data.hash === hash) {
             data = _actualRepo;
         } else {
             const agent = `${module.exports.appName}, RND: ${randomID}, Node:${process.version}, V:${
                 require('../../package.json').version
             }`;
-            data = await axios({
-                url,
-                timeout: 10000,
-                headers: { 'User-Agent': agent }
-            });
-            data = data.data;
+            try {
+                data = await axios({
+                    url,
+                    timeout: 10000,
+                    headers: { 'User-Agent': agent }
+                });
+                data = data.data;
+            } catch (e) {
+                throw new Error(`Cannot download repository file from "${url}": ${e.message}`);
+            }
         }
     } else {
         if (fs.existsSync(url)) {
@@ -1456,6 +1454,43 @@ function getSystemNpmVersion(callback) {
 
 const getSystemNpmVersionAsync = promisify(getSystemNpmVersion);
 
+/**
+ * @private
+ * Figure out which package manager is in charge, but with a fallback to npm.
+ * @param {string} [cwd] Which directory to work in. If none is given, this defaults to ioBroker's root directory.
+ * @returns {Promise<PackageManager>}
+ */
+async function detectPackageManagerWithFallback(cwd) {
+    try {
+        // For the first attempt, use pak's default of requiring a lockfile. This makes sure we find ioBroker's root dir
+        return await detectPackageManager(
+            typeof cwd === 'string'
+                ? // If a cwd was provided, use it
+                  { cwd }
+                : // Otherwise try to find the ioBroker root dir
+                  {
+                      cwd: __dirname,
+                      setCwdToPackageRoot: true
+                  }
+        );
+    } catch {
+        // Lockfile not found, try again without requiring a lockfile
+    }
+
+    // Since we have no lockfile to rely on, assume the root dir is 2 levels above js-controller
+    const ioBrokerRootDir = path.join(getControllerDir(), '../..');
+    try {
+        return await detectPackageManager({ cwd: ioBrokerRootDir, requireLockfile: false });
+    } catch {
+        // Lockfile not found, use default
+    }
+
+    // Fallback to npm
+    const pak = new packageManagers.npm();
+    pak.cwd = ioBrokerRootDir;
+    return pak;
+}
+
 /**
  * @typedef {object} InstallNodeModuleOptions
  * @property {boolean} [unsafePerm] Whether the `--unsafe-perm` flag should be used
@@ -1471,16 +1506,7 @@ const getSystemNpmVersionAsync = promisify(getSystemNpmVersion);
  */
 async function installNodeModule(npmUrl, options = {}) {
     // Figure out which package manager is in charge (probably npm at this point)
-    const pak = await detectPackageManager(
-        typeof options.cwd === 'string'
-            ? // If a cwd was provided, use it
-              { cwd: options.cwd }
-            : // Otherwise find the ioBroker root dir
-              {
-                  cwd: __dirname,
-                  setCwdToPackageRoot: true
-              }
-    );
+    const pak = await detectPackageManagerWithFallback(options.cwd);
     // By default, don't print all the stuff the package manager spits out
     if (!options.debug) {
         pak.loglevel = 'error';
@@ -1520,16 +1546,7 @@ async function installNodeModule(npmUrl, options = {}) {
  */
 async function uninstallNodeModule(packageName, options = {}) {
     // Figure out which package manager is in charge (probably npm at this point)
-    const pak = await detectPackageManager(
-        typeof options.cwd === 'string'
-            ? // If a cwd was provided, use it
-              { cwd: options.cwd }
-            : // Otherwise find the ioBroker root dir
-              {
-                  cwd: __dirname,
-                  setCwdToPackageRoot: true
-              }
-    );
+    const pak = await detectPackageManagerWithFallback(options.cwd);
     // By default, don't print all the stuff the package manager spits out
     if (!options.debug) {
         pak.loglevel = 'error';
@@ -1563,16 +1580,7 @@ async function uninstallNodeModule(packageName, options = {}) {
  */
 async function rebuildNodeModules(options = {}) {
     // Figure out which package manager is in charge (probably npm at this point)
-    const pak = await detectPackageManager(
-        typeof options.cwd === 'string'
-            ? // If a cwd was provided, use it
-              { cwd: options.cwd }
-            : // Otherwise find the ioBroker root dir
-              {
-                  cwd: __dirname,
-                  setCwdToPackageRoot: true
-              }
-    );
+    const pak = await detectPackageManagerWithFallback(options.cwd);
     // By default, don't print all the stuff the package manager spits out
     if (!options.debug) {
         pak.loglevel = 'error';
@@ -2995,6 +3003,7 @@ function pipeLinewise(input, output) {
         crlfDelay: Infinity
     });
     rl.on('line', line => output.write(line + os.EOL));
+    rl.on('error', () => {}); // Ignore errors
 }
 
 /**
@@ -3439,33 +3448,60 @@ async function getInstancesOrderedByStartPrio(objects, logger, logPrefix = '') {
  * @returns {Promise<void>}
  */
 async function setExecutableCapabilities(execPath, capabilities, modeEffective, modePermitted, modeInherited) {
+    if (!Array.isArray(capabilities) || !capabilities.length) {
+        throw new Error('No capabilities array provided');
+    }
+
     // if not linux do nothing and silently exit
-    if (os.platform() === 'linux') {
-        if (Array.isArray(capabilities) && capabilities.length) {
-            let modes = '';
-            const capabilitiesStr = capabilities.join(',');
+    if (os.platform() !== 'linux') {
+        return;
+    }
 
-            if (modeEffective) {
-                modes += 'e';
+    // if Docker and Admin Capabilities should be set check if we are allowed to do that
+    if (isDocker() && capabilities.includes('cap_net_admin')) {
+        try {
+            const systemCaps = fs.readFileSync(`/proc/${process.pid}/status`, 'utf-8');
+            const capBnd = systemCaps.match(/^CapBnd:\s(.+)$/m);
+            // We found a value in CapBnd line
+            if (capBnd && capBnd[1]) {
+                const { stdout } = await execAsync(`capsh --decode=${capBnd[1]}`);
+                // Stdout looks like "0x00000000a80425fb=cap_chown,cap_dac_override,..."
+                if (stdout && stdout.startsWith(`0x${capBnd[1]}=`)) {
+                    const capBndArr = stdout.substring(capBnd[1].length + 3).split(',');
+                    // if Admin Capability is not included in System Capabilities we remove it from array
+                    if (!capBndArr.includes('cap_net_admin')) {
+                        capabilities = capabilities.filter(c => c !== 'cap_net_admin');
+                    }
+                }
             }
+        } catch {
+            // Ok we could not find it out, so update Caps but better without Admin Capability
+            capabilities = capabilities.filter(c => c !== 'cap_net_admin');
+        }
+    }
 
-            if (modePermitted) {
-                modes += 'p';
-            }
+    if (capabilities.length) {
+        let modes = '';
+        const capabilitiesStr = capabilities.join(',');
 
-            if (modeInherited) {
-                modes += 'i';
-            }
+        if (modeEffective) {
+            modes += 'e';
+        }
 
-            if (modes.length) {
-                modes = `+${modes}`;
-            }
+        if (modePermitted) {
+            modes += 'p';
+        }
 
-            // if this throws it needs to be caught outside
-            await cpPromise.exec(`sudo setcap ${capabilitiesStr}${modes} ${execPath}`);
-        } else {
-            throw new Error('No capabilities array provided');
+        if (modeInherited) {
+            modes += 'i';
         }
+
+        if (modes.length) {
+            modes = `+${modes}`;
+        }
+
+        // if this throws it needs to be caught outside
+        await cpPromise.exec(`sudo setcap ${capabilitiesStr}${modes} ${execPath}`);
     }
 }
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@iobroker/js-controller-common",
-  "version": "4.0.3",
+  "version": "4.0.6-alpha.0-20220209-3a6580b2",
   "engines": {
     "node": ">=12.0.0"
   },
   "optionalDependencies": {
     "@datalust/winston-seq": "^1.0.0",
-    "winston-syslog": "^2.4.4"
+    "winston-syslog": "^2.5.0"
   },
   "dependencies": {
     "@alcalzone/pak": "^0.7.0",
@@ -47,5 +47,5 @@
     "lib/",
     "index.js"
   ],
-  "gitHead": "79a76a082db91399d0e432ef02bf2981a6739107"
+  "gitHead": "ce7aaf729286e88c7a82bca5d9b29c9581d308ba"
 }