fix: add base_dir path containment to FileWriterTool

os.path.join does not prevent traversal — joining "./" with "../../../etc/cron.d/pwned"
resolves cleanly outside any intended scope. The tool also called os.makedirs on
the unvalidated path, meaning it would create arbitrary directory structures.

Adds a base_dir parameter that uses os.path.realpath() to resolve the final path
(including symlinks) before checking containment. Any filename or directory argument
that resolves outside base_dir is rejected before any filesystem operation occurs.

When base_dir is not set the tool behaves as before — only use that in fully
sandboxed environments.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Rip&Tear
2026-03-15 23:51:01 +08:00
parent fb2323b3de
commit 6fc0914f26
2 changed files with 130 additions and 16 deletions

View File

@@ -135,3 +135,78 @@ def test_file_exists_error_handling(tool, temp_env, overwrite):
assert "already exists and overwrite option was not passed" in result
assert read_file(path) == "Pre-existing content"
# --- base_dir containment ---
@pytest.fixture
def scoped_tool(temp_env):
return FileWriterTool(base_dir=temp_env["temp_dir"])
def test_base_dir_allows_write_inside(scoped_tool, temp_env):
result = scoped_tool._run(
filename=temp_env["test_file"],
directory=temp_env["temp_dir"],
content=temp_env["test_content"],
overwrite=True,
)
assert "successfully written" in result
assert read_file(get_test_path(temp_env["test_file"], temp_env["temp_dir"])) == temp_env["test_content"]
def test_base_dir_blocks_traversal_in_filename(scoped_tool, temp_env):
result = scoped_tool._run(
filename="../outside.txt",
directory=temp_env["temp_dir"],
content="should not be written",
overwrite=True,
)
assert "Access denied" in result
def test_base_dir_blocks_traversal_in_directory(scoped_tool, temp_env):
result = scoped_tool._run(
filename="pwned.txt",
directory=os.path.join(temp_env["temp_dir"], "../../etc/cron.d"),
content="should not be written",
overwrite=True,
)
assert "Access denied" in result
def test_base_dir_blocks_absolute_path_outside(scoped_tool, temp_env):
result = scoped_tool._run(
filename="passwd",
directory="/etc",
content="should not be written",
overwrite=True,
)
assert "Access denied" in result
def test_base_dir_blocks_symlink_escape(scoped_tool, temp_env):
link = os.path.join(temp_env["temp_dir"], "escape")
os.symlink("/etc", link)
result = scoped_tool._run(
filename="crontab",
directory=link,
content="should not be written",
overwrite=True,
)
assert "Access denied" in result
def test_base_dir_allows_nested_subdir(scoped_tool, temp_env):
result = scoped_tool._run(
filename="file.txt",
directory=os.path.join(temp_env["temp_dir"], "subdir"),
content="nested content",
overwrite=True,
)
assert "successfully written" in result
def test_base_dir_description_mentions_directory(temp_env):
tool = FileWriterTool(base_dir=temp_env["temp_dir"])
assert temp_env["temp_dir"] in tool.description