opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: properly check path arguments after flags in exec denyWritePaths

Browse source
This commit is contained in:
stevef 2026-04-17 20:58:53 +02:00
parent f259a04aa9
commit 86d203222d
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkg/tools/shell.go
View file

@ -1049,14 +1049,31 @@ func (t *ExecTool) guardCommand(command, cwd string) string {
if len(t.denyWritePaths) > 0 {
words := strings.Fields(cmd)
for i, word := range words {
// Skip flags but check their argument (next word)
if word == "-p" || word == "-rf" || word == "-r" || word == "-f" || word == "-d" {
// Check the next word as the actual path
if i+1 < len(words) {
nextWord := words[i+1]
for _, pattern := range t.denyWritePaths {
if pattern.MatchString(nextWord) {
return fmt.Sprintf("Command blocked: cannot write to %s (access denied)", nextWord)
}
// Also check path components
pathParts := strings.Split(nextWord, "/")
for _, part := range pathParts {
if pattern.MatchString(part) {
return fmt.Sprintf("Command blocked: cannot write to %s (access denied)", part)
}
}
}
}
continue
}
for _, pattern := range t.denyWritePaths {
if pattern.MatchString(word) {
return fmt.Sprintf("Command blocked: cannot write to %s (access denied)", word)
}
// Also check path components like "skills" in "mkdir -p skills/my_skill"
if i >= 0 && (word == "-p" || word == "-rf" || word == "-r") {
continue
}
pathParts := strings.Split(word, "/")
for _, part := range pathParts {
if pattern.MatchString(part) {