acquire 3.16.dev8__tar.gz → 3.17.dev1__tar.gz

{acquire-3.16.dev8/acquire.egg-info → acquire-3.17.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: acquire
-Version: 3.16.dev8
+Version: 3.17.dev1
 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: Affero General Public License v3

{acquire-3.16.dev8 → acquire-3.17.dev1}/acquire/utils.py

@@ -15,6 +15,7 @@ from pathlib import Path
 from typing import Any, Optional
 
 from dissect.target import Target
+from dissect.target.helpers import keychain
 
 from acquire.outputs import (
     COMPRESSION_METHODS,
@@ -163,6 +164,9 @@ def create_argument_parser(profiles: dict, volatile: dict, modules: dict) -> arg
     )
     parser.add_argument("--no-proxy", action="store_true", help="don't autodetect proxies")
 
+    parser.add_argument("-K", "--keychain-file", type=Path, help="keychain file in CSV format")
+    parser.add_argument("-Kv", "--keychain-value", help="passphrase, recovery key or key file path value")
+
     for module_cls in modules.values():
         for args, kwargs in module_cls.__cli_args__:
             parser.add_argument(*args, **kwargs)
@@ -190,10 +194,10 @@ def parse_acquire_args(
     Returns:
         A command line arguments namespace
     """
-    command_line_args, rest = parser.parse_known_args()
-    _merge_args_and_config(parser, command_line_args, config)
+    args, rest = parser.parse_known_args()
+    _merge_args_and_config(parser, args, config)
 
-    return command_line_args, rest
+    return args, rest
 
 
 def _merge_args_and_config(
@@ -312,9 +316,9 @@ def check_and_set_acquire_args(
     if not args.upload:
         # check output related configuration
         if (args.children or len(args.targets) > 1) and args.output_file:
-            raise ValueError("--children can not be used with --output_file. Use --output instead")
+            raise ValueError("--children can not be used with --output-file. Use --output instead")
         elif args.output_file and (not args.output_file.parent.is_dir() or args.output_file.is_dir()):
-            raise ValueError("--output_file must be a path to a file in an existing directory")
+            raise ValueError("--output-file must be a path to a file in an existing directory")
         elif args.output and not args.output.is_dir():
             raise ValueError(f"Output directory doesn't exist or is a file: {args.output}")
 
@@ -340,6 +344,12 @@ def check_and_set_acquire_args(
                 f"Invalid compression method for tar, allowed are: {', '.join(TAR_COMPRESSION_METHODS.keys())}"
             )
 
+    if args.keychain_file:
+        keychain.register_keychain_file(args.keychain_file)
+
+    if args.keychain_value:
+        keychain.register_wildcard_value(args.keychain_value)
+
 
 def get_user_name() -> str:
     try:

{acquire-3.16.dev8 → acquire-3.17.dev1}/acquire/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.16.dev8'
-__version_tuple__ = version_tuple = (3, 16, 'dev8')
+__version__ = version = '3.17.dev1'
+__version_tuple__ = version_tuple = (3, 17, 'dev1')

{acquire-3.16.dev8 → acquire-3.17.dev1/acquire.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: acquire
-Version: 3.16.dev8
+Version: 3.17.dev1
 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: Affero General Public License v3

{acquire-3.16.dev8 → acquire-3.17.dev1}/tests/test_utils.py

@@ -229,21 +229,21 @@ def test_check_and_set_acquire_args_output(children: bool, arg_name: str, output
             True,
             "output_file",
             get_mock_path(is_dir=False),
-            "--children can not be used with --output_file. Use --output instead",
+            "--children can not be used with --output-file. Use --output instead",
         ),
         # Output_file is a directory
         (
             False,
             "output_file",
             get_mock_path(),
-            "--output_file must be a path to a file in an existing directory",
+            "--output-file must be a path to a file in an existing directory",
         ),
         # Output_file has a non-existing parent directory
         (
             False,
             "output_file",
             get_mock_path(is_dir=False, parent_is_dir=False),
-            "--output_file must be a path to a file in an existing directory",
+            "--output-file must be a path to a file in an existing directory",
         ),
         # Output is a non-existing directory
         (