Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
31 changes: 31 additions & 0 deletions internal/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,37 @@ func TestRunnableBenchmarkScannersFiltersUnsupportedTargetKind(t *testing.T) {
}
}

func TestUserDefinedScannerUsesIsolatedCwd(t *testing.T) {
adapter := NewUserDefinedScanner(UserDefinedScannerConfig{
ID: "test", Command: "test {{target}}", Targets: []string{"skill"},
})
registry, err := NewScannerRegistry(adapter)
if err != nil {
t.Fatal(err)
}
commandRunner := &recordingCommandRunner{stdout: `{}`}
targetDir := t.TempDir()
result, err := (ExternalScannerRunner{
Registry: registry, CommandRunner: commandRunner, Env: map[string]string{}, SandboxMode: SandboxModeOff,
}).RunScanner("test", filepath.Join(targetDir, "file.txt"), "2026-07-21T00:00:00Z")
if err != nil {
t.Fatal(err)
}
if result.Status != "completed" {
t.Fatalf("result = %#v", result)
}
if len(commandRunner.calls) != 1 {
t.Fatalf("calls = %#v", commandRunner.calls)
}
cwd := commandRunner.calls[0].cwd
if cwd == "" || cwd == targetDir || strings.HasPrefix(cwd, targetDir) {
t.Fatalf("cwd = %q should be isolated, not targetdir = %q", cwd, targetDir)
}
if !strings.Contains(cwd, "clawscan-scanner-") {
t.Fatalf("cwd = %q should contain clawscan-scanner prefix", cwd)
}
}

func TestUnsafeWindowsShellTargetDetectsInjectionCharacters(t *testing.T) {
unsafe := []string{
`%PATH%`,
Expand Down
32 changes: 17 additions & 15 deletions internal/runner/user_defined_scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ package runner
import (
"encoding/json"
"fmt"
"net/url"
"os"
"path/filepath"
"regexp"
"runtime"
"strings"
Expand Down Expand Up @@ -89,7 +87,23 @@ func (adapter userDefinedScannerAdapter) Run(runner ExternalScannerRunner, targe
if timeout == 0 {
timeout = 20 * time.Minute
}
output, runErr := runner.CommandRunner.Run(shell.command, args, userDefinedScannerCWD(target), timeout)
// Never run with a target-derived working directory: it would hand the
// scanner writable access to files next to the target (a writable bind
// mount under Docker). Host runs get a fresh isolated dir; Docker runs keep
// "" so nothing is mounted and the container workdir is already isolated.
cwd := ""
if runner.SandboxMode != SandboxModeDocker {
isolated, err := os.MkdirTemp("", "clawscan-scanner-")
if err != nil {
return ScannerResult{
Status: "failed", StartedAt: startedAt, CompletedAt: time.Now().UTC().Format(time.RFC3339Nano),
Error: fmt.Sprintf("User-defined scanner %s could not create an isolated working directory: %v", adapter.config.ID, err),
}, nil
}
defer os.RemoveAll(isolated)
cwd = isolated
}
output, runErr := runner.CommandRunner.Run(shell.command, args, cwd, timeout)
exitCode := gateEligibleExitCode(output.ExitCode)
completedAt := time.Now().UTC().Format(time.RFC3339Nano)
raw := strings.TrimSpace(output.Stdout)
Expand Down Expand Up @@ -133,15 +147,3 @@ func userDefinedScannerShell(goos string, sandboxMode string) judgeShellSpec {
}

var targetPlaceholderPattern = regexp.MustCompile(`\{\{\s*target\s*\}\}`)

func userDefinedScannerCWD(target string) string {
parsed, err := url.Parse(target)
if err == nil && parsed.Scheme != "" && parsed.Host != "" {
return ""
}
info, err := os.Stat(target)
if err == nil && info.IsDir() {
return target
}
return filepath.Dir(target)
}
Loading