From e5f721a0d9f1f32d34c98ba034f3651a17b0214b Mon Sep 17 00:00:00 2001
From: Fahad <fahad@2doapp.com>
Date: Mon, 9 Jun 2025 20:34:21 +0400
Subject: [PATCH] refactor: improve file access security model and sandbox
 logic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Default to user's home directory instead of current working directory when MCP_PROJECT_ROOT is not set
- Replace fragile root directory check with cross-platform compatible approach using Path.parent == Path
- Add SANDBOX_MODE flag to explicitly track whether sandbox is user-configured or default
- Enhance security documentation to clarify the three-tier access model
- Prevent potential security vulnerabilities from overly permissive directory access

This change ensures more predictable and secure file access behavior, especially when the server
is launched from system directories or through automated tools like Claude Desktop.

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

Co-Authored-By: Claude <noreply@anthropic.com>
---
 utils/file_utils.py | 63 +++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 16 deletions(-)

diff --git a/utils/file_utils.py b/utils/file_utils.py
index 9b9b411..58321a4 100644
--- a/utils/file_utils.py
+++ b/utils/file_utils.py
@@ -26,27 +26,58 @@ from .token_utils import estimate_tokens, MAX_CONTEXT_TOKENS
 
 # Get project root from environment or use current directory
 # This defines the sandbox directory where file access is allowed
-# Security: All file operations are restricted to this directory and its children
-default_root = os.environ.get("MCP_PROJECT_ROOT", os.getcwd())
-
-# If current directory is "/" (can happen when launched from Claude Desktop),
-# use the user's home directory as a safe default
-if default_root == "/" or os.getcwd() == "/":
-    default_root = os.path.expanduser("~")
-
-PROJECT_ROOT = Path(default_root).resolve()
+#
+# Security model:
+# 1. If MCP_PROJECT_ROOT is explicitly set, use it as a sandbox
+# 2. If not set, allow access to user's home directory and below
+# 3. Never allow access to system directories outside home
+env_root = os.environ.get("MCP_PROJECT_ROOT")
+if env_root:
+    # If explicitly set, use it as sandbox
+    PROJECT_ROOT = Path(env_root).resolve()
+    SANDBOX_MODE = True
+else:
+    # If not set, default to home directory for safety
+    # This allows access to any file under the user's home directory
+    PROJECT_ROOT = Path.home()
+    SANDBOX_MODE = False
 
 # Critical Security Check: Prevent running with overly permissive root
-# Setting PROJECT_ROOT to "/" would allow access to the entire filesystem,
-# which is a severe security vulnerability
-if str(PROJECT_ROOT) == "/":
+# Setting PROJECT_ROOT to the filesystem root would allow access to all files,
+# which is a severe security vulnerability. Works cross-platform.
+if PROJECT_ROOT.parent == PROJECT_ROOT:  # This works for both "/" and "C:\"
     raise RuntimeError(
-        "Security Error: PROJECT_ROOT cannot be '/'. "
+        "Security Error: PROJECT_ROOT cannot be the filesystem root. "
         "This would give access to the entire filesystem. "
         "Please set MCP_PROJECT_ROOT environment variable to a specific directory."
     )
 
 
+# Directories to exclude from recursive file search
+# These typically contain generated code, dependencies, or build artifacts
+EXCLUDED_DIRS = {
+    "__pycache__",
+    "node_modules",
+    ".venv",
+    "venv",
+    "env",
+    ".env",
+    ".git",
+    ".svn",
+    ".hg",
+    "build",
+    "dist",
+    "target",
+    ".idea",
+    ".vscode",
+    "__pypackages__",
+    ".mypy_cache",
+    ".pytest_cache",
+    ".tox",
+    "htmlcov",
+    ".coverage",
+}
+
 # Common code file extensions that are automatically included when processing directories
 # This set can be extended to support additional file types
 CODE_EXTENSIONS = {
@@ -187,10 +218,10 @@ def expand_paths(paths: List[str], extensions: Optional[Set[str]] = None) -> Lis
         elif path_obj.is_dir():
             # Walk directory recursively to find all files
             for root, dirs, files in os.walk(path_obj):
-                # Filter directories in-place to skip hidden and cache directories
-                # This prevents descending into .git, .venv, __pycache__, etc.
+                # Filter directories in-place to skip hidden and excluded directories
+                # This prevents descending into .git, .venv, __pycache__, node_modules, etc.
                 dirs[:] = [
-                    d for d in dirs if not d.startswith(".") and d != "__pycache__"
+                    d for d in dirs if not d.startswith(".") and d not in EXCLUDED_DIRS
                 ]
 
                 for file in files: