dissect.evidence 3.9.dev4__tar.gz → 3.10.dev1__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.
- {dissect.evidence-3.9.dev4/dissect.evidence.egg-info → dissect_evidence-3.10.dev1}/PKG-INFO +6 -3
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/ad1.py +6 -7
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/asdf/asdf.py +6 -7
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/ewf.py +1 -2
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1/dissect.evidence.egg-info}/PKG-INFO +6 -3
- dissect_evidence-3.10.dev1/dissect.evidence.egg-info/requires.txt +6 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/pyproject.toml +6 -2
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tox.ini +1 -0
- dissect.evidence-3.9.dev4/dissect.evidence.egg-info/requires.txt +0 -2
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/COPYRIGHT +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/LICENSE +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/MANIFEST.in +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/README.md +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/__init__.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/asdf/__init__.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/asdf/streams.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/exceptions.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/__init__.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/__init__.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/dd.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/meta.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/repair.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/verify.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/SOURCES.txt +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/dependency_links.txt +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/entry_points.txt +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/top_level.txt +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/setup.cfg +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/__init__.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/conftest.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/data/ad1_long.ad1 +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/data/ad1_test.ad1 +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/data/ad1_test_compressed.ad1 +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/data/ewf.E01 +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/docs/Makefile +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/docs/conf.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/docs/index.rst +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/test_ad1.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/test_asdf.py +0 -0
- {dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/tests/test_ewf.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: dissect.evidence
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.10.dev1
|
|
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: Affero General Public License v3
|
|
@@ -22,8 +22,11 @@ Requires-Python: ~=3.9
|
|
|
22
22
|
Description-Content-Type: text/markdown
|
|
23
23
|
License-File: LICENSE
|
|
24
24
|
License-File: COPYRIGHT
|
|
25
|
-
Requires-Dist: dissect.cstruct<4.
|
|
26
|
-
Requires-Dist: dissect.util<4
|
|
25
|
+
Requires-Dist: dissect.cstruct<5,>=4.dev
|
|
26
|
+
Requires-Dist: dissect.util<4,>=3
|
|
27
|
+
Provides-Extra: dev
|
|
28
|
+
Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
|
|
29
|
+
Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
|
|
27
30
|
|
|
28
31
|
# dissect.evidence
|
|
29
32
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import zlib
|
|
2
2
|
|
|
3
|
-
from dissect import cstruct
|
|
3
|
+
from dissect.cstruct import cstruct
|
|
4
4
|
from dissect.util.stream import AlignedStream, RelativeStream
|
|
5
5
|
|
|
6
6
|
ad1_def = """
|
|
@@ -84,8 +84,7 @@ typedef struct {
|
|
|
84
84
|
char data[len];
|
|
85
85
|
} FileMeta;
|
|
86
86
|
"""
|
|
87
|
-
c_ad1 = cstruct.
|
|
88
|
-
c_ad1.load(ad1_def)
|
|
87
|
+
c_ad1 = cstruct().load(ad1_def)
|
|
89
88
|
|
|
90
89
|
EntryType = c_ad1.EntryType
|
|
91
90
|
MetaType = c_ad1.MetaType
|
|
@@ -101,7 +100,7 @@ class AD1:
|
|
|
101
100
|
self.root = self.logical_image
|
|
102
101
|
|
|
103
102
|
def __getattr__(self, k):
|
|
104
|
-
if k in self.header:
|
|
103
|
+
if k in self.header.__class__.fields:
|
|
105
104
|
return getattr(self.header, k)
|
|
106
105
|
|
|
107
106
|
return super().__getattr__(k)
|
|
@@ -152,7 +151,7 @@ class LogicalImage:
|
|
|
152
151
|
return f"<LogicalImage name={self.header.name}>"
|
|
153
152
|
|
|
154
153
|
def __getattr__(self, k):
|
|
155
|
-
if k in self.header:
|
|
154
|
+
if k in self.header.__class__.fields:
|
|
156
155
|
return getattr(self.header, k)
|
|
157
156
|
|
|
158
157
|
return object.__getattribute__(self, k)
|
|
@@ -190,7 +189,7 @@ class FileEntry:
|
|
|
190
189
|
return f"<{file_type} name={self.entry.name}>"
|
|
191
190
|
|
|
192
191
|
def __getattr__(self, k):
|
|
193
|
-
if k in self.entry:
|
|
192
|
+
if k in self.entry.__class__.fields:
|
|
194
193
|
return getattr(self.entry, k)
|
|
195
194
|
|
|
196
195
|
return object.__getattribute__(self, k)
|
|
@@ -217,7 +216,7 @@ class FileMeta:
|
|
|
217
216
|
return f"<Meta category={self.entry.category} type={self.entry.type} data={self.entry.data}>"
|
|
218
217
|
|
|
219
218
|
def __getattr__(self, k):
|
|
220
|
-
if k in self.entry:
|
|
219
|
+
if k in self.entry.__class__.fields:
|
|
221
220
|
return getattr(self.entry, k)
|
|
222
221
|
|
|
223
222
|
return object.__getattribute__(self, k)
|
|
@@ -11,7 +11,7 @@ from bisect import bisect_right
|
|
|
11
11
|
from collections import defaultdict
|
|
12
12
|
from typing import BinaryIO, Callable, Iterator, Optional
|
|
13
13
|
|
|
14
|
-
from dissect import cstruct
|
|
14
|
+
from dissect.cstruct import cstruct
|
|
15
15
|
from dissect.util import ts
|
|
16
16
|
from dissect.util.stream import AlignedStream, RangeStream
|
|
17
17
|
|
|
@@ -84,8 +84,7 @@ struct footer {
|
|
|
84
84
|
char sha256[32]; // SHA256 of this file up until this hash
|
|
85
85
|
};
|
|
86
86
|
"""
|
|
87
|
-
c_asdf = cstruct.
|
|
88
|
-
c_asdf.load(asdf_def)
|
|
87
|
+
c_asdf = cstruct().load(asdf_def)
|
|
89
88
|
|
|
90
89
|
|
|
91
90
|
class AsdfWriter(io.RawIOBase):
|
|
@@ -147,11 +146,11 @@ class AsdfWriter(io.RawIOBase):
|
|
|
147
146
|
info.uname = "root"
|
|
148
147
|
info.gname = "root"
|
|
149
148
|
|
|
150
|
-
if
|
|
149
|
+
if size is None and fh.seekable():
|
|
151
150
|
fh.seek(0, io.SEEK_END)
|
|
152
151
|
size = fh.tell()
|
|
153
152
|
|
|
154
|
-
info.size = size
|
|
153
|
+
info.size = size or 0
|
|
155
154
|
|
|
156
155
|
fh.seek(0)
|
|
157
156
|
self._meta_tar.addfile(info, fh)
|
|
@@ -586,7 +585,7 @@ class AsdfStream(AlignedStream):
|
|
|
586
585
|
return b"".join(result)
|
|
587
586
|
|
|
588
587
|
|
|
589
|
-
def scrape_blocks(fh: BinaryIO, buffer_size: int = io.DEFAULT_BUFFER_SIZE) -> Iterator[
|
|
588
|
+
def scrape_blocks(fh: BinaryIO, buffer_size: int = io.DEFAULT_BUFFER_SIZE) -> Iterator[c_asdf.block, int]:
|
|
590
589
|
"""Scrape for block headers in ``fh`` and yield parsed block headers and their offset.
|
|
591
590
|
|
|
592
591
|
Args:
|
|
@@ -616,7 +615,7 @@ def scrape_blocks(fh: BinaryIO, buffer_size: int = io.DEFAULT_BUFFER_SIZE) -> It
|
|
|
616
615
|
block_buf = fh.read(len(c_asdf.block))
|
|
617
616
|
|
|
618
617
|
# Some sanity checks that this is actually a block header
|
|
619
|
-
if block_buf[4] not in c_asdf.BLOCK_FLAG
|
|
618
|
+
if block_buf[4] not in c_asdf.BLOCK_FLAG:
|
|
620
619
|
continue
|
|
621
620
|
|
|
622
621
|
if block_buf[6:8] != b"\x00\x00":
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: dissect.evidence
|
|
3
|
-
Version: 3.
|
|
3
|
+
Version: 3.10.dev1
|
|
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: Affero General Public License v3
|
|
@@ -22,8 +22,11 @@ Requires-Python: ~=3.9
|
|
|
22
22
|
Description-Content-Type: text/markdown
|
|
23
23
|
License-File: LICENSE
|
|
24
24
|
License-File: COPYRIGHT
|
|
25
|
-
Requires-Dist: dissect.cstruct<4.
|
|
26
|
-
Requires-Dist: dissect.util<4
|
|
25
|
+
Requires-Dist: dissect.cstruct<5,>=4.dev
|
|
26
|
+
Requires-Dist: dissect.util<4,>=3
|
|
27
|
+
Provides-Extra: dev
|
|
28
|
+
Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
|
|
29
|
+
Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
|
|
27
30
|
|
|
28
31
|
# dissect.evidence
|
|
29
32
|
|
|
@@ -25,8 +25,8 @@ classifiers = [
|
|
|
25
25
|
"Topic :: Utilities",
|
|
26
26
|
]
|
|
27
27
|
dependencies = [
|
|
28
|
-
"dissect.cstruct>=
|
|
29
|
-
"dissect.util>=3
|
|
28
|
+
"dissect.cstruct>=4.dev,<5",
|
|
29
|
+
"dissect.util>=3,<4",
|
|
30
30
|
]
|
|
31
31
|
dynamic = ["version"]
|
|
32
32
|
|
|
@@ -36,6 +36,10 @@ documentation = "https://docs.dissect.tools/en/latest/projects/dissect.evidence"
|
|
|
36
36
|
repository = "https://github.com/fox-it/dissect.evidence"
|
|
37
37
|
|
|
38
38
|
[project.optional-dependencies]
|
|
39
|
+
dev = [
|
|
40
|
+
"dissect.cstruct>=4.0.dev,<5.0.dev",
|
|
41
|
+
"dissect.util>=3.0.dev,<4.0.dev",
|
|
42
|
+
]
|
|
39
43
|
|
|
40
44
|
[project.scripts]
|
|
41
45
|
asdf-dd = "dissect.evidence.tools.asdf.dd:main"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/meta.py
RENAMED
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/repair.py
RENAMED
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect/evidence/tools/asdf/verify.py
RENAMED
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/SOURCES.txt
RENAMED
|
File without changes
|
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/entry_points.txt
RENAMED
|
File without changes
|
{dissect.evidence-3.9.dev4 → dissect_evidence-3.10.dev1}/dissect.evidence.egg-info/top_level.txt
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|