Merge branch 'develop' into 'master'

Develop

See merge request prey/js/prey-node-client!1292

Author: Javier Acuna

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v1.13.21](https://github.com/prey/prey-node-client/tree/v1.13.21) (2025-11-07)
+[Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.20..v1.13.21)
+
+- Fix: Adds restrictions to changing some of the database settings for Prey software. ([SoraKenji](https://github.com/SoraKenji))
+
+- Fix: Improves the code that handles obtaining Wi-Fi network information in Ubuntu, which is used to triangulate the device's location. ([SoraKenji](https://github.com/SoraKenji))
+
+- feat: It adds a piece of code to identify MacOS devices with a T2 security chip and report potential problems with Apple's Factory Reset. ([SoraKenji](https://github.com/SoraKenji))
+
+- Fix: It ensures that if a database backup exists in temporary files and needs to be recovered, it marks and deletes it to avoid causing potential errors in the future. ([SoraKenji](https://github.com/SoraKenji))
+
+- Chore: Adds newest wpxsvc binary version 2.0.29 and updater.exe version 1.0.6 to Prey Windows client. ([SoraKenji](https://github.com/SoraKenji))
 
 ## [v1.13.20](https://github.com/prey/prey-node-client/tree/v1.13.20) (2025-08-29)
 [Full Changelog](https://github.com/prey/prey-node-client/compare/v1.13.19..v1.13.20)

bin/updater.exe

@@ -1,3 +1,4 @@
+/* eslint-disable consistent-return */
 const common = require('./common');
 const updater = require('./updater');
 const hooks = require('./hooks');
@@ -10,10 +11,12 @@ const providers = require('./providers');
 const {
   correctPreyConf, getDataDb, readWithoutVerification,
 } = require('./utils/prey-configuration/preyconf');
+
+const { saveToDbKey } = require('../utils/configutil');
 const storage = require('./utils/storage');
 const { restore } = require('./utils/storage/restore');
 const setup = require('./control-panel/setup');
-const skippedPermissions = require('./../utils/skippedPermissions');
+const skippedPermissions = require('../utils/skippedPermissions');
 
 const logo = require('./utils/logo');
 const controlPanel = require('./control-panel');
@@ -23,7 +26,6 @@ const {
   system, logger, program, exceptions, os_name, os_release,
 } = common;
 
-const { isBoolean } = require('./utils/utilsprey');
 const config = require('../utils/configfile');
 const fetchEnvVar = require('../utils/fetch-env-var');
 
@@ -33,8 +35,6 @@ let startedAt = null;
 let runningAs = null;
 
 const isRunning = () => running;
-
-// eslint-disable-next-line consistent-return
 const runFromCommandLine = () => {
   if (!program.debug) logger.pause();
 
@@ -52,8 +52,6 @@ const isNetworkError = (err) => {
   const codes = ['ENETDOWN', 'ENETUNREACH', 'EADDRINFO', 'ENOTFOUND'];
   return codes.indexOf(err.code) !== -1;
 };
-
-// eslint-disable-next-line consistent-return
 const connectionDown = () => {
   if (!config.getData('auto_connect')) { return false; }
 
@@ -177,7 +175,6 @@ const preyConfReconf = () => {
       setTimeout(correctDataTimedOut, 1000 * 60 * 5);
       setInterval(correctDataTimedOut, 1000 * 60 * 30);
     } else {
-      // eslint-disable-next-line consistent-return
       getDataDb('preyconf', (_errorGetData, dataFromDb) => {
         if (dataFromDb && dataFromDb.length > 0) {
           const preyConfData = JSON.parse(dataFromDb[0].value);
@@ -192,7 +189,6 @@ const preyConfReconf = () => {
                   const preyConfDataInside = JSON.parse(dataFromDbInside[0].value);
                   if ((!dataShould || dataShould.localeCompare('false') === 0)
                     && preyConfDataInside['control-panel.device_key'] && preyConfDataInside['control-panel.api_key']) {
-                    // eslint-disable-next-line consistent-return
                     return getDataFromShouldPreyCFile(reactToDataFromShouldPreyCFile);
                   }
                 }
@@ -213,9 +209,7 @@ const run = () => {
   if (running) return;
   running = true;
 
-  // eslint-disable-next-line consistent-return
   if (program.run) { return runFromCommandLine(); }
-  // eslint-disable-next-line consistent-return
   config.load(() => {
     skippedPermissions.load(() => {
       try {
@@ -243,25 +237,24 @@ const run = () => {
       startedAt = new Date();
       writeHeader();
 
-      // eslint-disable-next-line consistent-return
       if (config.getData('auto_update') === false) return boot();
 
       preyConfReconf();
       try {
         hasDeviceKeyApiKey(() => {
           updater.check_for_update((err) => {
-            // eslint-disable-next-line consistent-return
             restore((msg) => {
+              saveToDbKey('fenixReady', 'true', () => {});
               if (typeof msg === 'string') logger.info(msg);
-              // eslint-disable-next-line consistent-return
+
               if (err) return boot();
             });
           });
         });
       } catch (exception) {
         boot();
       }
-    })
+    });
   });
 };
 

bin/wpxsvc.exe

@@ -26,33 +26,41 @@ const parseSystemProfilerProperties = (str) => {
   return obj;
 };
 
-const callSystemProfiler = (type, cb) => {
-  const cmd = `/usr/sbin/system_profiler ${type}`;
+const callSystemProfiler = (type, cb, json = false) => {
+  const cmd = `/usr/sbin/system_profiler ${type} ${json ? '-json' : ''}`;
   exec(cmd, cb);
 };
 
-const getSystemProfilerData = (type, cb) => {
+const getSystemProfilerData = (type, cb, json = false) => {
   callSystemProfiler(type, (err, stdout) => {
     if (err) return cb(err);
     const obj = parseSystemProfilerProperties(stdout);
     cb(null, obj);
-  });
+  }, json);
 };
 
 exports.get_firmware_info = (callback) => {
   getSystemProfilerData('SPHardwareDataType', (err, spData) => {
     if (err) return callback(err);
-    const data = {
-      device_type: spData.model_name.indexOf('Book') === -1 ? 'Desktop' : 'Laptop',
-      model_name: spData.model_name,
-      vendor_name: 'Apple',
-      bios_vendor: 'Apple',
-      bios_version: spData.boot_rom_version,
-      mb_version: (system.is_m1_or_m2()) ? system.get_info_chip() : spData['smc_version_(system)'],
-      serial_number: spData['serial_number_(system)'],
-      uuid: spData.hardware_uuid,
-    };
-    callback(null, data);
+    getSystemProfilerData('SPiBridgeDataType', (errSpi, spiData) => {
+      let modelNameSecurityChip = '';
+      if (!errSpi && spiData && Object.prototype.hasOwnProperty.call(spiData, 'ibridge_model_name')) {
+        modelNameSecurityChip = spiData.ibridge_model_name;
+      }
+      const data = {
+        device_type: spData.model_name.indexOf('Book') === -1 ? 'Desktop' : 'Laptop',
+        model_name: spData.model_name,
+        vendor_name: 'Apple',
+        bios_vendor: 'Apple',
+        bios_version: spData.boot_rom_version,
+        mb_version: (system.is_m1_or_m2()) ? system.get_info_chip() : spData['smc_version_(system)'],
+        serial_number: spData['serial_number_(system)'],
+        uuid: spData.hardware_uuid,
+        apple_security_chip: modelNameSecurityChip,
+      };
+
+      callback(null, data);
+    }, true);
   });
 };
 
@@ -111,8 +119,7 @@ exports.get_osquery_running = (cb) => {
     const matchResult = stdout.match(/\d+/);
     if (matchResult && !Number.isNaN(Number(matchResult[0]))) {
       return cb(null, true, 'osquery_running');
-    } else {
-      return cb(null, false, 'osquery_running');
     }
+    return cb(null, false, 'osquery_running');
   });
 };