dissect.target 3.18.dev8__tar.gz → 3.18.dev9__tar.gz

{dissect_target-3.18.dev8/dissect.target.egg-info → dissect_target-3.18.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.18.dev8
+Version: 3.18.dev9
 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.18.dev8 → dissect_target-3.18.dev9}/dissect/target/filesystem.py

@@ -6,7 +6,6 @@ import logging
 import os
 import pathlib
 import stat
-import warnings
 from collections import defaultdict
 from typing import TYPE_CHECKING, Any, BinaryIO, Callable, Iterator, Optional, Type
 
@@ -67,15 +66,6 @@ class Filesystem:
     def __repr__(self) -> str:
         return f"<{self.__class__.__name__}>"
 
-    @classmethod
-    @property
-    def __fstype__(cls) -> str:
-        warnings.warn(
-            "The __fstype__ attribute is deprecated and will be removed in dissect.target 3.15. Use __type__ instead",
-            category=DeprecationWarning,
-        )
-        return cls.__type__
-
     def path(self, *args) -> fsutil.TargetPath:
         """Instantiate a new path-like object on this filesystem."""
         return fsutil.TargetPath(self, *args)

dissect_target-3.18.dev9/dissect/target/helpers/hashutil.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+import hashlib
+from typing import TYPE_CHECKING, BinaryIO, Union
+
+if TYPE_CHECKING:
+    from hashlib._hashlib import HASH
+
+BUFFER_SIZE = 32768
+
+
+def _hash(fh: BinaryIO, ctx: Union[HASH, list[HASH]]) -> tuple[str]:
+    if not isinstance(ctx, list):
+        ctx = [ctx]
+
+    ctx = [c() for c in ctx]
+    data = fh.read(BUFFER_SIZE)
+    while data:
+        [c.update(data) for c in ctx]
+        data = fh.read(BUFFER_SIZE)
+
+    return tuple(c.hexdigest() for c in ctx)
+
+
+def md5(fh: BinaryIO) -> tuple[str]:
+    return _hash(fh, hashlib.md5)[0]
+
+
+def sha1(fh: BinaryIO) -> tuple[str]:
+    return _hash(fh, hashlib.sha1)[0]
+
+
+def sha256(fh: BinaryIO) -> tuple[str]:
+    return _hash(fh, hashlib.sha256)[0]
+
+
+def common(fh: BinaryIO) -> tuple[str]:
+    return _hash(fh, [hashlib.md5, hashlib.sha1, hashlib.sha256])
+
+
+def custom(fh: BinaryIO, algos: list[Union[str, HASH]]) -> tuple[str]:
+    if isinstance(algos[0], str):
+        ctx = [getattr(hashlib, h) for h in algos]
+    else:
+        ctx = algos
+
+    return _hash(fh, ctx)

{dissect_target-3.18.dev8 → dissect_target-3.18.dev9/dissect.target.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dissect.target
-Version: 3.18.dev8
+Version: 3.18.dev9
 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.18.dev9/tests/helpers/test_hashutil.py

@@ -0,0 +1,28 @@
+from pathlib import Path
+
+import pytest
+
+import dissect.target.helpers.hashutil as hashutil
+from dissect.target import Target
+
+HASHES = ("CAFEF00D" * 4, "F4CEF001" * 5, "DEADBEEF" * 8)
+
+
+@pytest.fixture
+def mock_target(target_win) -> Target:
+    target_win.fs.hash = lambda path: HASHES
+    target_win.resolve = lambda path: Path(path)
+    return target_win
+
+
+def resolve_func(resolvable_path: str) -> str:
+    return Path(f"/resolved{resolvable_path}")
+
+
+def test_common() -> None:
+    fh = open(__file__, "rb")
+    output = hashutil.common(fh)
+
+    assert len(output[0]) == 32
+    assert len(output[1]) == 40
+    assert len(output[2]) == 64

dissect_target-3.18.dev8/dissect/target/helpers/hashutil.py

@@ -1,87 +0,0 @@
-from __future__ import annotations
-
-import hashlib
-import warnings
-from typing import TYPE_CHECKING, BinaryIO, Union
-
-from flow.record import Record
-
-from dissect.target.exceptions import FileNotFoundError
-
-if TYPE_CHECKING:
-    from hashlib._hashlib import HASH
-
-    from dissect.target.target import Target
-
-BUFFER_SIZE = 32768
-
-
-def _hash(fh: BinaryIO, ctx: Union[HASH, list[HASH]]) -> tuple[str]:
-    if not isinstance(ctx, list):
-        ctx = [ctx]
-
-    ctx = [c() for c in ctx]
-    data = fh.read(BUFFER_SIZE)
-    while data:
-        [c.update(data) for c in ctx]
-        data = fh.read(BUFFER_SIZE)
-
-    return tuple(c.hexdigest() for c in ctx)
-
-
-def md5(fh: BinaryIO) -> tuple[str]:
-    return _hash(fh, hashlib.md5)[0]
-
-
-def sha1(fh: BinaryIO) -> tuple[str]:
-    return _hash(fh, hashlib.sha1)[0]
-
-
-def sha256(fh: BinaryIO) -> tuple[str]:
-    return _hash(fh, hashlib.sha256)[0]
-
-
-def common(fh: BinaryIO) -> tuple[str]:
-    return _hash(fh, [hashlib.md5, hashlib.sha1, hashlib.sha256])
-
-
-def custom(fh: BinaryIO, algos: list[Union[str, HASH]]) -> tuple[str]:
-    if isinstance(algos[0], str):
-        ctx = [getattr(hashlib, h) for h in algos]
-    else:
-        ctx = algos
-
-    return _hash(fh, ctx)
-
-
-def hash_uri(target: Target, path: str) -> tuple[str, str]:
-    """Hash the target path."""
-    warnings.warn(
-        (
-            "The hash_uri() function is deprecated, and will be removed in dissect.target 3.15. "
-            "Use target.fs.hash() instead"
-        ),
-        DeprecationWarning,
-    )
-
-    if path is None:
-        raise FileNotFoundError()
-
-    path = str(target.resolve(path))
-    return (path, target.fs.hash(path))
-
-
-def hash_uri_records(target: Target, record: Record) -> Record:
-    """Hash uri paths inside the record."""
-
-    from dissect.target.helpers.record_modifier import Modifier, get_modifier_function
-
-    warnings.warn(
-        (
-            "The hash_uri_records() function is deprecated, and will be removed in dissect.target 3.15. "
-            "Use hash_path_records() instead"
-        ),
-        DeprecationWarning,
-    )
-    func = get_modifier_function(Modifier.HASH)
-    return func(target, record)

dissect_target-3.18.dev8/tests/helpers/test_hashutil.py

@@ -1,59 +0,0 @@
-from pathlib import Path
-from unittest.mock import Mock, patch
-
-import pytest
-
-import dissect.target.helpers.hashutil as hashutil
-from dissect.target import Target
-from dissect.target.exceptions import FileNotFoundError
-
-HASHES = ("CAFEF00D" * 4, "F4CEF001" * 5, "DEADBEEF" * 8)
-
-
-@pytest.fixture
-def mock_target(target_win) -> Target:
-    target_win.fs.hash = lambda path: HASHES
-    target_win.resolve = lambda path: Path(path)
-    return target_win
-
-
-def resolve_func(resolvable_path: str) -> str:
-    return Path(f"/resolved{resolvable_path}")
-
-
-def test_common() -> None:
-    fh = open(__file__, "rb")
-    output = hashutil.common(fh)
-
-    assert len(output[0]) == 32
-    assert len(output[1]) == 40
-    assert len(output[2]) == 64
-
-
-def test_hash_uri_records() -> None:
-    with pytest.deprecated_call():
-        with patch("dissect.target.helpers.record_modifier.get_modifier_function", autospec=True) as modifier_func:
-            target = Mock()
-            record = Mock()
-            hashutil.hash_uri_records(target, record)
-            modifier_func.assert_called_with("hash")
-            modifier_func.return_value(target, record)
-
-
-def test_hash_uri(mock_target: Target) -> None:
-    """Determine hash functions"""
-    path = "/test/path"
-    with (
-        pytest.deprecated_call(),
-        patch.object(mock_target, "resolve", side_effect=resolve_func),
-    ):
-        output = hashutil.hash_uri(mock_target, path)
-
-    assert output[0] == str(resolve_func(path))
-    assert output[1] == HASHES
-
-
-def test_hash_uri_none() -> None:
-    """Determine hash functions"""
-    with pytest.deprecated_call(), pytest.raises(FileNotFoundError):
-        hashutil.hash_uri(Mock(), None)