dissect.target 3.21.dev9__tar.gz → 3.21.dev11__tar.gz

{dissect_target-3.21.dev9/dissect.target.egg-info → dissect_target-3.21.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.21.dev9
+Version: 3.21.dev11
 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.21.dev9 → dissect_target-3.21.dev11}/dissect/target/plugins/os/windows/catroot.py

@@ -227,8 +227,14 @@ class CatrootPlugin(Plugin):
 
                     for record in table.records():
                         file_digest = digest()
-                        setattr(file_digest, hash_type, record.get("HashCatNameTable_HashCol").hex())
-                        catroot_names = record.get("HashCatNameTable_CatNameCol").decode().rstrip("|").split("|")
+
+                        try:
+                            setattr(file_digest, hash_type, record.get("HashCatNameTable_HashCol").hex())
+                            catroot_names = record.get("HashCatNameTable_CatNameCol").decode().rstrip("|").split("|")
+                        except Exception as e:
+                            self.target.log.warning("Unable to parse catroot names for %s in %s", record, ese_file)
+                            self.target.log.debug("", exc_info=e)
+                            continue
 
                         for catroot_name in catroot_names:
                             yield CatrootRecord(

{dissect_target-3.21.dev9 → dissect_target-3.21.dev11}/dissect/target/plugins/os/windows/lnk.py

@@ -1,4 +1,6 @@
-from typing import Iterator, Optional
+from __future__ import annotations
+
+from typing import Iterator
 
 from dissect.shellitem.lnk import Lnk
 from dissect.util import ts
@@ -34,7 +36,7 @@ LnkRecord = TargetRecordDescriptor(
 )
 
 
-def parse_lnk_file(target: Target, lnk_file: Lnk, lnk_path: TargetPath) -> Iterator[LnkRecord]:
+def parse_lnk_file(target: Target, lnk_file: Lnk, lnk_path: TargetPath) -> LnkRecord:
     # we need to get the active codepage from the system to properly decode some values
     codepage = target.codepage or "ascii"
 
@@ -132,7 +134,7 @@ class LnkPlugin(Plugin):
 
     @arg("--path", "-p", dest="path", default=None, help="Path to directory or .lnk file in target")
     @export(record=LnkRecord)
-    def lnk(self, path: Optional[str] = None) -> Iterator[LnkRecord]:
+    def lnk(self, path: str | None = 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:
@@ -160,10 +162,14 @@ class LnkPlugin(Plugin):
         """
 
         for entry in self.lnk_entries(path):
-            lnk_file = Lnk(entry.open())
-            yield parse_lnk_file(self.target, lnk_file, entry)
-
-    def lnk_entries(self, path: Optional[str] = None) -> Iterator[TargetPath]:
+            try:
+                lnk_file = Lnk(entry.open())
+                yield parse_lnk_file(self.target, lnk_file, entry)
+            except Exception as e:
+                self.target.log.warning("Failed to parse link file %s", lnk_file)
+                self.target.log.debug("", exc_info=e)
+
+    def lnk_entries(self, path: str | None = None) -> Iterator[TargetPath]:
         if path:
             target_path = self.target.fs.path(path)
             if not target_path.exists():

{dissect_target-3.21.dev9 → dissect_target-3.21.dev11/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.21.dev9
+Version: 3.21.dev11
 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