dissect.evidence 3.14.dev3__tar.gz → 3.14.dev5__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/PKG-INFO +1 -1
  2. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ad1/ad1.py +28 -8
  3. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/adcrypt/adcrypt.py +1 -2
  4. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/adcrypt/stream.py +3 -0
  5. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect.evidence.egg-info/PKG-INFO +1 -1
  6. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect.evidence.egg-info/SOURCES.txt +2 -0
  7. dissect_evidence-3.14.dev5/dissect.evidence.egg-info/scm_file_list.json +104 -0
  8. dissect_evidence-3.14.dev5/dissect.evidence.egg-info/scm_version.json +8 -0
  9. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/test_ad1.py +52 -0
  10. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/.git-blame-ignore-revs +0 -0
  11. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/COPYRIGHT +0 -0
  12. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/LICENSE +0 -0
  13. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/MANIFEST.in +0 -0
  14. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/README.md +0 -0
  15. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/__init__.py +0 -0
  16. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ad1/__init__.py +0 -0
  17. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ad1/c_ad1.py +0 -0
  18. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ad1/c_ad1.pyi +0 -0
  19. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ad1/stream.py +0 -0
  20. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/adcrypt/__init__.py +0 -0
  21. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/adcrypt/c_adcrypt.py +0 -0
  22. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/adcrypt/c_adcrypt.pyi +0 -0
  23. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/asdf/__init__.py +0 -0
  24. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/asdf/asdf.py +0 -0
  25. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/asdf/c_asdf.py +0 -0
  26. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/asdf/c_asdf.pyi +0 -0
  27. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/asdf/stream.py +0 -0
  28. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ewf/__init__.py +0 -0
  29. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ewf/c_ewf.py +0 -0
  30. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ewf/c_ewf.pyi +0 -0
  31. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ewf/ewf.py +0 -0
  32. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/ewf/stream.py +0 -0
  33. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/exception.py +0 -0
  34. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/__init__.py +0 -0
  35. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/adcrypt.py +0 -0
  36. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/asdf/__init__.py +0 -0
  37. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/asdf/dd.py +0 -0
  38. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/asdf/meta.py +0 -0
  39. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/asdf/repair.py +0 -0
  40. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/asdf/verify.py +0 -0
  41. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect/evidence/tools/util.py +0 -0
  42. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect.evidence.egg-info/dependency_links.txt +0 -0
  43. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect.evidence.egg-info/entry_points.txt +0 -0
  44. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect.evidence.egg-info/requires.txt +0 -0
  45. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/dissect.evidence.egg-info/top_level.txt +0 -0
  46. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/pyproject.toml +0 -0
  47. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/setup.cfg +0 -0
  48. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/__init__.py +0 -0
  49. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/_docs/Makefile +0 -0
  50. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/_docs/__init__.py +0 -0
  51. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/_docs/conf.py +0 -0
  52. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/_docs/index.rst +0 -0
  53. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/_tools/ewf/generate.sh +0 -0
  54. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/_utils.py +0 -0
  55. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/conftest.py +0 -0
  56. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/test_asdf.py +0 -0
  57. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/test_ewf.py +0 -0
  58. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/test_exception.py +0 -0
  59. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/tools/__init__.py +0 -0
  60. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tests/tools/test_adcrypt.py +0 -0
  61. {dissect_evidence-3.14.dev3 → dissect_evidence-3.14.dev5}/tox.ini +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dissect.evidence
3
- Version: 3.14.dev3
3
+ Version: 3.14.dev5
4
4
  Summary: A Dissect module implementing a parsers for various forensic evidence file containers, currently: AD1, ASDF and EWF
5
5
  Author-email: Dissect Team <dissect@fox-it.com>
6
6
  License-Expression: AGPL-3.0-or-later
@@ -14,6 +14,9 @@ from dissect.evidence.exception import FileNotFoundError, NotADirectoryError, No
14
14
  if TYPE_CHECKING:
15
15
  from collections.abc import Iterator
16
16
  from pathlib import PurePath
17
+ from types import TracebackType
18
+
19
+ from typing_extensions import Self
17
20
 
18
21
  EntryType = c_ad1.EntryType
19
22
  MetaType = c_ad1.MetaType
@@ -53,8 +56,9 @@ class AD1:
53
56
  - https://al3ks1s.fr/posts/adventures-part-1/
54
57
  """
55
58
 
56
- def __init__(self, fh: BinaryIO | list[BinaryIO]):
57
- fhs = [fh] if not isinstance(fh, list) else fh
59
+ def __init__(self, fh: BinaryIO | list[BinaryIO] | Path | list[Path]):
60
+ fhs = find_files(fh) if isinstance(fh, Path) else [fh] if not isinstance(fh, list) else fh
61
+
58
62
  self.fh = fhs
59
63
  self.root = VirtualEntry(self, "/")
60
64
 
@@ -77,6 +81,14 @@ class AD1:
77
81
  else:
78
82
  self._open_ad1()
79
83
 
84
+ def __enter__(self) -> Self:
85
+ return self
86
+
87
+ def __exit__(
88
+ self, exc_type: type[BaseException] | None, exc_value: BaseException | None, traceback: TracebackType | None
89
+ ) -> None:
90
+ self.close()
91
+
80
92
  def is_adcrypt(self) -> bool:
81
93
  """Return whether the AD1 container is ADCRYPT encrypted."""
82
94
  return self.adcrypt is not None
@@ -91,7 +103,7 @@ class AD1:
91
103
  Implements a simple LRU cache to limit the number of open segments.
92
104
 
93
105
  Args:
94
- idx: Index or URI of the segment to open.
106
+ idx: Index of the segment to open.
95
107
  """
96
108
  # Poor mans LRU
97
109
  if idx in self._segments:
@@ -103,21 +115,20 @@ class AD1:
103
115
  oldest_idx = self._segment_lru.pop(0)
104
116
  oldest_segment = self._segments.pop(oldest_idx)
105
117
 
106
- # Don't close it if we received it as a file-like object
107
- if not hasattr(self.fh[oldest_idx], "read"):
118
+ # Only close file handles that we opened ourselves
119
+ if isinstance(self.fh[oldest_idx], Path):
108
120
  oldest_segment.fh.close()
109
121
 
110
122
  del oldest_segment
111
123
 
112
124
  fh = self.fh[idx]
113
- if not hasattr(fh, "read"):
114
- fh = fh.open("rb") if isinstance(fh, Path) else Path(fh).open("rb") # noqa: SIM115
125
+ if isinstance(fh, Path):
126
+ fh = fh.open("rb")
115
127
 
116
128
  if self.is_adcrypt() and not self.is_locked():
117
129
  fh = self.adcrypt.wrap(fh, idx)
118
130
 
119
131
  segment = SegmentFile(fh)
120
-
121
132
  self._segments[idx] = segment
122
133
  self._segment_lru.append(idx)
123
134
 
@@ -210,6 +221,15 @@ class AD1:
210
221
  """Shortcut for ``AD1.entry(path).open()``."""
211
222
  return self.entry(path).open()
212
223
 
224
+ def close(self) -> None:
225
+ """Close all segment file handles that we opened ourselves and clear the segment cache."""
226
+ for idx, segment in self._segments.items():
227
+ if isinstance(self.fh[idx], Path):
228
+ segment.fh.close()
229
+
230
+ self._segments = {}
231
+ self._segment_lru = []
232
+
213
233
 
214
234
  def _hallicinate_root_entries(ad1: AD1) -> None:
215
235
  # We need to create some fake entries for all parts leading up to `logical_image.name`
@@ -10,7 +10,6 @@ from dissect.evidence.adcrypt.stream import ADCryptStream
10
10
 
11
11
  try:
12
12
  from Crypto.Cipher import AES, PKCS1_v1_5
13
- from Crypto.Protocol.KDF import PBKDF2
14
13
  from Crypto.PublicKey import RSA
15
14
  from Crypto.Util import Counter
16
15
 
@@ -149,4 +148,4 @@ def adcrypt_kdf(
149
148
  if not (derived_salt := PKCS1_v1_5.new(rsa_key).decrypt(salt, sentinel=None, expected_pt_len=16)):
150
149
  raise ValueError("Failed to decrypt salt using provided private key")
151
150
 
152
- return PBKDF2(passphrase_hash, derived_salt, key_len, count)
151
+ return hashlib.pbkdf2_hmac("sha1", passphrase_hash, derived_salt, count, key_len)
@@ -38,3 +38,6 @@ class ADCryptStream(AlignedStream):
38
38
  )
39
39
  cipher = AES.new(self.key, AES.MODE_CTR, counter=ctr)
40
40
  return cipher.decrypt(buf)
41
+
42
+ def close(self) -> None:
43
+ self.fh.close()
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: dissect.evidence
3
- Version: 3.14.dev3
3
+ Version: 3.14.dev5
4
4
  Summary: A Dissect module implementing a parsers for various forensic evidence file containers, currently: AD1, ASDF and EWF
5
5
  Author-email: Dissect Team <dissect@fox-it.com>
6
6
  License-Expression: AGPL-3.0-or-later
@@ -10,6 +10,8 @@ dissect.evidence.egg-info/SOURCES.txt
10
10
  dissect.evidence.egg-info/dependency_links.txt
11
11
  dissect.evidence.egg-info/entry_points.txt
12
12
  dissect.evidence.egg-info/requires.txt
13
+ dissect.evidence.egg-info/scm_file_list.json
14
+ dissect.evidence.egg-info/scm_version.json
13
15
  dissect.evidence.egg-info/top_level.txt
14
16
  dissect/evidence/__init__.py
15
17
  dissect/evidence/exception.py
@@ -0,0 +1,104 @@
1
+ {
2
+ "files": [
3
+ ".git-blame-ignore-revs",
4
+ ".gitattributes",
5
+ ".github/pull_request_template.md",
6
+ ".github/workflows/dissect-ci.yml",
7
+ ".gitignore",
8
+ "COPYRIGHT",
9
+ "LICENSE",
10
+ "MANIFEST.in",
11
+ "README.md",
12
+ "dissect/evidence/__init__.py",
13
+ "dissect/evidence/ad1/__init__.py",
14
+ "dissect/evidence/ad1/ad1.py",
15
+ "dissect/evidence/ad1/c_ad1.py",
16
+ "dissect/evidence/ad1/c_ad1.pyi",
17
+ "dissect/evidence/ad1/stream.py",
18
+ "dissect/evidence/adcrypt/__init__.py",
19
+ "dissect/evidence/adcrypt/adcrypt.py",
20
+ "dissect/evidence/adcrypt/c_adcrypt.py",
21
+ "dissect/evidence/adcrypt/c_adcrypt.pyi",
22
+ "dissect/evidence/adcrypt/stream.py",
23
+ "dissect/evidence/asdf/__init__.py",
24
+ "dissect/evidence/asdf/asdf.py",
25
+ "dissect/evidence/asdf/c_asdf.py",
26
+ "dissect/evidence/asdf/c_asdf.pyi",
27
+ "dissect/evidence/asdf/stream.py",
28
+ "dissect/evidence/ewf/__init__.py",
29
+ "dissect/evidence/ewf/c_ewf.py",
30
+ "dissect/evidence/ewf/c_ewf.pyi",
31
+ "dissect/evidence/ewf/ewf.py",
32
+ "dissect/evidence/ewf/stream.py",
33
+ "dissect/evidence/exception.py",
34
+ "dissect/evidence/tools/__init__.py",
35
+ "dissect/evidence/tools/adcrypt.py",
36
+ "dissect/evidence/tools/asdf/__init__.py",
37
+ "dissect/evidence/tools/asdf/dd.py",
38
+ "dissect/evidence/tools/asdf/meta.py",
39
+ "dissect/evidence/tools/asdf/repair.py",
40
+ "dissect/evidence/tools/asdf/verify.py",
41
+ "dissect/evidence/tools/util.py",
42
+ "pyproject.toml",
43
+ "tests/__init__.py",
44
+ "tests/_data/ad1/compressed.ad1",
45
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad1",
46
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad1.csv",
47
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad1.txt",
48
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad2",
49
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad3",
50
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad4",
51
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad5",
52
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad6",
53
+ "tests/_data/ad1/encrypted-certificate/encrypted.ad7",
54
+ "tests/_data/ad1/encrypted-certificate/key",
55
+ "tests/_data/ad1/encrypted-certificate/key.pub",
56
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad1",
57
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad1.csv",
58
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad1.txt",
59
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad10",
60
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad11",
61
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad12",
62
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad13",
63
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad2",
64
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad3",
65
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad4",
66
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad5",
67
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad6",
68
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad7",
69
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad8",
70
+ "tests/_data/ad1/encrypted-passphrase/encrypted.ad9",
71
+ "tests/_data/ad1/long.ad1",
72
+ "tests/_data/ad1/pcbje/text-and-pictures.ad1",
73
+ "tests/_data/ad1/pcbje/text-and-pictures.ad1.txt",
74
+ "tests/_data/ad1/pcbje/text-and-pictures.ad2",
75
+ "tests/_data/ad1/pcbje/text-and-pictures.ad3",
76
+ "tests/_data/ad1/pcbje/text-and-pictures.ad4",
77
+ "tests/_data/ad1/test.ad1",
78
+ "tests/_data/ewf/encrypted-certificate/encrypted.E01",
79
+ "tests/_data/ewf/encrypted-certificate/encrypted.E01.txt",
80
+ "tests/_data/ewf/encrypted-certificate/key",
81
+ "tests/_data/ewf/encrypted-passphrase/encrypted.E01",
82
+ "tests/_data/ewf/encrypted-passphrase/encrypted.E01.txt",
83
+ "tests/_data/ewf/segmented/image.E01",
84
+ "tests/_data/ewf/segmented/image.E02",
85
+ "tests/_data/ewf/segmented/image.E03",
86
+ "tests/_data/ewf/segmented/image.E04",
87
+ "tests/_data/ewf/segmented/image.E05",
88
+ "tests/_data/ewf/single/image.E01",
89
+ "tests/_docs/Makefile",
90
+ "tests/_docs/__init__.py",
91
+ "tests/_docs/conf.py",
92
+ "tests/_docs/index.rst",
93
+ "tests/_tools/ewf/generate.sh",
94
+ "tests/_utils.py",
95
+ "tests/conftest.py",
96
+ "tests/test_ad1.py",
97
+ "tests/test_asdf.py",
98
+ "tests/test_ewf.py",
99
+ "tests/test_exception.py",
100
+ "tests/tools/__init__.py",
101
+ "tests/tools/test_adcrypt.py",
102
+ "tox.ini"
103
+ ]
104
+ }
@@ -0,0 +1,8 @@
1
+ {
2
+ "tag": "3.13",
3
+ "distance": 5,
4
+ "node": "g3bd6b41884194f2675e5d71aa4dda1082db4bf64",
5
+ "dirty": true,
6
+ "branch": "main",
7
+ "node_date": "2026-11-19"
8
+ }
@@ -165,6 +165,58 @@ def test_ad1_segmented(ad1_segmented: list[Path]) -> None:
165
165
  assert hashlib.sha1(buf).hexdigest() == "9c3dcb1f9185a314ea25d51aed3b5881b32f420c"
166
166
 
167
167
 
168
+ def test_ad1_segmented_find_files(ad1_segmented: list[Path]) -> None:
169
+ """Test that providing a single segment file finds all segments in the same directory."""
170
+ fs = ad1.AD1(ad1_segmented[0])
171
+
172
+ assert fs.fh == ad1_segmented
173
+
174
+
175
+ def test_ad1_close_with_fh(ad1_basic: BinaryIO) -> None:
176
+ """Verify that AD1 does not close file-like objects passed to it."""
177
+ fs = ad1.AD1(ad1_basic)
178
+ assert len(fs._segments) == 1
179
+ assert fs._segment_lru == [0]
180
+
181
+ fs.close()
182
+ assert fs._segments == {}
183
+ assert fs._segment_lru == []
184
+
185
+ # The file-like object passed to AD1 should not be closed by AD1
186
+ assert not ad1_basic.closed
187
+
188
+
189
+ def test_ad1_close_with_paths(ad1_segmented: list[Path]) -> None:
190
+ """Verify that AD1 closes file handles opened from paths."""
191
+ fs = ad1.AD1(ad1_segmented)
192
+
193
+ num_segments = len(fs._segments)
194
+ assert num_segments > 0
195
+
196
+ # Store references to all file handles
197
+ fhs = [fs._segments[idx].fh for idx in range(num_segments)]
198
+
199
+ fs.close()
200
+
201
+ # Verify all file handles are closed
202
+ for fh in fhs:
203
+ assert fh.closed
204
+ assert fs._segments == {}
205
+ assert fs._segment_lru == []
206
+
207
+
208
+ def test_ad1_context_manager_with_fh(ad1_basic: BinaryIO) -> None:
209
+ """Verify context manager closes AD1 but not the file-like object passed to it."""
210
+ with ad1.AD1(ad1_basic) as fs:
211
+ assert isinstance(fs, ad1.AD1)
212
+
213
+ assert fs._segments == {}
214
+ assert fs._segment_lru == []
215
+
216
+ # The file-like object should not be closed by AD1's context manager
217
+ assert not ad1_basic.closed
218
+
219
+
168
220
  def test_adcrypt_passphrase(ad1_encrypted_passphrase: list[Path]) -> None:
169
221
  """Test if we can decrypt ADCRYPT AD1 images, in this example a segmented AD1 logical image."""
170
222
  fs = ad1.AD1(ad1_encrypted_passphrase)