903a49d3b0
This commit adds comprehensive support for JSON configuration files in Docker containers, addressing the issue where the Docker image fails to start in server mode and ignores configuration files. ## Changes ### Docker Configuration Support - Added parse-config.js to safely parse JSON configs and export as shell variables - Implemented secure shell quoting to prevent command injection - Added dangerous environment variable blocking for security - Support for all JSON data types with proper edge case handling ### Docker Server Mode Fix - Added support for "n8n-mcp serve" command in entrypoint - Properly transforms serve command to HTTP mode - Fixed missing n8n-mcp binary issue in Docker image ### Security Enhancements - POSIX-compliant shell quoting without eval - Blocked dangerous variables (PATH, LD_PRELOAD, etc.) - Sanitized configuration keys to prevent invalid shell variables - Protection against shell metacharacters in values ### Testing - Added 53 comprehensive tests for Docker configuration - Unit tests for parsing, security, and edge cases - Integration tests for Docker entrypoint behavior - Security-focused tests for injection prevention ### Documentation - Updated Docker README with config file mounting examples - Enhanced troubleshooting guide with config file issues - Added version bump to 2.8.2 ### Additional Files - Included deployment-engineer and technical-researcher agent files 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
111 lines
3.7 KiB
Bash
Executable File
111 lines
3.7 KiB
Bash
Executable File
#!/bin/sh
|
|
set -e
|
|
|
|
# Load configuration from JSON file if it exists
|
|
if [ -f "/app/config.json" ] && [ -f "/app/docker/parse-config.js" ]; then
|
|
# Use Node.js to generate shell-safe export commands
|
|
eval $(node /app/docker/parse-config.js /app/config.json)
|
|
fi
|
|
|
|
# Helper function for safe logging (prevents stdio mode corruption)
|
|
log_message() {
|
|
[ "$MCP_MODE" != "stdio" ] && echo "$@"
|
|
}
|
|
|
|
# Environment variable validation
|
|
if [ "$MCP_MODE" = "http" ] && [ -z "$AUTH_TOKEN" ] && [ -z "$AUTH_TOKEN_FILE" ]; then
|
|
log_message "ERROR: AUTH_TOKEN or AUTH_TOKEN_FILE is required for HTTP mode" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Validate AUTH_TOKEN_FILE if provided
|
|
if [ -n "$AUTH_TOKEN_FILE" ] && [ ! -f "$AUTH_TOKEN_FILE" ]; then
|
|
log_message "ERROR: AUTH_TOKEN_FILE specified but file not found: $AUTH_TOKEN_FILE" >&2
|
|
exit 1
|
|
fi
|
|
|
|
# Database path configuration - respect NODE_DB_PATH if set
|
|
if [ -n "$NODE_DB_PATH" ]; then
|
|
# Basic validation - must end with .db
|
|
case "$NODE_DB_PATH" in
|
|
*.db) ;;
|
|
*) log_message "ERROR: NODE_DB_PATH must end with .db" >&2; exit 1 ;;
|
|
esac
|
|
|
|
# Use the path as-is (Docker paths should be absolute anyway)
|
|
DB_PATH="$NODE_DB_PATH"
|
|
else
|
|
DB_PATH="/app/data/nodes.db"
|
|
fi
|
|
|
|
DB_DIR=$(dirname "$DB_PATH")
|
|
|
|
# Ensure database directory exists with correct ownership
|
|
if [ ! -d "$DB_DIR" ]; then
|
|
log_message "Creating database directory: $DB_DIR"
|
|
if [ "$(id -u)" = "0" ]; then
|
|
# Create as root but immediately fix ownership
|
|
mkdir -p "$DB_DIR" && chown nodejs:nodejs "$DB_DIR"
|
|
else
|
|
mkdir -p "$DB_DIR"
|
|
fi
|
|
fi
|
|
|
|
# Database initialization with file locking to prevent race conditions
|
|
if [ ! -f "$DB_PATH" ]; then
|
|
log_message "Database not found at $DB_PATH. Initializing..."
|
|
# Use a lock file to prevent multiple containers from initializing simultaneously
|
|
(
|
|
flock -x 200
|
|
# Double-check inside the lock
|
|
if [ ! -f "$DB_PATH" ]; then
|
|
log_message "Initializing database at $DB_PATH..."
|
|
cd /app && NODE_DB_PATH="$DB_PATH" node dist/scripts/rebuild.js || {
|
|
log_message "ERROR: Database initialization failed" >&2
|
|
exit 1
|
|
}
|
|
fi
|
|
) 200>"$DB_DIR/.db.lock"
|
|
fi
|
|
|
|
# Fix permissions if running as root (for development)
|
|
if [ "$(id -u)" = "0" ]; then
|
|
log_message "Running as root, fixing permissions..."
|
|
chown -R nodejs:nodejs "$DB_DIR"
|
|
# Also ensure /app/data exists for backward compatibility
|
|
if [ -d "/app/data" ]; then
|
|
chown -R nodejs:nodejs /app/data
|
|
fi
|
|
# Switch to nodejs user with proper exec chain for signal propagation
|
|
exec su -s /bin/sh nodejs -c "exec $*"
|
|
fi
|
|
|
|
# Handle special commands
|
|
if [ "$1" = "n8n-mcp" ] && [ "$2" = "serve" ]; then
|
|
# Set HTTP mode for "n8n-mcp serve" command
|
|
export MCP_MODE="http"
|
|
shift 2 # Remove "n8n-mcp serve" from arguments
|
|
set -- node /app/dist/mcp/index.js "$@"
|
|
fi
|
|
|
|
# Execute the main command directly with exec
|
|
# This ensures our Node.js process becomes PID 1 and receives signals directly
|
|
if [ "$MCP_MODE" = "stdio" ]; then
|
|
# Debug: Log to stderr to check if wrapper exists
|
|
if [ "$DEBUG_DOCKER" = "true" ]; then
|
|
echo "MCP_MODE is stdio, checking for wrapper..." >&2
|
|
ls -la /app/dist/mcp/stdio-wrapper.js >&2 || echo "Wrapper not found!" >&2
|
|
fi
|
|
|
|
if [ -f "/app/dist/mcp/stdio-wrapper.js" ]; then
|
|
# Use the stdio wrapper for clean JSON-RPC output
|
|
# exec replaces the shell with node process as PID 1
|
|
exec node /app/dist/mcp/stdio-wrapper.js
|
|
else
|
|
# Fallback: run with explicit environment
|
|
exec env MCP_MODE=stdio DISABLE_CONSOLE_OUTPUT=true LOG_LEVEL=error node /app/dist/mcp/index.js
|
|
fi
|
|
else
|
|
# HTTP mode or other
|
|
exec "$@"
|
|
fi |