Skip to content

fix: resolve relative paths correctly in exec tool safety guard #2826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yuxuan-7814 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

fix: resolve relative paths correctly in exec tool safety guard #2826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pkg/tools/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,9 +1094,15 @@ func (t *ExecTool) guardCommand(command, cwd string) string {
}
}

p, err := filepath.Abs(raw)
if err != nil {
continue
// Resolve the path correctly based on cwd:
// - Absolute paths: use as-is (cleaned)
// - Relative paths: join with cwd to resolve correctly
var p string
if filepath.IsAbs(raw) {
p = filepath.Clean(raw)
} else {
p = filepath.Join(cwdPath, raw)
p = filepath.Clean(p)
}

if safePaths[p] {
Expand Down