python-hwpx 6.0.2__py3-none-any.whl → 6.0.3__py3-none-any.whl

hwpx/body_patch.py

@@ -35,6 +35,7 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Mapping, Sequence
 
+from .opc.security import guard_zip_file, read_member
 from .mutation_report import MutationReport, project_byte_splice
 from .patch import (
     _finalize,
@@ -440,10 +441,11 @@ def recolor_runs_by_color(
     import io, zipfile
 
     with zipfile.ZipFile(io.BytesIO(source_bytes)) as z:
+        guard_zip_file(z)
         names = z.namelist()
         header_name = next((n for n in names if n.endswith("header.xml")), None)
-        header_xml = z.read(header_name).decode("utf-8") if header_name else ""
-        sections = {n: z.read(n).decode("utf-8") for n in names if re.search(r"section\d+\.xml$", n)}
+        header_xml = read_member(z, header_name).decode("utf-8") if header_name else ""
+        sections = {n: read_member(z, n).decode("utf-8") for n in names if re.search(r"section\d+\.xml$", n)}
 
     ids = set()
     for cm in re.finditer(r"<(?:[A-Za-z_][\w.-]*:)?charPr\b[^>]*?>", header_xml):
@@ -511,10 +513,11 @@ def strip_runs_by_color(
 
     targets = {h.upper() for h in hex_colors}
     with zipfile.ZipFile(io.BytesIO(source_bytes)) as z:
+        guard_zip_file(z)
         names = z.namelist()
         header_name = next((n for n in names if n.endswith("header.xml")), None)
-        header_xml = z.read(header_name).decode("utf-8") if header_name else ""
-        sections = {n: z.read(n).decode("utf-8") for n in names if re.search(r"section\d+\.xml$", n)}
+        header_xml = read_member(z, header_name).decode("utf-8") if header_name else ""
+        sections = {n: read_member(z, n).decode("utf-8") for n in names if re.search(r"section\d+\.xml$", n)}
 
     # 계열 매칭(잔존 게이트와 정렬): 대상 색의 _color_family에 드는 모든 charPr.
     from .oxml.color import color_family
@@ -589,13 +592,14 @@ def apply_body_ops(
 
     header_part: str | None = None
     with zipfile.ZipFile(io.BytesIO(source_bytes)) as z:
+        guard_zip_file(z)
         sections = {
-            n: z.read(n).decode("utf-8")
+            n: read_member(z, n).decode("utf-8")
             for n in z.namelist()
             if re.search(r"section\d+\.xml$", n)
         }
         header_part = next((n for n in z.namelist() if n.endswith("header.xml")), None)
-        header_xml = z.read(header_part).decode("utf-8") if header_part else ""
+        header_xml = read_member(z, header_part).decode("utf-8") if header_part else ""
 
     ctx: dict[str, Any] = {"header": header_xml, "header_changed": False, "charpr_cache": {}}
     skipped: list[dict[str, Any]] = []

hwpx/ingest/hwpx_converter.py

@@ -10,6 +10,12 @@ from zipfile import BadZipFile, ZipFile
 from hwpx.document import HwpxDocument
 
 from .base import DocumentIngestResult, DocumentSourceInfo
+from ..opc.security import (
+    MAX_ZIP_MIMETYPE_BYTES as _MAX_MIMETYPE_BYTES,
+    HwpxSecurityError,
+    guard_zip_file,
+    read_member,
+)
 
 
 class HwpxMarkdownConverter:
@@ -70,16 +76,21 @@ def _looks_like_hwpx_package(file_stream: BinaryIO) -> bool:
     cur_pos = file_stream.tell()
     try:
         with ZipFile(file_stream) as archive:
+            guard_zip_file(archive)
             names = set(archive.namelist())
             if "mimetype" in names:
                 try:
-                    mimetype = archive.read("mimetype").decode("utf-8", "replace").strip()
+                    mimetype = (
+                        read_member(archive, "mimetype", limit=_MAX_MIMETYPE_BYTES)
+                        .decode("utf-8", "replace")
+                        .strip()
+                    )
                     if "hwp" in mimetype.lower() or "hwpx" in mimetype.lower():
                         return True
                 except Exception:
                     pass
             return any(name.startswith("Contents/section") and name.endswith(".xml") for name in names)
-    except (BadZipFile, OSError):
+    except (BadZipFile, OSError, HwpxSecurityError):
         return False
     finally:
         file_stream.seek(cur_pos)

hwpx/layout/lint.py

@@ -35,6 +35,7 @@ from hwpx.tools.package_validator import (
 )
 
 from .report import LayoutFinding, LayoutLintReport
+from ..opc.security import guard_zip_file, read_member
 
 if TYPE_CHECKING:
     from hwpx.quality.ledger import DirtyLayoutLedger
@@ -173,11 +174,12 @@ def _section_roots(data: bytes) -> list[tuple[str, ET.Element]]:
     roots: list[tuple[str, ET.Element]] = []
     try:
         with zipfile.ZipFile(io.BytesIO(data)) as archive:
+            guard_zip_file(archive)
             for info in archive.infolist():
                 if info.is_dir() or not is_section_part_name(info.filename):
                     continue
                 try:
-                    roots.append((info.filename, ET.fromstring(archive.read(info.filename))))
+                    roots.append((info.filename, ET.fromstring(read_member(archive, info))))
                 except ET.ParseError:
                     # Malformed XML is the pipeline's well-formedness floor, not ours.
                     continue

hwpx/mutation_report.py

@@ -19,6 +19,7 @@ import zipfile
 from pathlib import Path
 from dataclasses import dataclass, field
 from io import BytesIO
+from .opc.security import guard_zip_file, read_member
 from typing import Any, Literal, Mapping, Sequence
 from zipfile import ZipInfo
 
@@ -58,8 +59,9 @@ def read_archive_members(data: bytes) -> dict[str, bytes]:
     """Return the uncompressed content of every non-directory member of *data*."""
 
     with zipfile.ZipFile(BytesIO(data)) as archive:
+        guard_zip_file(archive)
         return {
-            info.filename: archive.read(info.filename)
+            info.filename: read_member(archive, info)
             for info in archive.infolist()
             if not info.is_dir()
         }

hwpx/opc/package.py

@@ -24,7 +24,7 @@ from .relationships import (
     parse_container_rootfiles,
     parse_manifest_relationships,
 )
-from .security import guard_zip_file
+from .security import guard_zip_file, read_zip_members
 from .xml_utils import (
     extract_xml_declaration,
     iter_declared_namespaces,
@@ -419,7 +419,7 @@ class HwpxPackage:
             with ZipFile(stream, "r") as zf:
                 guard_zip_file(zf)
                 infos = [info for info in zf.infolist() if not info.is_dir()]
-                files = {info.filename: zf.read(info.filename) for info in infos}
+                files = read_zip_members(zf)
                 zip_infos = {info.filename: info for info in infos}
                 zip_order = [info.filename for info in infos]
         except BadZipFile as exc:

hwpx/opc/security.py

@@ -4,9 +4,11 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from pathlib import PurePosixPath
+from pathlib import PurePosixPath, PureWindowsPath
 from typing import Iterable
 from xml.etree import ElementTree as ET
+from zipfile import ZIP_DEFLATED as _ZIP_DEFLATED
+from zipfile import ZIP_STORED as _ZIP_STORED
 from zipfile import ZipFile, ZipInfo
 
 MAX_XML_BYTES = 64 * 1024 * 1024
@@ -15,6 +17,20 @@ MAX_ZIP_ENTRIES = 4096
 MAX_ZIP_MEMBER_BYTES = 128 * 1024 * 1024
 MAX_ZIP_TOTAL_UNCOMPRESSED_BYTES = 512 * 1024 * 1024
 MAX_ZIP_COMPRESSION_RATIO = 1000.0
+MAX_ZIP_READ_CHUNK = 64 * 1024
+# `mimetype` is a short fixed string in every real package; reading it during
+# format sniffing must not be able to cost the full per-member allowance.
+MAX_ZIP_MIMETYPE_BYTES = 4 * 1024
+# Container/manifest/preview parts are small by construction; reading them
+# during discovery should not cost the generic per-member allowance either.
+MAX_ZIP_SMALL_PART_BYTES = 4 * 1024 * 1024
+
+# The only methods HWPX uses, and the only ones CPython decompresses under a
+# bound: ``ZipExtFile._read1`` passes ``max_length`` to zlib for ZIP_DEFLATED but
+# calls ``decompress(data)`` with no limit for every other method, so a bzip2 or
+# lzma member inflates in full before the declared size truncates the result.
+# Chunked reading cannot bound those, so they are refused outright.
+_ALLOWED_METHODS = (_ZIP_STORED, _ZIP_DEFLATED)
 
 
 class HwpxSecurityError(ValueError):
@@ -35,8 +51,12 @@ def _iter_file_infos(zf: ZipFile) -> list[ZipInfo]:
 
 def _guard_zip_name(name: str) -> None:
     normalized = name.replace("\\", "/")
-    path = PurePosixPath(normalized)
-    if path.is_absolute() or ".." in path.parts:
+    if PurePosixPath(normalized).is_absolute() or ".." in PurePosixPath(normalized).parts:
+        raise HwpxSecurityError(f"unsafe ZIP member path: {name!r}")
+    # ``PurePosixPath`` reads ``C:/x`` as a relative path, but joining it onto an
+    # output directory on Windows discards that directory entirely.
+    windows = PureWindowsPath(normalized)
+    if windows.drive or windows.is_absolute():
         raise HwpxSecurityError(f"unsafe ZIP member path: {name!r}")
 
 
@@ -55,9 +75,20 @@ def guard_zip_file(
             f"{len(infos)} > {active_limits.max_entries}"
         )
 
+    # ``is_dir()`` only tests for a trailing slash in the name, so a member can
+    # opt out of the size accounting below just by calling itself a directory
+    # while still holding a payload that ``ZipFile.open()`` will read. Check the
+    # name of every entry, and require the ones excluded here to be empty.
+    for info in zf.infolist():
+        _guard_zip_name(info.filename)
+        if info.is_dir() and (info.file_size or info.compress_size):
+            raise HwpxSecurityError(
+                "ZIP directory entry carries data: "
+                f"{info.filename}={info.file_size}/{info.compress_size}"
+            )
+
     total = 0
     for info in infos:
-        _guard_zip_name(info.filename)
         if info.file_size > active_limits.max_member_bytes:
             raise HwpxSecurityError(
                 "ZIP member exceeds uncompressed size limit: "
@@ -69,6 +100,18 @@ def guard_zip_file(
                 "ZIP archive exceeds total uncompressed size limit: "
                 f"{total} > {active_limits.max_total_uncompressed_bytes}"
             )
+        if info.compress_type not in _ALLOWED_METHODS:
+            raise HwpxSecurityError(
+                "ZIP member uses an unsupported compression method: "
+                f"{info.filename}={info.compress_type}"
+            )
+        # Must run before the ``file_size <= 0`` skip below: a member declaring 0
+        # would otherwise bypass every remaining check.
+        if info.compress_size > info.file_size + info.file_size // 1000 + 64:
+            raise HwpxSecurityError(
+                "ZIP member declares less data than it stores: "
+                f"{info.filename}={info.file_size} < {info.compress_size}"
+            )
         if info.file_size <= 0:
             continue
         if info.compress_size <= 0:
@@ -81,6 +124,69 @@ def guard_zip_file(
             )
 
 
+def read_member(
+    zf: ZipFile,
+    member: str | ZipInfo,
+    *,
+    limit: int = MAX_ZIP_MEMBER_BYTES,
+) -> bytes:
+    """Read one ZIP member without trusting the size it declares.
+
+    ``ZipFile.read()`` calls ``ZipExtFile.read()`` with no argument, which hands
+    zlib a 2 GiB ``max_length`` and inflates the whole stream before truncating
+    the result to the declared size. Reading in fixed chunks and counting what
+    actually arrives keeps the allocation bounded no matter what the central
+    directory claims.
+    """
+
+    name = member.filename if isinstance(member, ZipInfo) else member
+    chunks: list[bytes] = []
+    total = 0
+    with zf.open(member) as handle:
+        while True:
+            block = handle.read(MAX_ZIP_READ_CHUNK)
+            if not block:
+                break
+            total += len(block)
+            if total > limit:
+                raise HwpxSecurityError(
+                    "ZIP member exceeds uncompressed size limit: "
+                    f"{name} > {limit}"
+                )
+            chunks.append(block)
+    return b"".join(chunks)
+
+
+def read_zip_members(
+    zf: ZipFile,
+    *,
+    limits: ZipGuardLimits | None = None,
+    names: Iterable[str] | None = None,
+) -> dict[str, bytes]:
+    """Read members with per-member and cumulative bounds on what is produced.
+
+    ``names`` restricts the read to those members; the cumulative budget still
+    applies across everything read.
+    """
+
+    active_limits = limits or ZipGuardLimits()
+    wanted = None if names is None else set(names)
+    payloads: dict[str, bytes] = {}
+    total = 0
+    for info in _iter_file_infos(zf):
+        if wanted is not None and info.filename not in wanted:
+            continue
+        data = read_member(zf, info, limit=active_limits.max_member_bytes)
+        total += len(data)
+        if total > active_limits.max_total_uncompressed_bytes:
+            raise HwpxSecurityError(
+                "ZIP archive exceeds total uncompressed size limit: "
+                f"{total} > {active_limits.max_total_uncompressed_bytes}"
+            )
+        payloads[info.filename] = data
+    return payloads
+
+
 def guard_xml_bytes(
     payload: bytes,
     *,

hwpx/patch.py

@@ -12,6 +12,7 @@ from pathlib import Path
 from typing import Any, Mapping, Sequence
 from zipfile import ZIP_DEFLATED, ZIP_STORED, ZipFile
 
+from .opc.security import guard_zip_file, read_member, read_zip_members
 from .mutation_report import MutationReport, project_byte_splice, visual_value_from_status
 from .quality import QualityPolicy, SavePipeline
 from .quality.report import VisualCompleteReport
@@ -199,6 +200,10 @@ def paragraph_patch(
     source_bytes = _read_source_bytes(source)
     normalized_patches = tuple(_normalize_patch(item) for item in patches)
     if not normalized_patches:
+        # The early return still hands the source to the save pipeline, so it has
+        # to clear the same limits as the patching path below.
+        with ZipFile(io.BytesIO(source_bytes), "r") as archive:
+            guard_zip_file(archive)
         open_safety, visual_complete = _finalize(source_bytes, output_path, source=source)
         return BytePreservingPatchResult(
             data=source_bytes,
@@ -212,7 +217,8 @@ def paragraph_patch(
         )
 
     with ZipFile(io.BytesIO(source_bytes), "r") as archive:
-        parts = {info.filename: archive.read(info.filename) for info in archive.infolist() if not info.is_dir()}
+        guard_zip_file(archive)
+        parts = read_zip_members(archive)
 
     changed_parts: dict[str, bytes] = {}
     applied: list[PatchApplied] = []
@@ -481,9 +487,12 @@ def _apply_edits(payload: bytes, edits: Sequence[tuple[int, int, bytes]]) -> byt
 def _rewrite_zip_entries(source: bytes, replacements: Mapping[str, bytes]) -> bytes:
     buffer = io.BytesIO()
     with ZipFile(io.BytesIO(source), "r") as src:
+        # Also reached directly by the public rewrite_package_parts(), so the
+        # entry-count, total-size and ratio limits have to be applied here too.
+        guard_zip_file(src)
         with ZipFile(buffer, "w") as dst:
             for info in src.infolist():
-                payload = replacements.get(info.filename, src.read(info.filename))
+                payload = replacements.get(info.filename, read_member(src, info))
                 dst.writestr(info, payload)
     return buffer.getvalue()
 

hwpx/quality/save_pipeline.py

@@ -48,6 +48,7 @@ from .report import (
     VisualCompleteReport,
     VisualCompleteStatus,
 )
+from ..opc.security import guard_zip_file, parse_xml_stdlib, read_member
 
 PublishMode = Literal["on_pass", "always", "never"]
 
@@ -277,12 +278,13 @@ class SavePipeline:
 
         try:
             with zipfile.ZipFile(io.BytesIO(data)) as archive:
+                guard_zip_file(archive)
                 names = [info.filename for info in archive.infolist() if not info.is_dir()]
                 for name in names:
                     base = os.path.basename(name)
                     if name.endswith(_XML_SUFFIXES) or base in _XML_NAMES:
                         try:
-                            ET.fromstring(archive.read(name))
+                            parse_xml_stdlib(read_member(archive, name), part_name=name)
                         except ET.ParseError as exc:
                             errors.append(
                                 QualityError(

hwpx/table_patch.py

@@ -30,6 +30,7 @@ from pathlib import Path
 from typing import Any, Iterable, Mapping, Sequence
 
 from .errors import HwpxError
+from .opc.security import guard_zip_file, read_member, read_zip_members
 from .mutation_report import MutationReport, project_byte_splice
 from .patch import (
     _apply_edits,
@@ -585,8 +586,9 @@ def resolve_cell_target(
     import zipfile
 
     with zipfile.ZipFile(io.BytesIO(source_bytes), "r") as archive:
+        guard_zip_file(archive)
         parts = {
-            info.filename: archive.read(info.filename)
+            info.filename: read_member(archive, info)
             for info in archive.infolist()
             if not info.is_dir()
         }
@@ -661,7 +663,8 @@ def fill_cells(
     import io
     import zipfile
     with zipfile.ZipFile(io.BytesIO(source_bytes), "r") as zf:
-        parts = {i.filename: zf.read(i.filename) for i in zf.infolist() if not i.is_dir()}
+        guard_zip_file(zf)
+        parts = read_zip_members(zf)
 
     # FR-002: resolve table/cell anchors to concrete (table_index,row,col) first.
     resolved_cells, anchor_skips = _resolve_anchor_cells(parts, cells)
@@ -1376,7 +1379,8 @@ def _apply_cell_line_spacing(
     import io
     import zipfile
     with zipfile.ZipFile(io.BytesIO(source_bytes), "r") as zf:
-        parts = {i.filename: zf.read(i.filename) for i in zf.infolist() if not i.is_dir()}
+        guard_zip_file(zf)
+        parts = read_zip_members(zf)
     header_name = _header_part_name(parts)
     header = parts.get(header_name)
     transcript: list[dict[str, Any]] = []
@@ -1482,7 +1486,8 @@ def _sections(data: bytes) -> dict[str, bytes]:
     import io
     import zipfile
     with zipfile.ZipFile(io.BytesIO(data)) as z:
-        return {n: z.read(n) for n in z.namelist() if re.search(r"section\d+\.xml$", n)}
+        guard_zip_file(z)
+        return {n: read_member(z, n) for n in z.namelist() if re.search(r"section\d+\.xml$", n)}
 
 
 def _table_dims(table: str | bytes) -> str:
@@ -1795,11 +1800,12 @@ def strip_trailing_table_captions(
     import zipfile
 
     with zipfile.ZipFile(io.BytesIO(source_bytes), "r") as archive:
+        guard_zip_file(archive)
         section_names = [
             info.filename for info in archive.infolist()
             if not info.is_dir() and re.search(r"section\d+\.xml$", info.filename)
         ]
-        sections = {name: archive.read(name).decode("utf-8") for name in section_names}
+        sections = {name: read_member(archive, name).decode("utf-8") for name in section_names}
 
     applied: list[CellApplied] = []
     changed_parts: dict[str, bytes] = {}

hwpx/tools/archive_cli.py

@@ -17,6 +17,7 @@ from lxml import etree  # type: ignore[reportAttributeAccessIssue]
 from ..opc.relationships import is_header_part_name, is_section_part_name
 from ..oxml.namespaces import HWPML_COMPAT_ROOT_NAMESPACES
 from .package_validator import validate_editor_open_safety, validate_package
+from ..opc.security import HwpxSecurityError, guard_xml_bytes, guard_xml_depth, guard_zip_file, read_member
 
 _XML_SUFFIXES = (".xml", ".hpf")
 _PACK_METADATA_NAME = ".hwpx-pack-metadata.json"
@@ -81,18 +82,43 @@ def _prepare_output_path(output_path: Path, *, overwrite: bool) -> None:
         raise FileExistsError(f"output file already exists: {output_path}")
 
 
+_MAX_INDENT_GROWTH = 8
+_MIN_INDENT_BUDGET = 64 * 1024
+
+
 def _format_xml_bytes(payload: bytes) -> bytes:
+    """Re-indent an XML part, falling back to the original bytes.
+
+    Indentation is an amplifier: at the depth libxml2 accepts, every leaf gains
+    two spaces per level, so a 4-byte element can grow past 500 bytes. The
+    payload is guarded first, and a result that grew beyond the per-member
+    allowance is discarded in favour of the input.
+    """
+
+    try:
+        guard_xml_bytes(payload, part_name="XML part")
+    except HwpxSecurityError:
+        return payload
     try:
         element = etree.fromstring(payload)
     except etree.XMLSyntaxError:
         return payload
+    try:
+        guard_xml_depth(element, part_name="XML part")
+    except HwpxSecurityError:
+        return payload
     etree.indent(element, space="  ")
-    return etree.tostring(
+    formatted = etree.tostring(
         element,
         pretty_print=True,
         xml_declaration=True,
         encoding="UTF-8",
     )
+    # Real parts grow at most ~1.7x when indented (measured across the repo's
+    # packages); anything past this is the indentation acting as an amplifier.
+    if len(formatted) > max(_MAX_INDENT_GROWTH * len(payload), _MIN_INDENT_BUDGET):
+        return payload
+    return formatted
 
 
 def _normalize_hwpml_compat_root(rel_path: str, payload: bytes) -> bytes:
@@ -225,9 +251,10 @@ def unpack_hwpx(
     _prepare_output_dir(destination, overwrite=overwrite)
 
     with ZipFile(source_path, "r") as archive:
+        guard_zip_file(archive)
         entries = _iter_file_entries(archive)
         for entry in entries:
-            data = archive.read(entry.path)
+            data = read_member(archive, entry.path)
             if pretty_xml and entry.path.endswith(_XML_SUFFIXES):
                 data = _format_xml_bytes(data)
             target = destination / entry.path

hwpx/tools/exporter.py

@@ -15,7 +15,7 @@ from typing import TYPE_CHECKING
 from xml.etree import ElementTree as ET
 from zipfile import ZipFile
 
-from ..opc.security import guard_zip_file, parse_xml_stdlib
+from ..opc.security import guard_zip_file, parse_xml_stdlib, read_member
 #: A caller-supplied redaction step. Declared here rather than imported from
 #: mail_merge, which imports export_text — the two would form a cycle.
 TextSanitizer = Callable[[str], str]
@@ -41,7 +41,7 @@ def _section_xmls(source: HwpxDocument | bytes) -> list[ET.Element]:
         with ZipFile(io.BytesIO(source)) as zf:
             guard_zip_file(zf)
             names = sorted(n for n in zf.namelist() if _SECTION_RE.match(n))
-            return [parse_xml_stdlib(zf.read(n), part_name=n) for n in names]
+            return [parse_xml_stdlib(read_member(zf, n), part_name=n) for n in names]
     return [sec.element for sec in source._root.sections]
 
 

hwpx/tools/idempotence.py

@@ -28,6 +28,7 @@ import zipfile
 from dataclasses import dataclass
 
 from hwpx.document import HwpxDocument
+from ..opc.security import guard_zip_file, read_member
 
 __all__ = [
     "IdempotenceReport",
@@ -78,11 +79,12 @@ def _part_contents(data: bytes) -> tuple[dict[str, bytes], list[str]]:
     contents: dict[str, bytes] = {}
     duplicates: list[str] = []
     with zipfile.ZipFile(io.BytesIO(data)) as archive:
+        guard_zip_file(archive)
         for info in archive.infolist():
             name = info.filename
             if name in contents:
                 duplicates.append(name)
-            contents[name] = archive.read(info)
+            contents[name] = read_member(archive, info)
     return contents, duplicates
 
 

hwpx/tools/ir_equality.py

@@ -20,6 +20,7 @@ import re
 import xml.etree.ElementTree as ET
 import zipfile
 from dataclasses import dataclass
+from ..opc.security import guard_zip_file, read_member
 
 __all__ = [
     "IrEqualityReport",
@@ -91,12 +92,13 @@ def project_document(data: bytes) -> list:
     """Project a whole HWPX byte blob: paragraphs across all sections in order."""
     projection: list = []
     with zipfile.ZipFile(io.BytesIO(data)) as archive:
+        guard_zip_file(archive)
         names = sorted(
             (n for n in archive.namelist() if _SECTION_RE.match(n)),
             key=lambda n: int(_SECTION_RE.match(n).group(1)),
         )
         for name in names:
-            projection.extend(project_section_xml(archive.read(name)))
+            projection.extend(project_section_xml(read_member(archive, name)))
     return projection
 
 

hwpx/tools/layout_preview.py

@@ -17,7 +17,7 @@ from xml.etree import ElementTree as ET
 from zipfile import BadZipFile, ZipFile
 
 from ..equation import render_equation
-from ..opc.security import guard_zip_file, parse_xml_stdlib
+from ..opc.security import guard_zip_file, parse_xml_stdlib, read_member
 
 _HP_NS = "http://www.hancom.co.kr/hwpml/2011/paragraph"
 _HH_NS = "http://www.hancom.co.kr/hwpml/2011/head"
@@ -191,7 +191,7 @@ def _read_package_parts(source: str | Path | bytes) -> tuple[dict[str, bytes], l
             archive = Path(source)
         with ZipFile(archive) as zf:
             guard_zip_file(zf)
-            return {name: zf.read(name) for name in zf.namelist()}, warnings
+            return {name: read_member(zf, name) for name in zf.namelist()}, warnings
     except (BadZipFile, FileNotFoundError, OSError) as exc:
         raise ValueError(f"unable to read HWPX package: {exc}") from exc
 

hwpx/tools/package_validator.py

@@ -13,6 +13,7 @@ from zipfile import ZIP_STORED, BadZipFile, ZipFile, ZipInfo
 from lxml import etree as LET  # type: ignore[reportMissingImports]
 
 from ..oxml.namespaces import HWPML_COMPAT_ROOT_NAMESPACES
+from ..opc.security import HwpxSecurityError, MAX_ZIP_MEMBER_BYTES, MAX_ZIP_MIMETYPE_BYTES, MAX_ZIP_SMALL_PART_BYTES, read_member
 from ..opc.relationships import (
     MAIN_ROOTFILE_MEDIA_TYPE,
     ManifestRelationships,
@@ -24,7 +25,6 @@ from ..opc.relationships import (
     select_main_rootfile,
 )
 from ..opc.security import (
-    HwpxSecurityError,
     guard_xml_bytes,
     guard_xml_depth,
     guard_zip_file,
@@ -543,10 +543,12 @@ def _warning(
     issues.append(PackageValidationIssue(part_name, message, "warning"))
 
 
-def _safe_read(zf: ZipFile, part_name: str) -> bytes | None:
+def _safe_read(
+    zf: ZipFile, part_name: str, *, limit: int = MAX_ZIP_MEMBER_BYTES
+) -> bytes | None:
     try:
-        return zf.read(part_name)
-    except (BadZipFile, KeyError, OSError):
+        return read_member(zf, part_name, limit=limit)
+    except (BadZipFile, KeyError, OSError, HwpxSecurityError):
         return None
 
 
@@ -573,7 +575,7 @@ def _check_mimetype(
     if MIMETYPE_PATH not in name_set:
         _error(issues, MIMETYPE_PATH, "missing required file")
         return
-    mimetype_bytes = _safe_read(zf, MIMETYPE_PATH)
+    mimetype_bytes = _safe_read(zf, MIMETYPE_PATH, limit=MAX_ZIP_MIMETYPE_BYTES)
     if mimetype_bytes is None:
         _error(
             issues,
@@ -620,7 +622,7 @@ def _check_preview_text(
             "missing Preview/PrvText.txt; macOS Hancom compatibility may require it",
         )
         return
-    preview_bytes = _safe_read(zf, PREVIEW_TEXT_PATH)
+    preview_bytes = _safe_read(zf, PREVIEW_TEXT_PATH, limit=MAX_ZIP_SMALL_PART_BYTES)
     if preview_bytes is None:
         _error(issues, PREVIEW_TEXT_PATH, "unable to read preview text entry")
     elif len(preview_bytes) > 1024 * 1024:

hwpx/tools/repair.py

@@ -15,6 +15,7 @@ from ..opc.relationships import is_header_part_name, is_section_part_name
 from ..oxml.namespaces import HWPML_COMPAT_ROOT_NAMESPACES
 from .package_validator import MIMETYPE_PATH, validate_editor_open_safety, validate_package
 from .recover import recover_entries
+from ..opc.security import guard_zip_file, read_member
 
 __all__ = [
     "RepairResult",
@@ -66,6 +67,9 @@ def _read_entries(
     entries: list[_BufferedEntry] = []
     total_size = 0
     with ZipFile(source_path, "r") as archive:
+        # The per-entry/total limits below sum declared sizes, so the archive
+        # still needs the ratio, entry-count and member-name checks.
+        guard_zip_file(archive)
         for info in archive.infolist():
             if info.is_dir():
                 continue
@@ -74,7 +78,12 @@ def _read_entries(
             total_size += info.file_size
             if total_size > max_total_size:
                 raise ValueError(f"archive exceeds max_total_size={max_total_size}")
-            entries.append(_BufferedEntry(info=info, payload=archive.read(info)))
+            entries.append(
+                _BufferedEntry(
+                    info=info,
+                    payload=read_member(archive, info, limit=max_entry_size),
+                )
+            )
     return tuple(entries)
 
 

hwpx/tools/text_extractor.py

@@ -16,7 +16,7 @@ from ..opc.relationships import (
     parse_manifest_relationships,
     select_main_rootfile,
 )
-from ..opc.security import guard_zip_file, parse_xml_stdlib
+from ..opc.security import MAX_ZIP_SMALL_PART_BYTES, guard_zip_file, parse_xml_stdlib, read_member
 from ..oxml.namespaces import DEFAULT_NAMESPACES as OWPML_DEFAULT_NAMESPACES
 
 __all__ = [
@@ -213,7 +213,7 @@ class TextExtractor:
         archive = self.open()
         section_files = list(self._iter_section_files(archive))
         for index, name in enumerate(section_files):
-            data = archive.read(name)
+            data = read_member(archive, name)
             element = parse_xml_stdlib(data, part_name=name)
             yield SectionInfo(index=index, name=name, element=element)
 
@@ -584,7 +584,11 @@ class TextExtractor:
         manifest_path: str | None = None
         try:
             container_root = parse_xml_stdlib(
-                archive.read("META-INF/container.xml"),
+                read_member(
+                    archive,
+                    "META-INF/container.xml",
+                    limit=MAX_ZIP_SMALL_PART_BYTES,
+                ),
                 part_name="META-INF/container.xml",
             )
         except (ValueError, KeyError):
@@ -598,7 +602,10 @@ class TextExtractor:
 
         if manifest_path is not None:
             try:
-                manifest_root = parse_xml_stdlib(archive.read(manifest_path), part_name=manifest_path)
+                manifest_root = parse_xml_stdlib(
+                    read_member(archive, manifest_path, limit=MAX_ZIP_SMALL_PART_BYTES),
+                    part_name=manifest_path,
+                )
             except (ValueError, KeyError):
                 manifest_root = None
             if manifest_root is not None:

{python_hwpx-6.0.2.dist-info → python_hwpx-6.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-hwpx
-Version: 6.0.2
+Version: 6.0.3
 Summary: 한글 없이 HWPX 문서를 열고, 편집하고, 생성하고, 검증하는 Python 문서 라이브러리
 Author: python-hwpx Maintainers
 License-Expression: Apache-2.0

{python_hwpx-6.0.2.dist-info → python_hwpx-6.0.3.dist-info}/RECORD

@@ -1,15 +1,15 @@
 hwpx/__init__.py,sha256=DqoPNdD-4-oP4b_56P5ADABnyRGcDZiHch__S-urI4s,16642
-hwpx/body_patch.py,sha256=eDhQA6JWQDcDifIgqtILzWpBEa-qvllwyTIy4S8VO2U,28985
+hwpx/body_patch.py,sha256=g8RhaFQ9nf3grVI7qVPEwJc06x0JmwXow8hkY84aT18,29165
 hwpx/capabilities.py,sha256=rhSiHTnt8ZqUvhN3VdQVt8FveifQKlEUQ3LhXiAlaZw,27644
 hwpx/document.py,sha256=rG65RrwgmADeFd4TBolKUMCnBZiecfjphCP7v3dS9T0,28370
 hwpx/errors.py,sha256=otyGkuRVzlItKY-AkrXSqTc_zhe2T4C2q3-2kGrRqbo,13570
 hwpx/experimental.py,sha256=Jvc7WAi3eMFRKYubqwtIWi9oU0OjuqNOfottWkaP2RQ,2113
 hwpx/model.py,sha256=UEShdjlj9piS4RadFBFWZgB8PSM14u7CqdFgPO9Mqcc,3129
-hwpx/mutation_report.py,sha256=6hurhDdgGiONeLIeWZJT8lwLtWJZ1VHp1l6G0zy0mQo,19409
+hwpx/mutation_report.py,sha256=Uw9fxft8kioXpQ0feQwSlq4vOj3-418Oywt7qmDmU_8,19494
 hwpx/package.py,sha256=0rKjGCJbPQvrVBIy07Jpjsu3fI7HhbqFCGWTiTDsJpo,1141
-hwpx/patch.py,sha256=g8Dg-BAsnB_kVs4G7594mRpwJ3nOg4DO_KkznETHFL8,26801
+hwpx/patch.py,sha256=k_LoVxHzIBNs4kg2V4yBOgAxjsrim7pksG0rmRmLApE,27264
 hwpx/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hwpx/table_patch.py,sha256=UK4H8Cp8-2DjvHtqE01TiGfFAz2XCeyJYQiHIfk5Vq4,83722
+hwpx/table_patch.py,sha256=CQHJ5bN_Kfz-Pi0eIyJJZg5fGJRbq1HjP1jDZqnv0d8,83845
 hwpx/templates.py,sha256=28bYqeJVeDb1Cq8G9NZG9Mhnu4K2GamAKC4QhxvUZyA,1187
 hwpx/_document/__init__.py,sha256=REiNqMbuk_TS4NVC27FIo1rUt3Z8nhJrTBGOgNtxBRg,90
 hwpx/_document/_legacy.py,sha256=8jFKZe8qsYV_3nAvmZBg4qNkcuedG-P2QCA0LeKTyjo,58909
@@ -55,9 +55,9 @@ hwpx/form_fit/policy.py,sha256=iXAatjS7ZycOdKgMCL4Q_kYg0qnogFPdRNlr_ecOvjc,3106
 hwpx/form_fit/report.py,sha256=h1NzQfbj1JYvZtKUi0DckJNWGnUHMZtQ3iCzbUxUjHA,3305
 hwpx/ingest/__init__.py,sha256=cjDQwMdaqbq2xiD32zmaFAyzZbENga_6MLbgo0sLGZE,636
 hwpx/ingest/base.py,sha256=95jXJ70Hkay70BgyryGOzI3UVTixUpR-6f71iF3eqn4,8134
-hwpx/ingest/hwpx_converter.py,sha256=HOUCFYO-HK4WRpWiN5sA_kZIvdv439mkZ6PMCFU3hLg,4269
+hwpx/ingest/hwpx_converter.py,sha256=TOCxlQjHwbvxD7rwnoIy9HSNf-NduDyE-YSDRx8Nslg,4599
 hwpx/layout/__init__.py,sha256=qotAVhol_yrPlOHvQfs68nx7ADYxPcwITYNA9gMutUM,1158
-hwpx/layout/lint.py,sha256=FB5ZiudFXO41rOtPbnR_mKQbffy0RykhTUH-4PQkr4s,15750
+hwpx/layout/lint.py,sha256=pUkAa-T8UhLhciuCndSDSu8l4IBivbON-yU7yV6VFO8,15840
 hwpx/layout/report.py,sha256=6jipfJ7PUhSGX8-A2gryE3GrAwN_mbfnaI_PdK931ok,4182
 hwpx/objects/__init__.py,sha256=7az6QN0HoDUV4FvM-2C6449f5AsUmdV6_2fJ7FPDBL4,1755
 hwpx/objects/binary_item.py,sha256=cx3QejHBr26VgQgUyd5jfJrxrSZxrFDgRGwuMC1Bcvw,1884
@@ -65,9 +65,9 @@ hwpx/objects/checkbox.py,sha256=zOrBBxwQSdvIl0HLqhXc0LF2cIOWbPrA1sEPnqVj2Tc,3085
 hwpx/objects/form_field.py,sha256=LHudu4EritJa6G0MOiRiR77RfvbEsQpC7HsSr5o7WVg,5689
 hwpx/objects/results.py,sha256=BkKu50lCIin7fKyUOA4GDy2a3LhWwN13_a0h1Fe_rvA,7574
 hwpx/objects/tracked.py,sha256=uTCm-RQ7c37Yg03nEm9Q6mhcYFGFN2_pBRrwToNPiZ4,2169
-hwpx/opc/package.py,sha256=4aSETZDyfTFTEwRNgHNn1NsDd24p51MsXWgamu9sXJ8,40086
+hwpx/opc/package.py,sha256=nz1m3L7palQrbWSedpN_06WJaFpwDO2iZqjCknPZH4E,40067
 hwpx/opc/relationships.py,sha256=tPWLHRMlw0Spvtwou2jCDRfHdcm9FEKKLd95YVHLwYI,6971
-hwpx/opc/security.py,sha256=hsA73sZxUoGIgy2zue9EnV7ChHMfasnplmqzxFs3Mp4,4419
+hwpx/opc/security.py,sha256=0wZitXK0J55wkbsWhyMyyufq0syBu_ZsBkqozrp-2DA,9062
 hwpx/opc/xml_utils.py,sha256=L_fHY1-D5I_TfdRkDQV-bn55EnXc6AqEDWItfMpawVs,3840
 hwpx/oxml/__init__.py,sha256=pqHqOK2snS74U_mkmkFcgyCUCLiGmbS84TKFBrwxF5I,5507
 hwpx/oxml/_document_impl.py,sha256=41cxktJqXHER37fjA5HIFR8kw7dHMoISTxEv53PRBYo,5367
@@ -104,43 +104,43 @@ hwpx/quality/ledger.py,sha256=MvrUxd6LlJPD_dWoD5yH9ceFPNcjBR6tr6STqQqAdk0,3534
 hwpx/quality/policy.py,sha256=Buc2CkxfPPkbygf9i9o7FCjwkuL2BV39WG4xKjYkbis,3822
 hwpx/quality/rendering.py,sha256=3uFu-nXCgWYsQDgyRH9DwKGyvSvXnN_pPzEmp5g6NNo,4141
 hwpx/quality/report.py,sha256=n8bOP6vIDy7ZLprApUqUa38HM6NXph57PHSkzT8Wgjk,8721
-hwpx/quality/save_pipeline.py,sha256=Z05hnupRUGWMg7uqrWM1NXT8SMM0dwApeUehzYY5pSE,21698
+hwpx/quality/save_pipeline.py,sha256=fUlgQWbvq8uaL8W2JpEPHaN8xVc9e_Q-b-J6wf0QOxI,21838
 hwpx/tools/__init__.py,sha256=6PiL7jvyTfyP_-Ygo119h7kFs3X7tml96kI1JmX2ZWA,3049
-hwpx/tools/archive_cli.py,sha256=gkQHuCPUqNGy2S2rKis9NOI1-xZCfwDakF9o8kikPuQ,12775
+hwpx/tools/archive_cli.py,sha256=eNuTxdQGn56g7R5HPwqMjExYdvv6uuShiJ-vzEGTF0o,13860
 hwpx/tools/doc_diff.py,sha256=PlHeKlNSyDiifPw-kZfaVJwyHl1tIr2bVlrzR2d80zo,10891
 hwpx/tools/document_viewer.py,sha256=cJb1KfWnbHvNgFDuzpsaF8lJmPTQaplCk08OD-Vh93A,8100
-hwpx/tools/exporter.py,sha256=NKinVU8GJZfuqe1NqZqBXZIY6QXmTWLRvYOEhk2NmaQ,8033
+hwpx/tools/exporter.py,sha256=hFyovh7W9WW7wfLw0ol9xK5EadXn7hMa_IXelMheayM,8054
 hwpx/tools/generic_inventory.py,sha256=pHVP8-htX_vO02ARdQR37XFxm7fUPK68VtMeeOJ1NZY,4835
 hwpx/tools/id_integrity.py,sha256=TBI2WOwbaMbwTGyMv0hEO-uZqyewZtdvawqqA42Tums,14245
-hwpx/tools/idempotence.py,sha256=17rfgoqPfaegIGiCfl0TU3iBVFgRxrFM_PR2Yy-O6CA,5179
-hwpx/tools/ir_equality.py,sha256=NIjq33-4q7iTo_asv7WUvh_-EfB1JZMTwbLfYIw2c5w,4765
-hwpx/tools/layout_preview.py,sha256=cHlBUEdMn_ac-hNFDUgF5r2PMM0cTw65l7sqq7Li8NM,22702
+hwpx/tools/idempotence.py,sha256=UNIgfItSCoMFBxSfd3vhA-1AMJ5YJ4eGLtdOpWtfZtc,5274
+hwpx/tools/ir_equality.py,sha256=zku8kKVNwrADcwLXWvmQ4U8VlhOgliPWyv9Ca2ao1yg,4860
+hwpx/tools/layout_preview.py,sha256=-gXLXBgLnIxxFpRh--oyKOodsekzoFZZ_4xSZW2jB2U,22723
 hwpx/tools/mail_merge.py,sha256=8kGlSk2GQL7cFxZgg6P_bKisj1zVUWy8qh8AXIZLK_w,18611
 hwpx/tools/markdown_export.py,sha256=_qhOqnYg2tFQa4-EuXyFdJvkc_-9x6ln9lx-MeqtNeY,20495
 hwpx/tools/object_finder.py,sha256=ovXlbuPiQFdGzNSU08SuEzNFoeYcIb7GfF6vB9MRwBE,13800
 hwpx/tools/package_reconcile.py,sha256=y1Hl7hbPh4YaV59LTdDLzQwgn4g1qEnFmSjmajnrEbA,2416
-hwpx/tools/package_validator.py,sha256=fYkJevV_soQuM8LEUQMkwYaTy2k2HV4VWBwfIXFt29Y,33306
+hwpx/tools/package_validator.py,sha256=pYNeIp59HIIYfb94prcD-si82-3kdbfkoIpPrI9V-aE,33559
 hwpx/tools/page_guard.py,sha256=Qg9vHP46nnq9W5GCyaHbpNY5Ndt7ecJHAdSs8BfRggQ,9622
 hwpx/tools/read_fidelity.py,sha256=f_a3Kftee3MRaCGraC6KjQDZ-iz3hv3b8-GGC5VCgyw,10528
 hwpx/tools/recover.py,sha256=EOVAzMFAqR9YAT3sinZKCdjSkKygo4dKrs6T6SbGA7o,4963
 hwpx/tools/redline.py,sha256=L9kMQ9i0c_fvqH3WMtu12Gk88WbTfZwxYPd0qH2-o58,7940
-hwpx/tools/repair.py,sha256=wYO4Zd8ZMwkbYy2_EPz0eyqvTCrzcAyvbEsVE1P87Zk,11197
+hwpx/tools/repair.py,sha256=JReRCUiPP44FG-1euzV56DC-RU5FnRxVZtHuGmMiVxM,11550
 hwpx/tools/report_utils.py,sha256=6HYEeQc3ZxTpxbwF11s47uZ-KmV4tsHPE1MV4491KDE,4434
 hwpx/tools/roundtrip_diff.py,sha256=ao0AdpDJkq89u5hwcrsxTijvSsia9Jaw1OOnh4WAco4,1365
 hwpx/tools/table_cleanup.py,sha256=0_f6NnvNp3QD4owKd_bRX6FZbeUmoQC7a4_VGzF2SCE,1796
 hwpx/tools/table_navigation.py,sha256=rtbrWFKpJhqC3LD0ZXImyHgjmDR2hjHCFy3_S-qNBwA,16479
 hwpx/tools/template_analyzer.py,sha256=iH7egGRYNb8UesDB1TJ4tvW41-mlmv5Ap3VacqJFSlE,21355
 hwpx/tools/text_extract_cli.py,sha256=BmsDAwNXpDPhEayb9ez2ORtGNzPd_Xxduy4_cLXhnUw,2188
-hwpx/tools/text_extractor.py,sha256=6Wtk3av69z848ZJAEh-fV4TU2BkAwk3qKJpIyUkYT_4,26122
+hwpx/tools/text_extractor.py,sha256=DPdDHhep_3ykLGmYS5czIBHR5DPut3FHHDuPe4FvvN4,26387
 hwpx/tools/toc_author.py,sha256=eS1Zm5OBoonuD_H92JxcN2o276d5XmcJDqpfscd4wSg,15445
 hwpx/tools/toc_fidelity.py,sha256=rvoKH8QJ65WNVrxS0d-i2AtODvBy-4O8NRudfQ244v4,19890
 hwpx/tools/validator.py,sha256=U856izL9NcJZOiKDYoCpwOSaFNQ2Un8Jn4pzL20A96Q,7100
 hwpx/tools/_schemas/header.xsd,sha256=mJXuFMuHGT1JnFFaluUpYUglwjMCNlfbFCRVM26eHXE,664
 hwpx/tools/_schemas/section.xsd,sha256=MgvavVHG05RDfUnVPxVU10H4FQOja5ON04_m9Uk_m7E,522
-python_hwpx-6.0.2.dist-info/licenses/LICENSE,sha256=_ubz4wv-BkkT3l3gu-QuH7JGeVjuRYGZoZK95eNsCHU,9688
-python_hwpx-6.0.2.dist-info/licenses/NOTICE,sha256=he3PBLXnIZK0sNsozc-SAQ2jvWjV61goylWUZ8HPi3s,3837
-python_hwpx-6.0.2.dist-info/METADATA,sha256=IjWUskkDZlAM6pFP4Onh-xq8mU7KtFG7r7qWDStPmpM,13652
-python_hwpx-6.0.2.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-python_hwpx-6.0.2.dist-info/entry_points.txt,sha256=JUKRxbly9UaeHV7YzOea23y8IiqSTcrhUlooP3fS_Zc,405
-python_hwpx-6.0.2.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
-python_hwpx-6.0.2.dist-info/RECORD,,
+python_hwpx-6.0.3.dist-info/licenses/LICENSE,sha256=_ubz4wv-BkkT3l3gu-QuH7JGeVjuRYGZoZK95eNsCHU,9688
+python_hwpx-6.0.3.dist-info/licenses/NOTICE,sha256=he3PBLXnIZK0sNsozc-SAQ2jvWjV61goylWUZ8HPi3s,3837
+python_hwpx-6.0.3.dist-info/METADATA,sha256=KP0TsJBAw0r2A0cIAuCASIwCTUmC7Bl_tbzowFTYUsY,13652
+python_hwpx-6.0.3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+python_hwpx-6.0.3.dist-info/entry_points.txt,sha256=JUKRxbly9UaeHV7YzOea23y8IiqSTcrhUlooP3fS_Zc,405
+python_hwpx-6.0.3.dist-info/top_level.txt,sha256=R1iToqDh80Nf2oQhRjTN0rbN2X6kyDUizIocZjkhuxc,5
+python_hwpx-6.0.3.dist-info/RECORD,,