fix(security): address code review security findings
Fixes three security issues identified in Phase 1.1 code review:
1. JSON injection in parse_json_response() (response_analyzer.sh:113-132)
- Replace heredoc with jq construction using --arg for strings
- Use --argjson for numeric/boolean fields
- Ensures proper escaping of quotes, newlines, backslashes
2. Input validation for --allowed-tools flag (ralph_loop.sh:903-905)
- Add VALID_TOOL_PATTERNS whitelist
- Add validate_allowed_tools() function
- Validate against whitelist in argument parsing
- Allow Bash(...) patterns with any content
3. Shell injection in build_claude_command() (ralph_loop.sh:439-444)
- Convert from string concatenation to command array
- Use global CLAUDE_CMD_ARGS array
- Execute with "${CLAUDE_CMD_ARGS[@]}" instead of bash -c
- No manual escaping needed - array handles metacharacters
All 98 tests passing.
Closes #48, #50
This commit is contained in:
frankbria
parent
e7e54d8087
commit
50f6ef7a96
2 changed files with 131 additions and 44 deletions
|
|
@ -110,26 +110,37 @@ parse_json_response() {
|
|||
has_completion_signal="true"
|
||||
fi
|
||||
|
||||
# Write normalized result
|
||||
cat > "$result_file" << EOF
|
||||
{
|
||||
"status": "$status",
|
||||
"exit_signal": $exit_signal,
|
||||
"is_test_only": $is_test_only,
|
||||
"is_stuck": $is_stuck,
|
||||
"has_completion_signal": $has_completion_signal,
|
||||
"files_modified": $files_modified,
|
||||
"error_count": $error_count,
|
||||
"summary": "$summary",
|
||||
"loop_number": $loop_number,
|
||||
"session_id": "$session_id",
|
||||
"confidence": $confidence,
|
||||
"metadata": {
|
||||
"loop_number": $loop_number,
|
||||
"session_id": "$session_id"
|
||||
# Write normalized result using jq for safe JSON construction
|
||||
# String fields use --arg (auto-escapes), numeric/boolean use --argjson
|
||||
jq -n \
|
||||
--arg status "$status" \
|
||||
--argjson exit_signal "$exit_signal" \
|
||||
--argjson is_test_only "$is_test_only" \
|
||||
--argjson is_stuck "$is_stuck" \
|
||||
--argjson has_completion_signal "$has_completion_signal" \
|
||||
--argjson files_modified "$files_modified" \
|
||||
--argjson error_count "$error_count" \
|
||||
--arg summary "$summary" \
|
||||
--argjson loop_number "$loop_number" \
|
||||
--arg session_id "$session_id" \
|
||||
--argjson confidence "$confidence" \
|
||||
'{
|
||||
status: $status,
|
||||
exit_signal: $exit_signal,
|
||||
is_test_only: $is_test_only,
|
||||
is_stuck: $is_stuck,
|
||||
has_completion_signal: $has_completion_signal,
|
||||
files_modified: $files_modified,
|
||||
error_count: $error_count,
|
||||
summary: $summary,
|
||||
loop_number: $loop_number,
|
||||
session_id: $session_id,
|
||||
confidence: $confidence,
|
||||
metadata: {
|
||||
loop_number: $loop_number,
|
||||
session_id: $session_id
|
||||
}
|
||||
}
|
||||
EOF
|
||||
}' > "$result_file"
|
||||
|
||||
return 0
|
||||
}
|
||||
|
|
|
|||
124
ralph_loop.sh
124
ralph_loop.sh
|
|
@ -33,6 +33,28 @@ CLAUDE_USE_CONTINUE=true # Enable session continuity
|
|||
CLAUDE_SESSION_FILE=".claude_session_id" # Session ID persistence file
|
||||
CLAUDE_MIN_VERSION="2.0.76" # Minimum required Claude CLI version
|
||||
|
||||
# Valid tool patterns for --allowed-tools validation
|
||||
# Tools can be exact matches or pattern matches with wildcards in parentheses
|
||||
VALID_TOOL_PATTERNS=(
|
||||
"Write"
|
||||
"Read"
|
||||
"Edit"
|
||||
"MultiEdit"
|
||||
"Glob"
|
||||
"Grep"
|
||||
"Task"
|
||||
"TodoWrite"
|
||||
"WebFetch"
|
||||
"WebSearch"
|
||||
"Bash"
|
||||
"Bash(git *)"
|
||||
"Bash(npm *)"
|
||||
"Bash(bats *)"
|
||||
"Bash(python *)"
|
||||
"Bash(node *)"
|
||||
"NotebookEdit"
|
||||
)
|
||||
|
||||
# Exit detection configuration
|
||||
EXIT_SIGNALS_FILE=".exit_signals"
|
||||
MAX_CONSECUTIVE_TEST_LOOPS=3
|
||||
|
|
@ -343,6 +365,54 @@ check_claude_version() {
|
|||
return 0
|
||||
}
|
||||
|
||||
# Validate allowed tools against whitelist
|
||||
# Returns 0 if valid, 1 if invalid with error message
|
||||
validate_allowed_tools() {
|
||||
local tools_input=$1
|
||||
|
||||
if [[ -z "$tools_input" ]]; then
|
||||
return 0 # Empty is valid (uses defaults)
|
||||
fi
|
||||
|
||||
# Split by comma
|
||||
local IFS=','
|
||||
read -ra tools <<< "$tools_input"
|
||||
|
||||
for tool in "${tools[@]}"; do
|
||||
# Trim whitespace
|
||||
tool=$(echo "$tool" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
|
||||
|
||||
if [[ -z "$tool" ]]; then
|
||||
continue
|
||||
fi
|
||||
|
||||
local valid=false
|
||||
|
||||
# Check against valid patterns
|
||||
for pattern in "${VALID_TOOL_PATTERNS[@]}"; do
|
||||
if [[ "$tool" == "$pattern" ]]; then
|
||||
valid=true
|
||||
break
|
||||
fi
|
||||
|
||||
# Check for Bash(*) pattern - any Bash with parentheses is allowed
|
||||
if [[ "$tool" =~ ^Bash\(.+\)$ ]]; then
|
||||
valid=true
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
if [[ "$valid" == "false" ]]; then
|
||||
echo "Error: Invalid tool in --allowed-tools: '$tool'"
|
||||
echo "Valid tools: ${VALID_TOOL_PATTERNS[*]}"
|
||||
echo "Note: Bash(...) patterns with any content are allowed (e.g., 'Bash(git *)')"
|
||||
return 1
|
||||
fi
|
||||
done
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
# Build loop context for Claude Code session
|
||||
# Provides loop-specific context via --append-system-prompt
|
||||
build_loop_context() {
|
||||
|
|
@ -407,46 +477,51 @@ save_claude_session() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Build Claude CLI command with modern flags
|
||||
# Global array for Claude command arguments (avoids shell injection)
|
||||
declare -a CLAUDE_CMD_ARGS=()
|
||||
|
||||
# Build Claude CLI command with modern flags using array (shell-injection safe)
|
||||
# Populates global CLAUDE_CMD_ARGS array for direct execution
|
||||
build_claude_command() {
|
||||
local prompt_file=$1
|
||||
local loop_context=$2
|
||||
local session_id=$3
|
||||
|
||||
local cmd="$CLAUDE_CODE_CMD"
|
||||
# Reset global array
|
||||
CLAUDE_CMD_ARGS=("$CLAUDE_CODE_CMD")
|
||||
|
||||
# Add output format flag
|
||||
if [[ "$CLAUDE_OUTPUT_FORMAT" == "json" ]]; then
|
||||
cmd+=" --output-format json"
|
||||
CLAUDE_CMD_ARGS+=("--output-format" "json")
|
||||
fi
|
||||
|
||||
# Add allowed tools (convert comma-separated to space-separated quoted args)
|
||||
# Add allowed tools (each tool as separate array element)
|
||||
if [[ -n "$CLAUDE_ALLOWED_TOOLS" ]]; then
|
||||
# Convert "Write,Bash(git *),Read" to --allowedTools "Write" "Bash(git *)" "Read"
|
||||
local tools_array
|
||||
IFS=',' read -ra tools_array <<< "$CLAUDE_ALLOWED_TOOLS"
|
||||
cmd+=" --allowedTools"
|
||||
CLAUDE_CMD_ARGS+=("--allowedTools")
|
||||
# Split by comma and add each tool
|
||||
local IFS=','
|
||||
read -ra tools_array <<< "$CLAUDE_ALLOWED_TOOLS"
|
||||
for tool in "${tools_array[@]}"; do
|
||||
cmd+=" \"$tool\""
|
||||
# Trim whitespace
|
||||
tool=$(echo "$tool" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
|
||||
if [[ -n "$tool" ]]; then
|
||||
CLAUDE_CMD_ARGS+=("$tool")
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Add session continuity flag
|
||||
if [[ "$CLAUDE_USE_CONTINUE" == "true" ]]; then
|
||||
cmd+=" --continue"
|
||||
CLAUDE_CMD_ARGS+=("--continue")
|
||||
fi
|
||||
|
||||
# Add loop context as system prompt
|
||||
# Add loop context as system prompt (no escaping needed - array handles it)
|
||||
if [[ -n "$loop_context" ]]; then
|
||||
# Escape quotes in context for shell
|
||||
local escaped_context=$(echo "$loop_context" | sed 's/"/\\"/g')
|
||||
cmd+=" --append-system-prompt \"$escaped_context\""
|
||||
CLAUDE_CMD_ARGS+=("--append-system-prompt" "$loop_context")
|
||||
fi
|
||||
|
||||
# Add prompt file
|
||||
cmd+=" --prompt-file \"$prompt_file\""
|
||||
|
||||
echo "$cmd"
|
||||
CLAUDE_CMD_ARGS+=("--prompt-file" "$prompt_file")
|
||||
}
|
||||
|
||||
# Main execution function
|
||||
|
|
@ -479,24 +554,22 @@ execute_claude_code() {
|
|||
# Build the Claude CLI command with modern flags
|
||||
# Note: We use the modern --prompt-file approach when CLAUDE_OUTPUT_FORMAT is "json"
|
||||
# For backward compatibility, fall back to stdin piping for text mode
|
||||
local claude_cmd=""
|
||||
local use_modern_cli=false
|
||||
|
||||
if [[ "$CLAUDE_OUTPUT_FORMAT" == "json" ]]; then
|
||||
# Modern approach: use CLI flags
|
||||
claude_cmd=$(build_claude_command "$PROMPT_FILE" "$loop_context" "$session_id")
|
||||
# Modern approach: use CLI flags (builds CLAUDE_CMD_ARGS array)
|
||||
build_claude_command "$PROMPT_FILE" "$loop_context" "$session_id"
|
||||
use_modern_cli=true
|
||||
log_status "INFO" "Using modern CLI mode (JSON output)"
|
||||
else
|
||||
# Legacy approach: stdin piping (backward compatibility)
|
||||
claude_cmd="$CLAUDE_CODE_CMD"
|
||||
log_status "INFO" "Using legacy CLI mode (text output)"
|
||||
fi
|
||||
|
||||
# Execute Claude Code
|
||||
if [[ "$use_modern_cli" == "true" ]]; then
|
||||
# Modern execution with CLI flags
|
||||
if timeout ${timeout_seconds}s bash -c "$claude_cmd" > "$output_file" 2>&1 &
|
||||
# Modern execution with command array (shell-injection safe)
|
||||
# Execute array directly without bash -c to prevent shell metacharacter interpretation
|
||||
if timeout ${timeout_seconds}s "${CLAUDE_CMD_ARGS[@]}" > "$output_file" 2>&1 &
|
||||
then
|
||||
: # Continue to wait loop
|
||||
else
|
||||
|
|
@ -901,6 +974,9 @@ while [[ $# -gt 0 ]]; do
|
|||
shift 2
|
||||
;;
|
||||
--allowed-tools)
|
||||
if ! validate_allowed_tools "$2"; then
|
||||
exit 1
|
||||
fi
|
||||
CLAUDE_ALLOWED_TOOLS="$2"
|
||||
shift 2
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue