ffmpeg-skill 2.23.0 → 2.23.1

package/docs/contract.md

@@ -21,7 +21,7 @@ The contract is derived from the code that runs, not maintained beside it:
 | Field | Meaning | Changes when |
 |---|---|---|
 | `contract_version` | shape of this document (`1.0`) | a key is renamed, removed or changes meaning |
-| `skill.version` | the npm / package.json version (`2.23.0`) | any release |
+| `skill.version` | the npm / package.json version (`2.23.1`) | any release |
 
 A release that adds a tool or a flag keeps `contract_version`; a breaking change to the
 ToolSpec shape bumps it. Consumers pin on `contract_version` and read `skill.version`
@@ -131,7 +131,7 @@ JSON would have been rewritten for that. The flat keys, typed per tool in `outpu
   "deprecated": [{"what": "running on Python 3.9 (the requirements.python floor)", "since": "2.10.9", "replacement": "Python 3.10 or later; ...", "removed_in": "3.0.0", "where": "behaviour"},
                  {"what": "running on FFmpeg 5.x (the requirements.ffmpeg floor)", "since": "2.14.0", "replacement": "FFmpeg 6.1 or later; ...", "removed_in": "3.0.0", "where": "behaviour"}],
   "removed": [{"what": "...", "since": "1.10.0", "replacement": "...", "removed_in": "2.0.0", "where": "cli | json | mcp | behaviour"}],
-  "skill": {"id": "ffmpeg-skill", "version": "2.23.0", "execution_mode": "local", "kind": "execution",
+  "skill": {"id": "ffmpeg-skill", "version": "2.23.1", "execution_mode": "local", "kind": "execution",
             "entrypoints": {"cli": "...", "mcp": "...", "contract": "...", "doctor": "..."},
             "not_provided": ["AI reasoning", "decisions", "production plans", "project IR", "approvals", "network access", "transcription engine"]},
   "requirements": {"python": ">=3.9 (standard library only; 3.9 deprecated since 2.10.9, removed in 3.0.0; 3.10+ recommended)", "ffmpeg": ">=5.0 (5.x deprecated since 2.14.0, removed in 3.0.0; 6.1+ recommended)", "ffprobe": ">=5.0"},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ffmpeg-skill",
-  "version": "2.23.0",
+  "version": "2.23.1",
   "description": "Agent Skill that gives coding agents (Claude Code, Cursor, Codex) a local video editor: 42 FFmpeg tools with a machine-readable contract, contract-derived MCP server, FFmpeg capability detection, probe-first / verify-last workflow. Cut, join, silence removal, fit, captions and karaoke, overlays, motion graphics, HDR to SDR, LUTs, audio clean-up and typed dynamics, sync with drift correction, multicam, loudness, delivery checks, project rendering, batch. No API keys, no cloud, no dependencies.",
   "keywords": [
     "ffmpeg",

package/scripts/_common/drawtext.py

@@ -60,7 +60,7 @@ def drawtext_fontfile(path: str) -> str:
     st = os.stat(path)
     # the path plus size and mtime: a font replaced in place during the run gets a new copy
     key = f"{path}|{st.st_size}|{st.st_mtime_ns}".encode("utf-8")
-    name = "font_" + hashlib.sha1(key).hexdigest()[:16] + os.path.splitext(path)[1].lower()
+    name = "font_" + hashlib.sha1(key, usedforsecurity=False).hexdigest()[:16] + os.path.splitext(path)[1].lower()
     copy = os.path.join(tmpdir, name)
     if not copy.isascii():
         warn(f"font: {path} is not an ASCII path and no ASCII copy could be placed; drawtext may "

package/scripts/_common/timeline.py

@@ -492,13 +492,42 @@ def parses(path: str, fmt: str) -> bool:
     return why is None
 
 
+def _xml_root_tag(data: bytes) -> str:
+    """The root element of a well-formed XML document, read with expat directly.
+
+    ElementTree expands entities declared in an internal DTD, and on Python 3.9/3.10 (both
+    supported) that is an entity-expansion ("billion laughs") risk on a file the tool did not
+    write. A timeline never declares an entity (to_fcpxml writes a bare `<!DOCTYPE fcpxml>`), so
+    a declaration is refused rather than expanded. Errors are ElementTree's ParseError, so a
+    failure reads the same as before."""
+    from xml.etree.ElementTree import ParseError
+    from xml.parsers import expat
+    parser = expat.ParserCreate()
+    parser.SetParamEntityParsing(expat.XML_PARAM_ENTITY_PARSING_NEVER)
+    root: List[str] = []
+
+    def start(name: str, _attrs: Any) -> None:
+        if not root:
+            root.append(name)
+
+    def entity(name: str, *_rest: Any) -> None:
+        raise ParseError(f"the document declares the entity {name!r}; a timeline never declares one")
+
+    parser.StartElementHandler = start
+    parser.EntityDeclHandler = entity
+    try:
+        parser.Parse(data, True)
+    except expat.ExpatError as exc:
+        raise ParseError(str(exc)) from None
+    return root[0]
+
+
 def parse_error(path: str, fmt: str) -> Optional[str]:
     """Why `path` does not read back as `fmt`, or None when it does (parses() without the record)."""
     try:
         text = Path(path).read_text(encoding="utf-8")
         if fmt == "fcpxml":
-            import xml.etree.ElementTree as ET
-            tag = ET.fromstring(text.encode("utf-8")).tag
+            tag = _xml_root_tag(text.encode("utf-8"))
             return None if tag == "fcpxml" else f"the root element is <{tag}>, not <fcpxml>"
         if fmt == "otio":
             doc = json.loads(text)

package/scripts/batch.py

@@ -49,7 +49,7 @@ ALLOWED_STEP_SCRIPTS = {p.name for p in HERE.glob("*.py") if not p.name.startswi
 
 def file_key(path: Path) -> str:
     st = path.stat()
-    h = hashlib.sha1()
+    h = hashlib.sha1(usedforsecurity=False)  # a change detector, not a secret
     h.update(f"{path.name}|{st.st_size}|{int(st.st_mtime)}".encode())
     with open(path, "rb") as fh:  # first and last MB: cheap and good enough to detect changes
         h.update(fh.read(1 << 20))
@@ -75,7 +75,7 @@ def recipe_key(recipe: Dict[str, Any]) -> str:
             # content, so say so (each item that needs it then fails on reading it)
             warn(f"recipe.project {recipe['project']} could not be read ({exc}); the cache key covers the recipe only",
                  "recipe_project_unreadable", path=str(recipe["project"]), error=str(exc))
-    return hashlib.sha1((json.dumps(recipe, sort_keys=True) + "\0" + project_content).encode()).hexdigest()[:12]
+    return hashlib.sha1((json.dumps(recipe, sort_keys=True) + "\0" + project_content).encode(), usedforsecurity=False).hexdigest()[:12]
 
 
 def gpu_key() -> str:

package/scripts/render.py

@@ -724,7 +724,7 @@ def cache_key(stage: str, script: str, argv: "Sequence[Any]", inputs: "Sequence[
         "hw": [os.environ.get(HW_ENV, "").strip().lower() in ("1", "true", "yes", "on"), os.environ.get(HW_FORCED_ENV) == "1"],
         "ffmpeg": CACHE.get("ffmpeg"), "skill": SKILL_VERSION, "contract": CONTRACT_VERSION,
     }
-    return hashlib.sha1(json.dumps(payload, sort_keys=True, ensure_ascii=False).encode()).hexdigest()
+    return hashlib.sha1(json.dumps(payload, sort_keys=True, ensure_ascii=False).encode(), usedforsecurity=False).hexdigest()
 
 
 def _cache_miss(stage: str, reason: str, **facts: Any) -> bool: