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

fix(exec): preserve additive custom allow behavior

Browse source
This commit is contained in:
danmobot 2026-06-23 20:47:15 +01:00
parent 9721c36e55
commit ff247b63ac
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/tools/shell.go
View file

@ -1162,7 +1162,7 @@ func (t *ExecTool) guardCommand(command, cwd string) string {
} }
} }
if len(t.allowPatterns) > 0 || len(t.customAllowPatterns) > 0 { if len(t.allowPatterns) > 0 {
if !t.commandMatchesAllowPattern(lower) { if !t.commandMatchesAllowPattern(lower) {
return "Command blocked by safety guard (not in allowlist)" return "Command blocked by safety guard (not in allowlist)"
} }

17
pkg/tools/shell_test.go
View file

@ -1970,3 +1970,20 @@ func TestShellTool_CustomAllowStillPermitsSafeMatch(t *testing.T) {
t.Fatalf("safe custom-allowed command should pass guard, got: %q", got) t.Fatalf("safe custom-allowed command should pass guard, got: %q", got)
} }
} }
func TestShellTool_CustomAllowDoesNotBecomeStrictAllowlist(t *testing.T) {
cfg := &config.Config{}
cfg.Tools.Exec.EnableDenyPatterns = true
cfg.Tools.Exec.CustomAllowPatterns = []string{`^jq\b`}
cfg.Tools.Exec.CustomDenyPatterns = []string{`\$env\b`, `(^|[^.$a-z0-9_])env([^a-z0-9_]|$)`}
tool, err := NewExecToolWithConfig(t.TempDir(), false, cfg)
if err != nil {
t.Fatalf("NewExecToolWithConfig() error: %v", err)
}
got := tool.guardCommand("ls", t.TempDir())
if got != "" {
t.Fatalf("custom allow patterns should not become a strict allowlist, got: %q", got)
}
}