Validate (and update) arguments before interpolating them into recipes (

#885)
log2timeline · Jun 11, 2024 · 2be184c · 2be184c
1 parent c4fdf13
commit 2be184c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/dftimewolf/cli/dftimewolf_recipes.py b/dftimewolf/cli/dftimewolf_recipes.py
@@ -518,13 +518,6 @@ def RunTool(cdm: Optional[CursesDisplayManager] = None) -> int:
     'core',
     recipe_name)
 
-  # Interpolate arguments into recipe
-  recipe = tool.state.recipe
-  for module in recipe.get('preflights', []) + recipe.get('modules', []):
-    module['args'] = utils.ImportArgsFromDict(module['args'],
-                                              tool.state.command_line_options,
-                                              tool.state.config)
-
   try:
     tool.ValidateArguments()
   except errors.CriticalError as exception:
@@ -533,6 +526,13 @@ def RunTool(cdm: Optional[CursesDisplayManager] = None) -> int:
     logger.critical(str(exception))
     return 1
 
+  # Interpolate arguments into recipe
+  recipe = tool.state.recipe
+  for module in recipe.get('preflights', []) + recipe.get('modules', []):
+    module['args'] = utils.ImportArgsFromDict(module['args'],
+                                              tool.state.command_line_options,
+                                              tool.state.config)
+
   tool.state.LogExecutionPlan()
 
   if tool.dry_run: