rust-map-parser 0.1.1__tar.gz → 0.1.3__tar.gz

{rust_map_parser-0.1.1/src/rust_map_parser.egg-info → rust_map_parser-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rust-map-parser
-Version: 0.1.1
+Version: 0.1.3
 Summary: Standalone Python parser, heatmap generator, and renderer for Facepunch Rust map files
 Author: rust-map-parser contributors
 License-Expression: MIT
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: lz4==4.4.4
 Requires-Dist: numpy<3,>=2.0
-Requires-Dist: Pillow<13,>=11
+Requires-Dist: Pillow<13,>=12.2
 Requires-Dist: numba<1,>=0.61
 Provides-Extra: assets
 Requires-Dist: UnityPy==1.24.2; extra == "assets"

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rust-map-parser"
-version = "0.1.1"
+version = "0.1.3"
 description = "Standalone Python parser, heatmap generator, and renderer for Facepunch Rust map files"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -21,7 +21,7 @@ classifiers = [
 dependencies = [
   "lz4==4.4.4",
   "numpy>=2.0,<3",
-  "Pillow>=11,<13",
+  "Pillow>=12.2,<13",
   "numba>=0.61,<1",
 ]
 
@@ -43,3 +43,6 @@ where = ["src"]
 [tool.setuptools.package-data]
 "rustmap.data" = ["*.json"]
 "rustmap.data.tunnel_tiles" = ["*.json", "*.png"]
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3/src/rust_map_parser.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rust-map-parser
-Version: 0.1.1
+Version: 0.1.3
 Summary: Standalone Python parser, heatmap generator, and renderer for Facepunch Rust map files
 Author: rust-map-parser contributors
 License-Expression: MIT
@@ -18,7 +18,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: lz4==4.4.4
 Requires-Dist: numpy<3,>=2.0
-Requires-Dist: Pillow<13,>=11
+Requires-Dist: Pillow<13,>=12.2
 Requires-Dist: numba<1,>=0.61
 Provides-Extra: assets
 Requires-Dist: UnityPy==1.24.2; extra == "assets"

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3}/src/rust_map_parser.egg-info/SOURCES.txt

@@ -125,6 +125,7 @@ tests/test_exporter.py
 tests/test_map_tiles.py
 tests/test_monuments.py
 tests/test_no_build.py
+tests/test_parser_security.py
 tests/test_png_metadata.py
 tests/test_populations.py
 tests/test_renderer_water.py

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3}/src/rust_map_parser.egg-info/requires.txt

@@ -1,6 +1,6 @@
 lz4==4.4.4
 numpy<3,>=2.0
-Pillow<13,>=11
+Pillow<13,>=12.2
 numba<1,>=0.61
 
 [assets]

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3}/src/rustmap/__init__.py

@@ -41,4 +41,4 @@ __all__ = (
     "refresh_monument_metadata",
 )
 
-__version__ = "0.1.1"
+__version__ = "0.1.3"

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3}/src/rustmap/parser.py

@@ -16,6 +16,15 @@ from typing import Iterator
 import lz4.block
 
 
+# Rust currently writes one-megabyte legacy LZ4 chunks and normal procedural
+# maps decode to well below 1 GiB. Bound attacker-controlled length fields
+# before allocating so a corrupt/untrusted map cannot cause unbounded memory or
+# CPU consumption.
+MAX_LZ4_CHUNK_BYTES = 16 * 1024 * 1024
+MAX_DECOMPRESSED_MAP_BYTES = 1024 * 1024 * 1024
+MAX_LZ4_CHUNKS = 4096
+
+
 class RustMapError(ValueError):
     """Raised when a map is truncated, corrupt, or unsupported."""
 
@@ -237,12 +246,20 @@ def _read_stream_varint(stream, *, allow_eof: bool = False) -> int | None:
 
 def _decompress_legacy_lz4(stream) -> bytearray:
     output = bytearray()
+    chunk_count = 0
     while True:
         flags = _read_stream_varint(stream, allow_eof=True)
         if flags is None:
             break
+        chunk_count += 1
+        if chunk_count > MAX_LZ4_CHUNKS:
+            raise RustMapError("Legacy LZ4 stream contains too many chunks")
         original_length = _read_stream_varint(stream)
         assert original_length is not None
+        if original_length > MAX_LZ4_CHUNK_BYTES:
+            raise RustMapError("Legacy LZ4 chunk exceeds the safety limit")
+        if len(output) + original_length > MAX_DECOMPRESSED_MAP_BYTES:
+            raise RustMapError("Decompressed map exceeds the safety limit")
         is_compressed = bool(flags & 1)
         if flags >> 2:
             raise RustMapError("Multi-pass legacy LZ4 chunks are unsupported")
@@ -294,4 +311,3 @@ def load_map(path: str | Path) -> RustMap:
             elif number == 4:
                 paths.append(_path(value))
     return RustMap(version, timestamp, size, layers, prefabs, paths, protobuf_buffer)
-

{rust_map_parser-0.1.1 → rust_map_parser-0.1.3}/src/rustmap/tunnels.py

@@ -107,7 +107,11 @@ def render_tunnel_map(world, manifest: PrefabManifest, geometry_cache: str | Pat
     template_prepare_seconds = template_png_load_seconds = paste_seconds = fallback_seconds = 0.0
     cache_load_started = time.perf_counter()
 
-    arrays_context = np.load(geometry_path) if geometry_path is not None and geometry_path.is_file() else nullcontext(None)
+    arrays_context = (
+        np.load(geometry_path, allow_pickle=False)
+        if geometry_path is not None and geometry_path.is_file()
+        else nullcontext(None)
+    )
     with arrays_context as arrays:
         cache_load_seconds = time.perf_counter() - cache_load_started
         templates = {item["prefab_path"]: item for item in cache_metadata["templates"]}

rust_map_parser-0.1.3/tests/test_parser_security.py

@@ -0,0 +1,32 @@
+from io import BytesIO
+
+import pytest
+
+from rustmap.parser import (
+    MAX_LZ4_CHUNK_BYTES,
+    MAX_LZ4_CHUNKS,
+    RustMapError,
+    _decompress_legacy_lz4,
+)
+
+
+def _varint(value: int) -> bytes:
+    encoded = bytearray()
+    while value >= 0x80:
+        encoded.append((value & 0x7F) | 0x80)
+        value >>= 7
+    encoded.append(value)
+    return bytes(encoded)
+
+
+def test_legacy_lz4_rejects_attacker_controlled_oversized_chunk() -> None:
+    stream = BytesIO(_varint(0) + _varint(MAX_LZ4_CHUNK_BYTES + 1))
+    with pytest.raises(RustMapError, match="chunk exceeds"):
+        _decompress_legacy_lz4(stream)
+
+
+def test_legacy_lz4_rejects_pathological_chunk_count() -> None:
+    zero_length_chunk = _varint(0) + _varint(0)
+    stream = BytesIO(zero_length_chunk * (MAX_LZ4_CHUNKS + 1))
+    with pytest.raises(RustMapError, match="too many chunks"):
+        _decompress_legacy_lz4(stream)