wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-05-25 00:17:23 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix(assets): reject path traversal when resolving output abs_path

Browse Source 
Subfolder/filename were joined and absolutized without containment check,
so '..' segments or an absolute filename could escape the type's base
directory and register an unrelated on-disk file as an asset.

Add commonpath-based containment check; skip enrichment (warn, leave
entry unchanged) when the resolved path escapes base. Catches ValueError
from cross-drive paths on Windows.
This commit is contained in:
Matt Miller 2026-05-20 10:57:40 -07:00
parent 29556e6098
commit f91e3416b6
2 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comfy_execution/asset_enrichment.py
View File

@ -40,7 +40,15 @@ def enrich_output_with_assets(output_ui: dict) -> dict:
if base is None:
new_entries.append(entry)
continue
abs_path = os.path.abspath(os.path.join(base, entry.get("subfolder", ""), entry["filename"]))
base_abs = os.path.abspath(base)
abs_path = os.path.abspath(os.path.join(base_abs, entry.get("subfolder") or "", entry["filename"]))
try:
if os.path.commonpath([base_abs, abs_path]) != base_abs:
raise ValueError("escapes base")
except ValueError:
logging.warning("Asset enrichment skipped (path escapes base): %s", entry.get("filename"))
new_entries.append(entry)
continue
if not os.path.isfile(abs_path):
new_entries.append(entry)
continue

64
tests-unit/execution_test/test_enrich_output.py
View File

@ -172,6 +172,70 @@ class TestEnrichOutputWithAssets(unittest.TestCase):
self.assertIsNone(result["images"][0])
self.assertIn("id", result["images"][1])
def test_path_traversal_subfolder_skipped(self):
fake_session_cm = MagicMock()
fake_session_cm.__enter__ = MagicMock(return_value=MagicMock())
fake_session_cm.__exit__ = MagicMock(return_value=False)
register_mock = MagicMock(return_value=_make_register_result())
mocked_modules = {
"comfy.cli_args": MagicMock(args=_make_args(True)),
"folder_paths": MagicMock(get_directory_by_type=MagicMock(return_value="/output")),
"app.assets.services.ingest": MagicMock(
register_file_in_place=register_mock,
DependencyMissingError=type("DependencyMissingError", (Exception,), {}),
),
"app.assets.database.queries.asset_reference": MagicMock(
get_reference_by_file_path=MagicMock(return_value=None),
),
"app.database.db": MagicMock(create_session=MagicMock(return_value=fake_session_cm)),
}
output = {"images": [{"filename": "passwd", "subfolder": "../../etc", "type": "output"}]}
# Do NOT patch os.path.abspath — real resolution is required for the containment check.
with patch.dict("sys.modules", mocked_modules), \
patch("os.path.isfile", return_value=True):
import importlib
import comfy_execution.asset_enrichment as mod
importlib.reload(mod)
result = mod.enrich_output_with_assets(output)
self.assertNotIn("id", result["images"][0])
register_mock.assert_not_called()
def test_absolute_filename_skipped(self):
fake_session_cm = MagicMock()
fake_session_cm.__enter__ = MagicMock(return_value=MagicMock())
fake_session_cm.__exit__ = MagicMock(return_value=False)
register_mock = MagicMock(return_value=_make_register_result())
mocked_modules = {
"comfy.cli_args": MagicMock(args=_make_args(True)),
"folder_paths": MagicMock(get_directory_by_type=MagicMock(return_value="/output")),
"app.assets.services.ingest": MagicMock(
register_file_in_place=register_mock,
DependencyMissingError=type("DependencyMissingError", (Exception,), {}),
),
"app.assets.database.queries.asset_reference": MagicMock(
get_reference_by_file_path=MagicMock(return_value=None),
),
"app.database.db": MagicMock(create_session=MagicMock(return_value=fake_session_cm)),
}
# Absolute filename — os.path.join discards earlier components when a later one is absolute.
output = {"images": [{"filename": "/etc/passwd", "subfolder": "", "type": "output"}]}
with patch.dict("sys.modules", mocked_modules), \
patch("os.path.isfile", return_value=True):
import importlib
import comfy_execution.asset_enrichment as mod
importlib.reload(mod)
result = mod.enrich_output_with_assets(output)
self.assertNotIn("id", result["images"][0])
register_mock.assert_not_called()
if __name__ == "__main__":
unittest.main()