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
24 changes: 24 additions & 0 deletions internal/runner/runner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -870,6 +870,30 @@ func TestRunnableBenchmarkScannersFiltersUnsupportedTargetKind(t *testing.T) {
}
}

func TestUnsafeWindowsShellTargetDetectsInjectionCharacters(t *testing.T) {
unsafe := []string{
`%PATH%`,
`!DELAYED!`,
`skill" & calc.exe`,
`C:\skills\a"b`,
}
for _, target := range unsafe {
if !unsafeWindowsShellTarget(target) {
t.Errorf("unsafeWindowsShellTarget(%q) = false, want true", target)
}
}
safe := []string{
`https://example.com/skill`,
`C:\skills\my-skill`,
`./local/skill`,
}
for _, target := range safe {
if unsafeWindowsShellTarget(target) {
t.Errorf("unsafeWindowsShellTarget(%q) = true, want false", target)
}
}
}

func TestValidateRequirementsSkipsScannerResultCredentials(t *testing.T) {
opts, err := ParseArgs([]string{
"./my-skill",
Expand Down
14 changes: 14 additions & 0 deletions internal/runner/user_defined_scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,26 @@ func (adapter userDefinedScannerAdapter) SupportsTargetKind(kind string) bool {

func (adapter userDefinedScannerAdapter) CommandBacked() bool { return true }

// unsafeWindowsShellTarget reports whether a target cannot be interpolated into
// a cmd.exe command line safely: %VAR% expands even inside double quotes, !VAR!
// does too when delayed expansion is enabled, and backslash does not escape "
// for cmd.exe, so a quote in a target could terminate the argument and inject
// host commands.
func unsafeWindowsShellTarget(target string) bool {
return strings.ContainsAny(target, "%\"!")
}

func (adapter userDefinedScannerAdapter) Run(runner ExternalScannerRunner, target string, startedAt string) (ScannerResult, error) {
shell := userDefinedScannerShell(runtime.GOOS, runner.SandboxMode)
targetReplacement := shell.quote(target)
usePositionalTarget := shell.command == "/bin/sh"
if usePositionalTarget {
targetReplacement = `"$1"`
} else if unsafeWindowsShellTarget(target) {
return ScannerResult{
Status: "failed", StartedAt: startedAt, CompletedAt: time.Now().UTC().Format(time.RFC3339Nano),
Error: fmt.Sprintf(`User-defined scanner %s cannot receive targets containing %%, !, or " on the Windows host shell; use the Docker sandbox or a target without those characters`, adapter.config.ID),
}, nil
}
rendered := targetPlaceholderPattern.ReplaceAllStringFunc(adapter.config.Command, func(string) string {
return targetReplacement
Expand Down
Loading