fix: address security issues and improve Docker implementation

Security Fixes:
- Add command injection prevention in n8n-mcp wrapper with whitelist validation
- Fix race condition in database initialization with proper lock directory creation
- Add flock availability check with fallback behavior
- Implement comprehensive input sanitization in parse-config.js

Improvements:
- Add debug logging support to parse-config.js (DEBUG_CONFIG=true)
- Improve test cleanup error handling with proper error tracking
- Increase integration test timeouts for CI compatibility
- Update test assertions to check environment variables instead of processes

All critical security vulnerabilities identified by code review have been addressed.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
czlonkowski
2025-07-31 13:04:25 +02:00
parent 903a49d3b0
commit 71cd20bf95
6 changed files with 127 additions and 39 deletions

View File

@@ -54,10 +54,27 @@ 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
# Ensure lock directory exists before attempting to create lock
mkdir -p "$DB_DIR"
# Check if flock is available
if command -v flock >/dev/null 2>&1; then
# 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"
else
# Fallback without locking (log warning)
log_message "WARNING: flock not available, database initialization may have race conditions"
if [ ! -f "$DB_PATH" ]; then
log_message "Initializing database at $DB_PATH..."
cd /app && NODE_DB_PATH="$DB_PATH" node dist/scripts/rebuild.js || {
@@ -65,7 +82,7 @@ if [ ! -f "$DB_PATH" ]; then
exit 1
}
fi
) 200>"$DB_DIR/.db.lock"
fi
fi
# Fix permissions if running as root (for development)

40
docker/n8n-mcp Normal file
View File

@@ -0,0 +1,40 @@
#!/bin/sh
# n8n-mcp wrapper script for Docker
# Transforms "n8n-mcp serve" to proper start command
# Validate arguments to prevent command injection
validate_args() {
for arg in "$@"; do
case "$arg" in
# Allowed arguments - extend this list as needed
--port=*|--host=*|--verbose|--quiet|--help|-h|--version|-v)
# Valid arguments
;;
*)
# Allow empty arguments
if [ -z "$arg" ]; then
continue
fi
# Reject any other arguments for security
echo "Error: Invalid argument: $arg" >&2
echo "Allowed arguments: --port=<port>, --host=<host>, --verbose, --quiet, --help, --version" >&2
exit 1
;;
esac
done
}
if [ "$1" = "serve" ]; then
# Transform serve command to start with HTTP mode
export MCP_MODE="http"
shift # Remove "serve" from arguments
# Validate remaining arguments
validate_args "$@"
exec node /app/dist/mcp/index.js "$@"
else
# For non-serve commands, pass through without validation
# This allows flexibility for other subcommands
exec node /app/dist/mcp/index.js "$@"
fi

View File

@@ -8,7 +8,17 @@
const fs = require('fs');
// Debug logging support
const DEBUG = process.env.DEBUG_CONFIG === 'true';
function debugLog(message) {
if (DEBUG) {
process.stderr.write(`[parse-config] ${message}\n`);
}
}
const configPath = process.argv[2] || '/app/config.json';
debugLog(`Using config path: ${configPath}`);
// Dangerous environment variables that should never be set
const DANGEROUS_VARS = new Set([
@@ -55,6 +65,7 @@ function shellQuote(str) {
try {
if (!fs.existsSync(configPath)) {
debugLog(`Config file not found at: ${configPath}`);
process.exit(0); // Silent exit if no config file
}
@@ -63,15 +74,19 @@ try {
try {
configContent = fs.readFileSync(configPath, 'utf8');
debugLog(`Read config file, size: ${configContent.length} bytes`);
} catch (readError) {
// Silent exit on read errors
debugLog(`Error reading config: ${readError.message}`);
process.exit(0);
}
try {
config = JSON.parse(configContent);
debugLog(`Parsed config with ${Object.keys(config).length} top-level keys`);
} catch (parseError) {
// Silent exit on invalid JSON
debugLog(`Error parsing JSON: ${parseError.message}`);
process.exit(0);
}
@@ -95,6 +110,7 @@ try {
// Skip if sanitization resulted in EMPTY_KEY (indicating invalid key)
if (sanitizedKey === 'EMPTY_KEY') {
debugLog(`Skipping key '${key}': invalid key name`);
continue;
}
@@ -102,6 +118,7 @@ try {
// Skip if key is too long
if (envKey.length > 255) {
debugLog(`Skipping key '${envKey}': too long (${envKey.length} chars)`);
continue;
}
@@ -149,6 +166,7 @@ try {
// Skip dangerous variables
if (DANGEROUS_VARS.has(key) || key.startsWith('BASH_FUNC_')) {
debugLog(`Warning: Ignoring dangerous variable: ${key}`);
process.stderr.write(`Warning: Ignoring dangerous variable: ${key}\n`);
continue;
}