acquire 3.20.2.dev2__tar.gz → 3.20.2.dev4__tar.gz

{acquire-3.20.2.dev2 → acquire-3.20.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acquire
-Version: 3.20.2.dev2
+Version: 3.20.2.dev4
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{acquire-3.20.2.dev2 → acquire-3.20.2.dev4}/acquire/acquire.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import argparse
+import contextlib
 import enum
 import functools
 import io
@@ -2416,19 +2417,20 @@ def main() -> None:
                 target_path = f"{target_path}?{target_query}"
             target_paths.append(target_path)
 
+        # Use esxi_memory_context_manager only if running on ESXi host
+        if platform.system().lower() == "vmkernel":
+            context_mgr = esxi_memory_context_manager()
+        else:
+            context_mgr = contextlib.nullcontext()
+
         try:
             target_name = "Unknown"  # just in case open_all already fails
-            for target in Target.open_all(target_paths):
-                target_name = "Unknown"  # overwrite previous target name
-                target_name = target.name
-                log.info("Loading target %s", target_name)
-                log.info(target)
-                if target.os == "esxi" and target.name == "local":
-                    # Loader found that we are running on an esxi host
-                    # Perform operations to "enhance" memory
-                    with esxi_memory_context_manager():
-                        files_to_upload = acquire_children_and_targets(target, args)
-                else:
+            with context_mgr:
+                for target in Target.open_all(target_paths):
+                    target_name = "Unknown"  # overwrite previous target name
+                    target_name = target.name
+                    log.info("Loading target %s", target_name)
+                    log.info(target)
                     files_to_upload = acquire_children_and_targets(target, args)
         except Exception:
             log.error("Failed to acquire target: %s", target_name)  # noqa: TRY400

{acquire-3.20.2.dev2 → acquire-3.20.2.dev4}/acquire/utils.py

@@ -15,6 +15,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from dissect.target.helpers import keychain
+from dissect.target.tools.utils import _OverrideRequiredAction, list_children
 
 from acquire.outputs import (
     COMPRESSION_METHODS,
@@ -139,7 +140,12 @@ def create_argument_parser(profiles: dict, volatile: dict, modules: dict) -> arg
 
     parser.add_argument("--disable-report", action="store_true", help="disable acquisition report file")
 
-    parser.add_argument("--child", help="only collect specific child")
+    parser.add_argument(
+        "--list-children", action=_OverrideRequiredAction, help="list all children indices and paths, then exit"
+    )
+    parser.add_argument("--recursive", action="store_true", help="make --list-children behave recursively")
+
+    parser.add_argument("--child", help="only collect specific child based on index or path, see --list-children")
     parser.add_argument(
         "--children",
         action=argparse.BooleanOptionalAction,
@@ -214,6 +220,11 @@ def parse_acquire_args(
     args, rest = parser.parse_known_args()
     _merge_args_and_config(parser, args, config)
 
+    if args.list_children:
+        # List found children on targets and exit
+        list_children(args)
+        parser.exit(0)
+
     return args, rest
 
 

{acquire-3.20.2.dev2 → acquire-3.20.2.dev4}/acquire/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.20.2.dev2'
-__version_tuple__ = version_tuple = (3, 20, 2, 'dev2')
+__version__ = version = '3.20.2.dev4'
+__version_tuple__ = version_tuple = (3, 20, 2, 'dev4')
 
-__commit_id__ = commit_id = 'g08e89c87c'
+__commit_id__ = commit_id = 'gca78bce15'

{acquire-3.20.2.dev2 → acquire-3.20.2.dev4}/acquire.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: acquire
-Version: 3.20.2.dev2
+Version: 3.20.2.dev4
 Summary: A tool to quickly gather forensic artifacts from disk images or a live system into a lightweight container
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later