APEX/BrowserUse_and_ComputerUse_skills
5
0
Fork 0
Code Issues 6 Pull requests 1 Projects 1 Releases Packages Wiki Activity Actions

refactor: use Path.is_relative_to() for skill_view boundary check

Browse source 
Replace the string-based startswith + os.sep approach with
Path.is_relative_to() (Python 3.9+, we require 3.10+). This is
the idiomatic pathlib way to check path containment — it handles
separators, case sensitivity, and the equal-path case natively
without string manipulation.

Simplified tests to match: removed the now-unnecessary
test_separator_is_os_native test since is_relative_to doesn't
depend on separator choice.
This commit is contained in:
teknium1 2026-03-04 05:30:43 -08:00
parent 7796ac1411
commit 79871c2083
2 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
tests/tools/test_skill_view_path_check.py
View file

@ -1,29 +1,25 @@
"""Tests for the skill_view path boundary check on all platforms. """Tests for the skill_view path boundary check.
Regression test: the original check used a hardcoded "/" separator which Regression test: the original check used a hardcoded "/" separator which
fails on Windows where Path.resolve() returns backslash-separated paths. fails on Windows where Path.resolve() returns backslash-separated paths.
The fix uses os.sep so the check works on both Unix and Windows. Now uses Path.is_relative_to() which handles all platforms correctly.
""" """
import json
import os import os
import pytest import pytest
from pathlib import Path from pathlib import Path
def _path_escapes_skill_dir(resolved: Path, skill_dir_resolved: Path) -> bool: def _path_escapes_skill_dir(resolved: Path, skill_dir_resolved: Path) -> bool:
"""Reproduce the boundary check from tools/skills_tool.py (line 461). """Reproduce the boundary check from tools/skills_tool.py.
Returns True when the resolved path is OUTSIDE the skill directory. Returns True when the resolved path is OUTSIDE the skill directory.
""" """
return ( return not resolved.is_relative_to(skill_dir_resolved)
not str(resolved).startswith(str(skill_dir_resolved) + os.sep)
and resolved != skill_dir_resolved
)
class TestSkillViewPathBoundaryCheck: class TestSkillViewPathBoundaryCheck:
"""Verify the os.sep fix prevents false positives on Windows.""" """Verify the path boundary check works on all platforms."""
def test_valid_subpath_allowed(self, tmp_path): def test_valid_subpath_allowed(self, tmp_path):
"""A file inside the skill directory must NOT be flagged.""" """A file inside the skill directory must NOT be flagged."""
@ -82,7 +78,7 @@ class TestSkillViewPathBoundaryCheck:
assert _path_escapes_skill_dir(resolved, skill_dir_resolved) is True assert _path_escapes_skill_dir(resolved, skill_dir_resolved) is True
def test_skill_dir_itself_allowed(self, tmp_path): def test_skill_dir_itself_allowed(self, tmp_path):
"""Requesting the skill directory itself must be allowed (== check).""" """Requesting the skill directory itself must be allowed."""
skill_dir = tmp_path / "skills" / "axolotl" skill_dir = tmp_path / "skills" / "axolotl"
skill_dir.mkdir(parents=True) skill_dir.mkdir(parents=True)
@ -91,12 +87,6 @@ class TestSkillViewPathBoundaryCheck:
assert _path_escapes_skill_dir(resolved, skill_dir_resolved) is False assert _path_escapes_skill_dir(resolved, skill_dir_resolved) is False
def test_separator_is_os_native(self):
"""Confirm the check uses the platform's native separator."""
# On Windows os.sep is '\\', on Unix '/'.
# The old bug hardcoded '/' which broke on Windows.
assert os.sep in ("\\", "/")
class TestOldCheckWouldFail: class TestOldCheckWouldFail:
"""Demonstrate the bug: the old hardcoded '/' check fails on Windows.""" """Demonstrate the bug: the old hardcoded '/' check fails on Windows."""

2
tools/skills_tool.py
View file

@ -458,7 +458,7 @@ def skill_view(name: str, file_path: str = None, task_id: str = None) -> str:
try: try:
resolved = target_file.resolve() resolved = target_file.resolve()
skill_dir_resolved = skill_dir.resolve() skill_dir_resolved = skill_dir.resolve()
if not str(resolved).startswith(str(skill_dir_resolved) + os.sep) and resolved != skill_dir_resolved: if not resolved.is_relative_to(skill_dir_resolved):
return json.dumps({ return json.dumps({
"success": False, "success": False,
"error": "Path escapes skill directory boundary.", "error": "Path escapes skill directory boundary.",