dissect.squashfs 1.9.dev2__tar.gz → 1.10.dev2__tar.gz

dissect_squashfs-1.10.dev2/.gitattributes

@@ -0,0 +1 @@
+tests/_data/** filter=lfs diff=lfs merge=lfs -text

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.squashfs
-Version: 1.9.dev2
+Version: 1.10.dev2
 Summary: A Dissect module implementing a parser for the SquashFS file system, commonly used in appliance or device firmware
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -26,14 +26,11 @@ Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
-Provides-Extra: lzo
-Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "lzo"
-Provides-Extra: lz4
-Requires-Dist: lz4; extra == "lz4"
 Provides-Extra: dev
 Requires-Dist: dissect.squashfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.squashfs
 
@@ -54,17 +51,10 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.squashfs
 ```
 
-This project decompresses lzo and lz4 compressed file systems and can use the faster, native (C-based) lz4 and lzo
-implementations when installed, instead of the slower pure Python implementation provided by `dissect.util`. To use
-these faster implementations, install the package with the lzo and lz4 extras:
-
-```bash
-pip install "dissect.squashfs[lz4,lzo]"
-```
-
-Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there
-
-This module including the lz4 and lzo extras is also automatically installed if you install the `dissect` package.
+This project decompresses LZO and LZ4 compressed file systems and can use a faster, native (Rust-based) LZO or LZ4 implementation,
+instead of a slower pure Python implementation. Both implementations are provided by `dissect.util`.
+Pre-build wheels are available for most common platforms and the native implementation will automatically be used if available.
+In the rare case that a pre-build wheel is not available, please refer to `dissect.util` for build instructions.
 
 ## Build and test instructions
 

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/README.md

@@ -17,17 +17,10 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.squashfs
 ```
 
-This project decompresses lzo and lz4 compressed file systems and can use the faster, native (C-based) lz4 and lzo
-implementations when installed, instead of the slower pure Python implementation provided by `dissect.util`. To use
-these faster implementations, install the package with the lzo and lz4 extras:
-
-```bash
-pip install "dissect.squashfs[lz4,lzo]"
-```
-
-Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there
-
-This module including the lz4 and lzo extras is also automatically installed if you install the `dissect` package.
+This project decompresses LZO and LZ4 compressed file systems and can use a faster, native (Rust-based) LZO or LZ4 implementation,
+instead of a slower pure Python implementation. Both implementations are provided by `dissect.util`.
+Pre-build wheels are available for most common platforms and the native implementation will automatically be used if available.
+In the rare case that a pre-build wheel is not available, please refer to `dissect.util` for build instructions.
 
 ## Build and test instructions
 

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/dissect/squashfs/c_squashfs.py

@@ -5,7 +5,8 @@ import stat
 from dissect.cstruct import cstruct
 
 squashfs_def = """
-#define SQUASHFS_MAGIC  0x73717368
+#define SQUASHFS_MAGIC          0x73717368
+#define SQUASHFS_MAGIC_SWAP     0x68737173
 
 /* size of metadata (inode and directory) blocks */
 #define SQUASHFS_METADATA_SIZE  8192

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/dissect/squashfs/squashfs.py

@@ -33,6 +33,9 @@ class SquashFS:
 
         sb = c_squashfs.squashfs_super_block(fh)
         if sb.s_magic != c_squashfs.SQUASHFS_MAGIC:
+            if sb.s_magic == c_squashfs.SQUASHFS_MAGIC_SWAP:
+                raise NotImplementedError("Unsupported squashfs pre-4.0 big-endian filesystem")
+
             raise ValueError("Invalid squashfs superblock")
 
         # Only support squashfs 4.x for now

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/dissect.squashfs.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: dissect.squashfs
-Version: 1.9.dev2
+Version: 1.10.dev2
 Summary: A Dissect module implementing a parser for the SquashFS file system, commonly used in appliance or device firmware
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3
@@ -26,14 +26,11 @@ Requires-Dist: dissect.cstruct<5,>=4
 Requires-Dist: dissect.util<4,>=3
 Provides-Extra: full
 Requires-Dist: zstandard; extra == "full"
-Provides-Extra: lzo
-Requires-Dist: python-lzo; (platform_system != "Windows" or platform_python_implementation != "PyPy") and extra == "lzo"
-Provides-Extra: lz4
-Requires-Dist: lz4; extra == "lz4"
 Provides-Extra: dev
 Requires-Dist: dissect.squashfs[full]; extra == "dev"
 Requires-Dist: dissect.cstruct<5.0.dev,>=4.0.dev; extra == "dev"
 Requires-Dist: dissect.util<4.0.dev,>=3.0.dev; extra == "dev"
+Dynamic: license-file
 
 # dissect.squashfs
 
@@ -54,17 +51,10 @@ Information on the supported Python versions can be found in the Getting Started
 pip install dissect.squashfs
 ```
 
-This project decompresses lzo and lz4 compressed file systems and can use the faster, native (C-based) lz4 and lzo
-implementations when installed, instead of the slower pure Python implementation provided by `dissect.util`. To use
-these faster implementations, install the package with the lzo and lz4 extras:
-
-```bash
-pip install "dissect.squashfs[lz4,lzo]"
-```
-
-Unfortunately there is no binary `python-lzo` wheel for PyPy installations on Windows, so it won't be installed there
-
-This module including the lz4 and lzo extras is also automatically installed if you install the `dissect` package.
+This project decompresses LZO and LZ4 compressed file systems and can use a faster, native (Rust-based) LZO or LZ4 implementation,
+instead of a slower pure Python implementation. Both implementations are provided by `dissect.util`.
+Pre-build wheels are available for most common platforms and the native implementation will automatically be used if available.
+In the rare case that a pre-build wheel is not available, please refer to `dissect.util` for build instructions.
 
 ## Build and test instructions
 

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/dissect.squashfs.egg-info/SOURCES.txt

@@ -1,4 +1,5 @@
 .git-blame-ignore-revs
+.gitattributes
 COPYRIGHT
 LICENSE
 MANIFEST.in
@@ -19,13 +20,13 @@ tests/__init__.py
 tests/conftest.py
 tests/test_exceptions.py
 tests/test_squashfs.py
-tests/data/gzip-opts.sqfs
-tests/data/gzip.sqfs
-tests/data/lz4.sqfs
-tests/data/lzma.sqfs
-tests/data/lzo.sqfs
-tests/data/xz.sqfs
-tests/data/zstd.sqfs
-tests/docs/Makefile
-tests/docs/conf.py
-tests/docs/index.rst
+tests/_data/gzip-opts.sqfs
+tests/_data/gzip.sqfs
+tests/_data/lz4.sqfs
+tests/_data/lzma.sqfs
+tests/_data/lzo.sqfs
+tests/_data/xz.sqfs
+tests/_data/zstd.sqfs
+tests/_docs/Makefile
+tests/_docs/conf.py
+tests/_docs/index.rst

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/dissect.squashfs.egg-info/requires.txt

@@ -8,11 +8,3 @@ dissect.util<4.0.dev,>=3.0.dev
 
 [full]
 zstandard
-
-[lz4]
-lz4
-
-[lzo]
-
-[lzo:platform_system != "Windows" or platform_python_implementation != "PyPy"]
-python-lzo

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/pyproject.toml

@@ -39,14 +39,6 @@ repository = "https://github.com/fox-it/dissect.squashfs"
 full = [
     "zstandard",
 ]
-lzo = [
-    # There are no Windows PyPy wheels available for python-lzo
-    # So we use a pure python fallback for it.
-    "python-lzo; platform_system != 'Windows' or platform_python_implementation != 'PyPy'",
-]
-lz4 = [
-    "lz4",
-]
 dev = [
     "dissect.squashfs[full]",
     "dissect.cstruct>=4.0.dev,<5.0.dev",
@@ -98,7 +90,7 @@ select = [
 ignore = ["E203", "B904", "UP024", "ANN002", "ANN003", "ANN204", "ANN401", "SIM105", "TRY003"]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/docs/**" = ["INP001"]
+"tests/_docs/**" = ["INP001"]
 
 [tool.ruff.lint.isort]
 known-first-party = ["dissect.squashfs"]

{dissect_squashfs-1.9.dev2/tests/docs → dissect_squashfs-1.10.dev2/tests/_docs}/conf.py

@@ -1,3 +1,5 @@
+project = "dissect.squashfs"
+
 extensions = [
     "autoapi.extension",
     "sphinx.ext.autodoc",

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/tests/conftest.py

@@ -26,34 +26,34 @@ def open_file_gz(name: str, mode: str = "rb") -> Iterator[BinaryIO]:
 
 @pytest.fixture
 def gzip_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/gzip.sqfs")
+    yield from open_file("_data/gzip.sqfs")
 
 
 @pytest.fixture
 def gzip_opts_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/gzip-opts.sqfs")
+    yield from open_file("_data/gzip-opts.sqfs")
 
 
 @pytest.fixture
 def lz4_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/lz4.sqfs")
+    yield from open_file("_data/lz4.sqfs")
 
 
 @pytest.fixture
 def lzma_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/lzma.sqfs")
+    yield from open_file("_data/lzma.sqfs")
 
 
 @pytest.fixture
 def lzo_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/lzo.sqfs")
+    yield from open_file("_data/lzo.sqfs")
 
 
 @pytest.fixture
 def xz_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/xz.sqfs")
+    yield from open_file("_data/xz.sqfs")
 
 
 @pytest.fixture
 def zstd_sqfs() -> Iterator[BinaryIO]:
-    yield from open_file("data/zstd.sqfs")
+    yield from open_file("_data/zstd.sqfs")

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/tests/test_squashfs.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from io import BytesIO
+
 import pytest
 
 from dissect.squashfs.c_squashfs import c_squashfs
@@ -75,3 +77,20 @@ def test_squashfs(sqfs: str, compression_id: int, request: pytest.FixtureRequest
     sqfs = SquashFS(request.getfixturevalue(sqfs))
     assert sqfs.sb.compression == compression_id
     _verify_filesystem(sqfs)
+
+
+def test_squashfs_unsupported_bigendian_3_0() -> None:
+    """Test if we correctly detect a SquashFS 3.0 big-endian filesystem."""
+
+    # Random SquashFS version 3.0 big-endian header found on binwalk GitHub issue tracker.
+    buf = bytes.fromhex(
+        "73717368000000b60000002042010d364200bc844200339440016800000300006b0400104003004ae64f330000000000"
+        "001623000100000000001177ff8e0800000000000e303100000000000e3025000000000000000000000000000e234c00"
+    )
+
+    sb = c_squashfs.squashfs_super_block(buf)
+    assert sb.s_magic == c_squashfs.SQUASHFS_MAGIC_SWAP
+    assert sb.s_major == 0x300
+
+    with pytest.raises(NotImplementedError, match="Unsupported squashfs pre-4.0 big-endian filesystem"):
+        SquashFS(BytesIO(buf))

{dissect_squashfs-1.9.dev2 → dissect_squashfs-1.10.dev2}/tox.ini

@@ -55,12 +55,12 @@ deps =
     sphinx-design
     furo
 commands =
-    make -C tests/docs clean
-    make -C tests/docs html
+    make -C tests/_docs clean
+    make -C tests/_docs html
 
 [testenv:docs-linkcheck]
 allowlist_externals = make
 deps = {[testenv:docs-build]deps}
 commands =
-    make -C tests/docs clean
-    make -C tests/docs linkcheck
+    make -C tests/_docs clean
+    make -C tests/_docs linkcheck