Refactor error handling and logging in '''get_extractor''' - main.py

mandiant · Nov 13, 2023 · 0861e8a · 0861e8a
1 parent 74f7085
commit 0861e8a
Showing 1 changed file with 11 additions and 19 deletions.
diff --git a/capa/main.py b/capa/main.py
@@ -517,6 +517,7 @@ def get_workspace(path: Path, format_: str, sigpaths: List[Path]):
     return vw
 
 
+@catch_log_return_errors
 def get_extractor(
     path: Path,
     format_: str,
@@ -1257,25 +1258,16 @@ def main(argv: Optional[List[str]] = None):
 
             should_save_workspace = os.environ.get("CAPA_SAVE_WORKSPACE") not in ("0", "no", "NO", "n", None)
 
-            try:
-                extractor = get_extractor(
-                    args.sample,
-                    format_,
-                    args.os,
-                    args.backend,
-                    sig_paths,
-                    should_save_workspace,
-                    disable_progress=args.quiet or args.debug,
-                )
-            except UnsupportedFormatError:
-                log_unsupported_format_error()
-                return E_INVALID_FILE_TYPE
-            except UnsupportedArchError:
-                log_unsupported_arch_error()
-                return E_INVALID_FILE_ARCH
-            except UnsupportedOSError:
-                log_unsupported_os_error()
-                return E_INVALID_FILE_OS
+            # Error checking and logging is performed in the get_extractor call
+            extractor = get_extractor(
+                args.sample,
+                format_,
+                args.os,
+                args.backend,
+                sig_paths,
+                should_save_workspace,
+                disable_progress=args.quiet or args.debug,
+            )
 
         meta = collect_metadata(argv, args.sample, args.format, args.os, args.rules, extractor)