Call validateModulesForProtection in all commands where we flash files

particle-iot · Jun 27, 2024 · 6c3a018 · 6c3a018
1 parent b6e34e7
commit 6c3a018
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/cmd/flash.js b/src/cmd/flash.js
@@ -19,6 +19,7 @@ const {
 	createFlashSteps,
 	filterModulesToFlash,
 	parseModulesToFlash,
+	validateModulesForProtection,
 	flashFiles,
 	validateDFUSupport,
 	getFileFlashInfo
@@ -87,6 +88,7 @@ module.exports = class FlashCommand extends CLICommandBase {
 				platformId: device.platformId,
 				platformName
 			});
+			await validateModulesForProtection({ modules: modulesToFlash, device });
 			const flashSteps = await createFlashSteps({
 				modules: modulesToFlash,
 				isInDfuMode: device.isInDfuMode,
@@ -156,6 +158,7 @@ module.exports = class FlashCommand extends CLICommandBase {
 		let modulesToFlash = [...fileModules, ...deviceOsModules];
 		modulesToFlash = filterModulesToFlash({ modules: modulesToFlash, platformId });
 
+		await validateModulesForProtection({ modules: modulesToFlash, device });
 		const flashSteps = await createFlashSteps({
 			modules: modulesToFlash,
 			isInDfuMode: device.isInDfuMode,

diff --git a/src/cmd/update.js b/src/cmd/update.js
@@ -6,7 +6,7 @@ const semver = require('semver');
 const usbUtils = require('./usb-util');
 const deviceOsUtils = require('../lib/device-os-version-util');
 const CLICommandBase = require('./base');
-const { parseModulesToFlash, filterModulesToFlash, createFlashSteps, flashFiles, validateDFUSupport } = require('../lib/flash-helper');
+const { parseModulesToFlash, filterModulesToFlash, validateModulesForProtection, createFlashSteps, flashFiles, validateDFUSupport } = require('../lib/flash-helper');
 const createApiCache = require('../lib/api-cache');
 
 module.exports = class UpdateCommand extends CLICommandBase {
@@ -41,6 +41,7 @@ module.exports = class UpdateCommand extends CLICommandBase {
 		});
 		const deviceOsModules = await parseModulesToFlash({ files: deviceOsBinaries });
 		const modulesToFlash = filterModulesToFlash({ modules: deviceOsModules, platformId: device.platformId, allowAll: true });
+		await validateModulesForProtection({ modules: modulesToFlash, device });
 		const flashSteps = await createFlashSteps({ modules: modulesToFlash, isInDfuMode: device.isInDfuMode , platformId: device.platformId });
 		await flashFiles({ device, flashSteps, ui: this.ui });
 		this.ui.write('Update success!');

diff --git a/src/lib/flash-helper.js b/src/lib/flash-helper.js
@@ -358,6 +358,9 @@ function validateDFUSupport({ device, ui }) {
 	}
 }
 
+function validateModulesForProtection({ modules, device }) {
+
+}
 
 module.exports = {
 	flashFiles,
@@ -366,6 +369,7 @@ module.exports = {
 	createFlashSteps,
 	prepareDeviceForFlash,
 	validateDFUSupport,
+	validateModulesForProtection,
 	getFileFlashInfo,
 	_get256Hash,
 	_skipAsset