scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: improve subshell detection to avoid false positives with markdown content

Browse source
This commit is contained in:
Daniel Riccio 2025-07-22 19:37:49 -05:00
parent 2b8228ef0c
commit de2c6267b9
No known key found for this signature in database
GPG key ID: FFD5FD825F8E8209
1 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
webview-ui/src/utils/command-validation.ts
View file

@ -123,9 +123,10 @@ export function parseCommand(command: string): string[] {
currentCommand.push(token.op)
}
} else if (typeof token === "string") {
// Check if it's a subshell placeholder
// Check if this is a subshell placeholder
const subshellMatch = token.match(/__SUBSH_(\d+)__/)
if (subshellMatch) {
// Add the subshell command as a separate command
if (currentCommand.length > 0) {
commands.push(currentCommand.join(" "))
currentCommand = []
@ -279,6 +280,40 @@ export function isAutoDeniedSingleCommand(
return longestDeniedMatch.length >= longestAllowedMatch.length
}
/**
* Check if a command contains subshell execution that should be blocked.
* Only blocks if there's a denylist configured and the command isn't just outputting text.
*/
function containsBlockableSubshell(command: string, deniedCommands?: string[]): boolean {
if (!deniedCommands?.length) return false
const trimmedCommand = command.trim()
const isTextOutputCommand =
/^(echo|printf|cat|print)\s+["']/.test(trimmedCommand) || /^(echo|printf|cat|print)\s+\\?"/.test(trimmedCommand)
if (isTextOutputCommand) return false
// Look for actual command substitution $()
const hasCommandSubstitution = /\$\([^)]+\)/.test(command)
// For backticks, be more careful - they could be in markdown
let hasBacktickSubstitution = false
if (command.includes("`")) {
// Simple heuristic: if the command has multi-line content or markdown-like
// patterns, the backticks are probably not for command substitution
const hasMarkdownIndicators =
command.includes("```") || command.includes("\n") || command.includes("##") || command.includes("**")
if (!hasMarkdownIndicators) {
// Check if backticks are likely command substitution
// Look for patterns like: cmd `subcmd` or var=`cmd`
hasBacktickSubstitution = /[^\\]`[^`\n]+`/.test(command)
}
}
return hasCommandSubstitution || hasBacktickSubstitution
}
/**
* Check if a command string should be auto-approved.
* Only blocks subshell attempts if there's a denylist configured.
@ -288,7 +323,7 @@ export function isAutoApprovedCommand(command: string, allowedCommands: string[]
if (!command?.trim()) return true
// Only block subshell execution attempts if there's a denylist configured
if ((command.includes("$(") || command.includes("`")) && deniedCommands?.length) {
if (containsBlockableSubshell(command, deniedCommands)) {
return false
}
@ -313,7 +348,7 @@ export function isAutoDeniedCommand(command: string, allowedCommands: string[],
if (!command?.trim()) return false
// Only block subshell execution attempts if there's a denylist configured
if ((command.includes("$(") || command.includes("`")) && deniedCommands?.length) {
if (containsBlockableSubshell(command, deniedCommands)) {
return true
}
@ -385,7 +420,7 @@ export function getCommandDecision(
if (!command?.trim()) return "auto_approve"
// Only block subshell execution attempts if there's a denylist configured
if ((command.includes("$(") || command.includes("`")) && deniedCommands?.length) {
if (containsBlockableSubshell(command, deniedCommands)) {
return "auto_deny"
}