mirror of
https://github.com/safishamsi/graphify.git
synced 2026-09-25 23:16:10 +00:00
cap untrusted office/PDF parsing to stop zip-bomb DoS (F2)
.docx/.xlsx are zip+XML containers parsed during a corpus scan with no size guard, so a few-KB zip-bomb could decompress to gigabytes and OOM-kill the process. Screen every office/PDF file before openpyxl/python-docx/pypdf touch it: an on-disk size cap, a total-uncompressed cap, and a compression-ratio check on the archive members. Files that exceed the caps are skipped (treated as empty) rather than parsed. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -36,6 +36,46 @@ CORPUS_WARN_THRESHOLD = 50_000 # words - below this, warn "you may not need a
|
||||
CORPUS_UPPER_THRESHOLD = 500_000 # words - above this, warn about token cost
|
||||
FILE_COUNT_UPPER = 500 # files - above this, warn about token cost
|
||||
|
||||
# Resource caps for parsing untrusted office/PDF files (F2). A corpus is
|
||||
# attacker-controllable (graphify runs on cloned/shared folders), and .docx/.xlsx
|
||||
# are zip+XML containers: a few-KB zip-bomb can decompress to gigabytes and
|
||||
# OOM-kill the process at load_workbook/Document time. Screen the file before any
|
||||
# parser touches it.
|
||||
_OFFICE_MAX_RAW_BYTES = 50 * 1024 * 1024 # 50 MiB on-disk
|
||||
_OFFICE_MAX_DECOMPRESSED_BYTES = 512 * 1024 * 1024 # 512 MiB total uncompressed
|
||||
_OFFICE_MAX_COMPRESSION_RATIO = 200 # uncompressed : compressed
|
||||
|
||||
|
||||
def _file_within_size_cap(path: Path, cap: int = _OFFICE_MAX_RAW_BYTES) -> bool:
|
||||
"""True if *path* exists and its on-disk size is within *cap*."""
|
||||
try:
|
||||
return path.stat().st_size <= cap
|
||||
except OSError:
|
||||
return False
|
||||
|
||||
|
||||
def _zip_within_caps(path: Path) -> bool:
|
||||
"""Reject a zip-based office file that looks like a zip/XML bomb.
|
||||
|
||||
Checks on-disk size, the summed uncompressed size of every member, and the
|
||||
overall compression ratio before openpyxl/python-docx decompress and parse.
|
||||
"""
|
||||
import zipfile
|
||||
if not _file_within_size_cap(path):
|
||||
return False
|
||||
try:
|
||||
with zipfile.ZipFile(path) as zf:
|
||||
infos = zf.infolist()
|
||||
compressed = sum(i.compress_size for i in infos) or 1
|
||||
uncompressed = sum(i.file_size for i in infos)
|
||||
except (zipfile.BadZipFile, OSError):
|
||||
return False
|
||||
if uncompressed > _OFFICE_MAX_DECOMPRESSED_BYTES:
|
||||
return False
|
||||
if uncompressed / compressed > _OFFICE_MAX_COMPRESSION_RATIO:
|
||||
return False
|
||||
return True
|
||||
|
||||
# Parent directories whose contents are always sensitive.
|
||||
# Checked against path.parts[:-1] (parents only) so a root-level file named
|
||||
# "credentials" or "secrets" is not falsely flagged by this stage.
|
||||
@@ -318,6 +358,8 @@ def classify_file(path: Path) -> FileType | None:
|
||||
|
||||
def extract_pdf_text(path: Path) -> str:
|
||||
"""Extract plain text from a PDF file using pypdf."""
|
||||
if not _file_within_size_cap(path):
|
||||
return ""
|
||||
try:
|
||||
from pypdf import PdfReader
|
||||
reader = PdfReader(str(path))
|
||||
@@ -333,6 +375,8 @@ def extract_pdf_text(path: Path) -> str:
|
||||
|
||||
def docx_to_markdown(path: Path) -> str:
|
||||
"""Convert a .docx file to markdown text using python-docx."""
|
||||
if not _zip_within_caps(path):
|
||||
return ""
|
||||
try:
|
||||
from docx import Document
|
||||
from docx.oxml.ns import qn
|
||||
@@ -373,6 +417,8 @@ def docx_to_markdown(path: Path) -> str:
|
||||
|
||||
def xlsx_to_markdown(path: Path) -> str:
|
||||
"""Convert an .xlsx file to markdown text using openpyxl."""
|
||||
if not _zip_within_caps(path):
|
||||
return ""
|
||||
try:
|
||||
import openpyxl
|
||||
wb = openpyxl.load_workbook(str(path), read_only=True, data_only=True)
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
"""Resource-cap guards for parsing untrusted office/PDF files (F2).
|
||||
|
||||
.docx/.xlsx are zip+XML containers; a few-KB zip-bomb can decompress to
|
||||
gigabytes and OOM-kill the process during a corpus scan. These tests verify the
|
||||
pre-parse screen rejects bombs before openpyxl/python-docx ever decompress them.
|
||||
"""
|
||||
import zipfile
|
||||
|
||||
from graphify import detect
|
||||
|
||||
|
||||
def _write_zip(path, name, payload):
|
||||
with zipfile.ZipFile(path, "w", zipfile.ZIP_DEFLATED) as zf:
|
||||
zf.writestr(name, payload)
|
||||
|
||||
|
||||
def test_file_within_size_cap(tmp_path):
|
||||
f = tmp_path / "a.bin"
|
||||
f.write_bytes(b"x" * 1024)
|
||||
assert detect._file_within_size_cap(f) is True # within default cap
|
||||
assert detect._file_within_size_cap(f, cap=512) is False # over an explicit small cap
|
||||
assert detect._file_within_size_cap(tmp_path / "missing") is False
|
||||
|
||||
|
||||
def test_zip_ratio_bomb_rejected(tmp_path):
|
||||
"""A tiny file that expands far past the ratio threshold is rejected."""
|
||||
bomb = tmp_path / "bomb.xlsx"
|
||||
_write_zip(bomb, "xl/worksheets/sheet1.xml", b"0" * (5 * 1024 * 1024)) # 5 MiB of zeros -> tiny zip
|
||||
assert bomb.stat().st_size < 100 * 1024 # compressed to well under 100 KiB
|
||||
assert detect._zip_within_caps(bomb) is False
|
||||
|
||||
|
||||
def test_legit_zip_passes(tmp_path):
|
||||
ok = tmp_path / "ok.docx"
|
||||
_write_zip(ok, "word/document.xml", b"<xml>hello world</xml>" * 20)
|
||||
assert detect._zip_within_caps(ok) is True
|
||||
|
||||
|
||||
def test_non_zip_rejected(tmp_path):
|
||||
notzip = tmp_path / "fake.xlsx"
|
||||
notzip.write_bytes(b"this is not a zip file")
|
||||
assert detect._zip_within_caps(notzip) is False
|
||||
|
||||
|
||||
def test_converters_return_empty_for_bomb(tmp_path):
|
||||
"""The live converters bail out (return "") on a bomb before parsing."""
|
||||
for ext in (".docx", ".xlsx"):
|
||||
bomb = tmp_path / f"bomb{ext}"
|
||||
_write_zip(bomb, "x.xml", b"0" * (5 * 1024 * 1024))
|
||||
assert detect.docx_to_markdown(bomb) == ""
|
||||
assert detect.xlsx_to_markdown(bomb) == ""
|
||||
|
||||
|
||||
def test_pdf_over_cap_returns_empty(tmp_path, monkeypatch):
|
||||
"""A PDF larger than the raw cap is skipped before pypdf opens it."""
|
||||
big = tmp_path / "big.pdf"
|
||||
big.write_bytes(b"%PDF-1.4\n" + b"x" * 4096)
|
||||
# shrink the cap via the helper's default by patching the module constant and
|
||||
# calling through a wrapper that reads it fresh
|
||||
monkeypatch.setattr(detect, "_OFFICE_MAX_RAW_BYTES", 100)
|
||||
monkeypatch.setattr(detect, "_file_within_size_cap",
|
||||
lambda p, cap=100: p.stat().st_size <= cap if p.exists() else False)
|
||||
assert detect.extract_pdf_text(big) == ""
|
||||
Reference in New Issue
Block a user