dissect.target 3.19.dev16__tar.gz → 3.19.dev17__tar.gz

{dissect_target-3.19.dev16/dissect.target.egg-info → dissect_target-3.19.dev17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev16
+Version: 3.19.dev17
 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.19.dev16 → dissect_target-3.19.dev17}/dissect/target/plugins/os/windows/lnk.py

@@ -45,9 +45,9 @@ class LnkPlugin(Plugin):
                 return None
         raise UnsupportedPluginError("No folders containing link files found")
 
-    @arg("--directory", "-d", dest="directory", default=None, help="Path to .lnk file in target")
+    @arg("--path", "-p", dest="path", default=None, help="Path to directory or .lnk file in target")
     @export(record=LnkRecord)
-    def lnk(self, directory: Optional[str] = None) -> Iterator[LnkRecord]:
+    def lnk(self, path: Optional[str] = None) -> Iterator[LnkRecord]:
         """Parse all .lnk files in /ProgramData, /Users, and /Windows or from a specified path in record format.
 
         Yields a LnkRecord record with the following fields:
@@ -77,7 +77,7 @@ class LnkPlugin(Plugin):
         # we need to get the active codepage from the system to properly decode some values
         codepage = self.target.codepage or "ascii"
 
-        for entry in self.lnk_entries(directory):
+        for entry in self.lnk_entries(path):
             lnk_file = Lnk(entry.open())
             lnk_net_name = lnk_device_name = None
 
@@ -168,7 +168,15 @@ class LnkPlugin(Plugin):
 
     def lnk_entries(self, path: Optional[str] = None) -> Iterator[TargetPath]:
         if path:
-            yield self.target.fs.path(path)
+            target_path = self.target.fs.path(path)
+            if not target_path.exists():
+                self.target.log.error("Provided path %s does not exist on target", target_path)
+                return
+
+            if target_path.is_file():
+                yield target_path
+            else:
+                yield from target_path.rglob("*.lnk")
         else:
             for folder in self.folders:
                 yield from self.target.fs.path("sysvol").joinpath(folder).rglob("*.lnk")

{dissect_target-3.19.dev16 → dissect_target-3.19.dev17/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.19.dev16
+Version: 3.19.dev17
 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.19.dev17/tests/plugins/os/windows/test_lnk.py

@@ -0,0 +1,50 @@
+from typing import Optional
+
+import pytest
+from flow.record.fieldtypes import datetime
+
+from dissect.target.plugins.os.windows.lnk import LnkPlugin, LnkRecord
+from tests._utils import absolute_path
+
+
+@pytest.mark.parametrize(
+    "path, error",
+    [
+        pytest.param(None, False, id="No directory provided"),
+        pytest.param("sysvol/users/", False, id="Directory provided"),
+        pytest.param("sysvol/users/pestudio.lnk", False, id="File provided"),
+        pytest.param("sysvol/users/non-existing.lnk", True, id="Non-existing file provided"),
+    ],
+)
+def test_lnk(target_win, fs_win, path: Optional[str], error: bool, caplog):
+    lnk_file = absolute_path("_data/plugins/os/windows/lnk/pestudio.lnk")
+    fs_win.map_file("Users/pestudio.lnk", lnk_file)
+
+    target_win.add_plugin(LnkPlugin)
+
+    records = list(target_win.lnk(path))
+
+    if error:
+        assert caplog.records[-1].levelname == "ERROR"
+        assert len(records) == 0
+    else:
+        assert len(records) == 1
+
+        record = records[0]
+
+        assert isinstance(record, type(LnkRecord()))
+        assert str(record.lnk_path) == "sysvol\\users\\pestudio.lnk"
+        assert record.lnk_name is None
+        assert str(record.lnk_relativepath) == "pestudio.exe"
+        assert str(record.lnk_workdir) == "C:\\Program Files\\pestudio"
+        assert record.lnk_arguments is None
+        assert record.lnk_iconlocation is None
+        assert record.local_base_path == "C:\\Program Files\\pestudio\\pestudio.exe"
+        assert record.common_path_suffix == ""
+        assert record.lnk_net_name is None
+        assert record.lnk_device_name is None
+        assert str(record.lnk_full_path) == "C:\\Program Files\\pestudio\\pestudio.exe"
+        assert record.machine_id == "desktop-i2purd1"
+        assert record.target_mtime == datetime("2021-10-09T07:24:42+00:00")
+        assert record.target_atime == datetime("2021-10-16T15:26:55.033125+00:00")
+        assert record.target_ctime == datetime("2021-10-16T15:26:20.406921+00:00")

dissect_target-3.19.dev16/tests/plugins/os/windows/test_lnk.py

@@ -1,34 +0,0 @@
-from flow.record.fieldtypes import datetime
-
-from dissect.target.plugins.os.windows.lnk import LnkPlugin, LnkRecord
-from tests._utils import absolute_path
-
-
-def test_lnk(target_win, fs_win):
-    lnk_file = absolute_path("_data/plugins/os/windows/lnk/pestudio.lnk")
-    fs_win.map_file("Users/pestudio.lnk", lnk_file)
-
-    target_win.add_plugin(LnkPlugin)
-
-    records = list(target_win.lnk(None))
-
-    assert len(records) == 1
-
-    record = records[0]
-
-    assert isinstance(record, type(LnkRecord()))
-    assert str(record.lnk_path) == "sysvol\\users\\pestudio.lnk"
-    assert record.lnk_name is None
-    assert str(record.lnk_relativepath) == "pestudio.exe"
-    assert str(record.lnk_workdir) == "C:\\Program Files\\pestudio"
-    assert record.lnk_arguments is None
-    assert record.lnk_iconlocation is None
-    assert record.local_base_path == "C:\\Program Files\\pestudio\\pestudio.exe"
-    assert record.common_path_suffix == ""
-    assert record.lnk_net_name is None
-    assert record.lnk_device_name is None
-    assert str(record.lnk_full_path) == "C:\\Program Files\\pestudio\\pestudio.exe"
-    assert record.machine_id == "desktop-i2purd1"
-    assert record.target_mtime == datetime("2021-10-09T07:24:42+00:00")
-    assert record.target_atime == datetime("2021-10-16T15:26:55.033125+00:00")
-    assert record.target_ctime == datetime("2021-10-16T15:26:20.406921+00:00")