The agent that grows with you
Python aiai-agentai-agentsanthropicchatgptclaudeclaude-codecodexhermeshermes-agentllmnous-researchopenai
fix(webapp): follow a linked plugin folder, never a linked entry file
unsupportedpastels2e6093400d2f
diff --git a/hermes_cli/web_routers/desktop_plugins.py b/hermes_cli/web_routers/desktop_plugins.pyindex ae374204db6..ee463fce7a1 100644--- a/hermes_cli/web_routers/desktop_plugins.py+++ b/hermes_cli/web_routers/desktop_plugins.py@@ -14,6 +14,8 @@ at the preview cap. Webapp only (``SurfacePolicy.desktop_plugins``; 404 elsewherfrom __future__ import annotationsimport asyncio+import os+import statfrom pathlib import Pathfrom fastapi import APIRouter, HTTPException@@ -40,7 +42,8 @@ def desktop_plugins_root() -> Path:def _inside_root(raw: str) -> tuple[Path, tuple[str, ...]]:"""*raw* and its parts below the root, judged as written: no ``..``, at most a folder and a file.Links are not resolved here; a linked plugin folder is followed like native Desktop follows it.- The link buys nothing the tab cannot already reach through ``/api/fs`` or the host terminal."""+ The files inside it are not: :func:`_read` refuses a linked entry file, which could name any+ file on the host, ``.env`` included, past the sensitive-file guard ``/api/fs`` applies."""root = desktop_plugins_root()try:parts = Path(raw).relative_to(root).parts@@ -63,14 +66,32 @@ def _list(raw: str) -> dict:def _read(raw: str) -> dict:+ from hermes_cli.web_routers.files import _is_sensitive_path+target, parts = _inside_root(raw)- if len(parts) != 2 or parts[1] not in _READABLE_FILES or not target.is_file():- raise HTTPException(status_code=404, detail="Not a desktop plugin file")- size = target.stat().st_size- if size > PLUGIN_SOURCE_MAX_BYTES:+ not_found = HTTPException(status_code=404, detail="Not a desktop plugin file")+ if len(parts) != 2 or parts[1] not in _READABLE_FILES:+ raise not_found+ # Follow a linked plugin folder, never a linked file in it: open the entry inside the folder's+ # real path without following a final link, so a check-then-swap can't slip one in either.+ try:+ entry = target.parent.resolve(strict=True) / parts[1]+ if entry.is_symlink() or _is_sensitive_path(entry):+ raise not_found+ fd = os.open(entry, os.O_RDONLY | getattr(os, "O_NOFOLLOW", 0) | getattr(os, "O_BINARY", 0))+ except OSError:+ raise not_found from None+ with os.fdopen(fd, "rb") as handle:+ st = os.fstat(handle.fileno())+ if not stat.S_ISREG(st.st_mode):+ raise not_found+ if st.st_size > PLUGIN_SOURCE_MAX_BYTES:+ raise HTTPException(status_code=413, detail="Plugin source exceeds 16 MiB")+ data = handle.read(PLUGIN_SOURCE_MAX_BYTES + 1)+ if len(data) > PLUGIN_SOURCE_MAX_BYTES:raise HTTPException(status_code=413, detail="Plugin source exceeds 16 MiB")- text = target.read_text(encoding="utf-8-sig", errors="replace")- return {"byteSize": size, "path": str(target), "text": text, "truncated": False}+ text = data.decode("utf-8-sig", errors="replace")+ return {"byteSize": st.st_size, "path": str(target), "text": text, "truncated": False}@router.get("/api/desktop-plugins/root")diff --git a/tests/hermes_cli/test_webapp_desktop_plugins.py b/tests/hermes_cli/test_webapp_desktop_plugins.pyindex f3a56bb8df3..3ea9e35b8ab 100644--- a/tests/hermes_cli/test_webapp_desktop_plugins.py+++ b/tests/hermes_cli/test_webapp_desktop_plugins.py@@ -112,6 +112,22 @@ def test_a_linked_plugin_folder_loads_like_native_desktop(webapp, hermes_root, tassert webapp.get("/api/desktop-plugins/read", params={"path": str(link / "notes.txt")}).status_code == 404[email protected]("entry", ["plugin.js", ".hermes-package.json"])+def test_a_linked_entry_file_is_never_followed(webapp, hermes_root, entry):+ # Only folders are followed: a linked entry could name `.env`, which /api/fs refuses to read.+ (hermes_root / ".env").write_text("OPENAI_API_KEY=sk-test", encoding="utf-8")+ folder = hermes_root / "desktop-plugins" / "evil"+ folder.mkdir(parents=True)+ try:+ (folder / entry).symlink_to(hermes_root / ".env")+ except OSError:+ pytest.skip("symlinks need privileges here")++ read = webapp.get("/api/desktop-plugins/read", params={"path": str(folder.resolve() / entry)})+ assert read.status_code == 404+ assert "sk-test" not in read.text++@pytest.mark.parametrize("surface", ["gateway", "dashboard", "serve"])def test_only_the_webapp_serves_desktop_plugins(monkeypatch, hermes_root, surface):_install(hermes_root, "notes", "export default {}")