dissect.target 3.20.dev13__tar.gz → 3.20.dev15__tar.gz

{dissect_target-3.20.dev13/dissect.target.egg-info → dissect_target-3.20.dev15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev13
+Version: 3.20.dev15
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.20.dev13 → dissect_target-3.20.dev15}/dissect/target/plugins/filesystem/ntfs/mft.py

@@ -105,6 +105,7 @@ FilesystemMACBRecord = TargetRecordDescriptor(
         ("filesize", "filesize"),
         ("boolean", "resident"),
         ("boolean", "inuse"),
+        ("boolean", "ads"),
         ("string", "volume_uuid"),
     ],
 )
@@ -151,7 +152,7 @@ class MftPlugin(Plugin):
         "--macb",
         group="fmt",
         action="store_true",
-        help="compacts the MFT entry timestamps into aggregated records with MACB bitfield",
+        help="compacts MFT timestamps into MACB bitfield (format: MACB[standard|ads]/MACB[filename])",
     )
     def mft(
         self, compact: bool = False, fs: int | None = None, start: int = 0, end: int = -1, macb: bool = False
@@ -342,12 +343,13 @@ def macb_aggr(records: list[Record]) -> Iterator[Record]:
     for record in records:
         found = False
 
-        offset_std = int(record._desc.name == "filesystem/ntfs/mft/std") * 5
-        offset_ads = (int(record.ads) * 10) if offset_std == 0 else 0
+        offset = 0
+        if not getattr(record, "ads", False):
+            offset = int(record._desc.name == "filesystem/ntfs/mft/filename") * 5
 
-        field = "MACB".find(record.ts_type) + offset_std + offset_ads
+        field = "MACB".find(record.ts_type) + offset
         for macb in macbs:
-            if macb.ts == record.ts:
+            if macb.ts == record.ts and macb.path == record.path:
                 macb.macb = macb_set(macb.macb, field, record.ts_type)
                 found = True
                 break
@@ -356,7 +358,7 @@ def macb_aggr(records: list[Record]) -> Iterator[Record]:
             continue
 
         macb = FilesystemMACBRecord.init_from_record(record)
-        macb.macb = "..../..../...."
+        macb.macb = "..../...."
         macb.macb = macb_set(macb.macb, field, record.ts_type)
 
         macbs.append(macb)

{dissect_target-3.20.dev13 → dissect_target-3.20.dev15}/dissect/target/tools/shell.py

@@ -95,6 +95,7 @@ class ExtendedCmd(cmd.Cmd):
     """
 
     CMD_PREFIX = "cmd_"
+    _runtime_aliases = {}
 
     def __init__(self, cyber: bool = False):
         cmd.Cmd.__init__(self)
@@ -164,6 +165,11 @@ class ExtendedCmd(cmd.Cmd):
         return None
 
     def default(self, line: str) -> bool:
+        com, arg, _ = self.parseline(line)
+        if com in self._runtime_aliases:
+            expanded = " ".join([self._runtime_aliases[com], arg])
+            return self.onecmd(expanded)
+
         if (should_exit := self._handle_command(line)) is not None:
             return should_exit
 
@@ -230,6 +236,43 @@ class ExtendedCmd(cmd.Cmd):
     def complete_man(self, *args) -> list[str]:
         return cmd.Cmd.complete_help(self, *args)
 
+    def do_unalias(self, line: str) -> bool:
+        """delete runtime alias"""
+        aliases = list(shlex.shlex(line, posix=True))
+        for aliased in aliases:
+            if aliased in self._runtime_aliases:
+                del self._runtime_aliases[aliased]
+            else:
+                print(f"alias {aliased} not found")
+        return False
+
+    def do_alias(self, line: str) -> bool:
+        """create a runtime alias"""
+        args = list(shlex.shlex(line, posix=True))
+
+        if not args:
+            for aliased, command in self._runtime_aliases.items():
+                print(f"alias {aliased}={command}")
+            return False
+
+        while args:
+            alias_name = args.pop(0)
+            try:
+                equals = args.pop(0)
+                # our parser works different, so we have to stop this
+                if equals != "=":
+                    raise RuntimeError("Token not allowed")
+                expanded = args.pop(0) if args else ""  # this is how it works in bash
+                self._runtime_aliases[alias_name] = expanded
+            except IndexError:
+                if alias_name in self._runtime_aliases:
+                    print(f"alias {alias_name}={self._runtime_aliases[alias_name]}")
+                else:
+                    print(f"alias {alias_name} not found")
+                pass
+
+        return False
+
     def do_clear(self, line: str) -> bool:
         """clear the terminal screen"""
         os.system("cls||clear")

{dissect_target-3.20.dev13 → dissect_target-3.20.dev15/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.20.dev13
+Version: 3.20.dev15
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.20.dev13 → dissect_target-3.20.dev15}/tests/plugins/filesystem/ntfs/test_mft.py

@@ -183,16 +183,28 @@ def test_mft_plugin_macb(target_win: Target) -> None:
     path = None
     ts = None
     macb = None
-    field = "MACB/MACB/MACB"
+    field = "MACB/MACB"
     for record in mft_data:
         assert record.macb != macb or record.ts != ts or record.path != path
-        for bit in [0, 1, 2, 3, 5, 6, 7, 9, 10, 11, 12]:
+        for bit in [0, 1, 2, 3, 5, 6, 7]:
             assert record.macb[bit : bit + 1] in (field[bit : bit + 1], ".")
         path = record.path
         macb = record.macb
         ts = record.ts
 
 
+def test_mft_plugin_macb_ads(target_win: Target) -> None:
+    load_mft_plugin(target_win)
+    mft_data = list(target_win.mft(macb=True))
+    ads_entries = 0
+    for record in mft_data:
+        if record.ads:
+            ads_entries += 1
+            assert record.macb.endswith("/....")
+            assert not record.macb.startswith("..../")
+    assert ads_entries == 6
+
+
 def test_mft_plugin_macb_nodup() -> None:
     # test whether you can never have duplicates
 

{dissect_target-3.20.dev13 → dissect_target-3.20.dev15}/tests/tools/test_shell.py

@@ -270,3 +270,51 @@ def test_shell_cmd_alias(monkeypatch: pytest.MonkeyPatch, capsys: pytest.Capture
     ls_la_out, _ = run_target_shell(monkeypatch, capsys, target_path, "ls -la")
     ll_out, _ = run_target_shell(monkeypatch, capsys, target_path, "ll")
     assert ls_la_out == ll_out
+
+
+def test_shell_cmd_alias_runtime(monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture) -> None:
+    """test if alias commands call their parent attribute correctly."""
+    target_path = absolute_path("_data/tools/info/image.tar")
+
+    # 'list' and 'ls' should return the same output after runtime aliasing
+    list_out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias list=ls xxl='ls -la'\nlist")
+    sys.stdout.flush()
+    ls_out, _ = run_target_shell(monkeypatch, capsys, target_path, "ls")
+    assert list_out == "ubuntu:/$ " + ls_out
+
+    # list aliases
+    sys.stdout.flush()
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias")
+    assert out == "ubuntu:/$ alias list=ls\nalias xxl=ls -la\nubuntu:/$ \n"
+
+    # list single aliases
+    sys.stdout.flush()
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias list")
+    assert out == "ubuntu:/$ alias list=ls\nubuntu:/$ \n"
+
+    # unalias
+    sys.stdout.flush()
+    run_target_shell(monkeypatch, capsys, target_path, "unalias xxl")
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias")
+    assert out == "ubuntu:/$ alias list=ls\nubuntu:/$ \n"
+
+    # unalias multiple and non-existant
+    sys.stdout.flush()
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "unalias list abc")
+    assert out == "ubuntu:/$ alias abc not found\nubuntu:/$ \n"
+
+    # alias multiple broken - b will be empty
+    sys.stdout.flush()
+    run_target_shell(monkeypatch, capsys, target_path, "alias a=1 b=")
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias")
+    assert out == "ubuntu:/$ alias a=1\nalias b=\nubuntu:/$ \n"
+
+    # alias set/get mixed
+    sys.stdout.flush()
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias b=1 a")
+    assert out == "ubuntu:/$ alias a=1\nubuntu:/$ \n"
+
+    # alias with other symbols not allowed due to parser difference
+    sys.stdout.flush()
+    out, _ = run_target_shell(monkeypatch, capsys, target_path, "alias b+1")
+    assert out.find("*** Unhandled error: Token not allowed") > -1