Skip to content

fix(exec): block kill command pattern in safety guard #1127

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

Merged
mengzhuo merged 4 commits into from
Mar 6, 2026
Merged

fix(exec): block kill command pattern in safety guard #1127

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c599d2
fix(exec): block kill command pattern in safety guard
mosir Mar 5, 2026
0f568ac
Merge branch 'sipeed:main' into fix/reload-config-selfkill-guard
mosir Mar 5, 2026
d0f6276
Merge branch 'sipeed:main' into fix/reload-config-selfkill-guard
mosir Mar 6, 2026
aa2d6b3
refactor(tools): remove redundant kill -9 pattern
mosir Mar 6, 2026
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
1 change: 1 addition & 0 deletions pkg/tools/shell.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ var (
regexp.MustCompile(`\bchown\b`),
regexp.MustCompile(`\bpkill\b`),
regexp.MustCompile(`\bkillall\b`),
regexp.MustCompile(`\bkill\b`),
regexp.MustCompile(`\bkill\s+-[9]\b`),
Copy link
Collaborator

@mengzhuo mengzhuo Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you add kill to block, please drop kill -9 here

Copy link
Contributor Author

@mosir mosir Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done! I've removed the redundant \bkill\s+-[9]\b pattern since \bkill\b now blocks all kill commands. The change has been pushed to this PR.

regexp.MustCompile(`\bcurl\b.*\|\s*(sh|bash)`),
regexp.MustCompile(`\bwget\b.*\|\s*(sh|bash)`),
Expand Down
20 changes: 20 additions & 0 deletions pkg/tools/shell_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,26 @@ func TestShellTool_DangerousCommand(t *testing.T) {
}
}

func TestShellTool_DangerousCommand_KillBlocked(t *testing.T) {
tool, err := NewExecTool("", false)
if err != nil {
t.Errorf("unable to configure exec tool: %s", err)
}

ctx := context.Background()
args := map[string]any{
"command": "kill 12345",
}

result := tool.Execute(ctx, args)
if !result.IsError {
t.Errorf("Expected kill command to be blocked")
}
if !strings.Contains(result.ForLLM, "blocked") && !strings.Contains(result.ForUser, "blocked") {
t.Errorf("Expected blocked message, got ForLLM: %s, ForUser: %s", result.ForLLM, result.ForUser)
}
}

// TestShellTool_MissingCommand verifies error handling for missing command
func TestShellTool_MissingCommand(t *testing.T) {
tool, err := NewExecTool("", false)
Expand Down
Loading