fix path problem for images

Author: MRGuziX

agents/crewai/websearch_agent/main.py

@@ -5,7 +5,6 @@
 import time
 import uuid
 from contextlib import asynccontextmanager
-import os
 from os import getenv
 from pathlib import Path
 
@@ -386,9 +385,9 @@ async def serve_image(filename: str):
     """Serve images from the project-level images directory."""
     base = _IMAGES_DIR.resolve()
     file_path = (base / filename).resolve()
-    base_str = str(base)
-    file_path_str = str(file_path)
-    if not (file_path_str == base_str or file_path_str.startswith(base_str + os.path.sep)):
+    try:
+        file_path.relative_to(base)
+    except ValueError:
         raise HTTPException(status_code=404, detail="Image not found")
     if not file_path.is_file():
         raise HTTPException(status_code=404, detail="Image not found")

agents/langgraph/agentic_rag/main.py

@@ -3,7 +3,6 @@
 import time
 import uuid
 from contextlib import asynccontextmanager
-import os
 from os import getenv
 from pathlib import Path
 
@@ -410,9 +409,9 @@ async def serve_image(filename: str):
     """Serve images from the project-level images directory."""
     base = _IMAGES_DIR.resolve()
     file_path = (base / filename).resolve()
-    base_str = str(base)
-    file_path_str = str(file_path)
-    if not (file_path_str == base_str or file_path_str.startswith(base_str + os.path.sep)):
+    try:
+        file_path.relative_to(base)
+    except ValueError:
         raise HTTPException(status_code=404, detail="Image not found")
     if not file_path.is_file():
         raise HTTPException(status_code=404, detail="Image not found")

agents/langgraph/react_agent/main.py

@@ -3,7 +3,6 @@
 import time
 import uuid
 from contextlib import asynccontextmanager
-import os
 from os import getenv
 from pathlib import Path
 
@@ -406,9 +405,9 @@ async def serve_image(filename: str):
     """Serve images from the project-level images directory."""
     base = _IMAGES_DIR.resolve()
     file_path = (base / filename).resolve()
-    base_str = str(base)
-    file_path_str = str(file_path)
-    if not (file_path_str == base_str or file_path_str.startswith(base_str + os.path.sep)):
+    try:
+        file_path.relative_to(base)
+    except ValueError:
         raise HTTPException(status_code=404, detail="Image not found")
     if not file_path.is_file():
         raise HTTPException(status_code=404, detail="Image not found")

agents/langgraph/react_with_database_memory/main.py

@@ -12,7 +12,6 @@
 from langgraph.checkpoint.postgres import PostgresSaver
 from langgraph.checkpoint.postgres.aio import AsyncPostgresSaver
 from pydantic import BaseModel, Field
-import os
 from os import getenv
 
 from react_with_database_memory.agent import get_graph_closure
@@ -487,9 +486,9 @@ async def serve_image(filename: str):
     """Serve images from the project-level images directory."""
     base = _IMAGES_DIR.resolve()
     file_path = (base / filename).resolve()
-    base_str = str(base)
-    file_path_str = str(file_path)
-    if not (file_path_str == base_str or file_path_str.startswith(base_str + os.path.sep)):
+    try:
+        file_path.relative_to(base)
+    except ValueError:
         raise HTTPException(status_code=404, detail="Image not found")
     if not file_path.is_file():
         raise HTTPException(status_code=404, detail="Image not found")

agents/llamaindex/websearch_agent/main.py

@@ -3,7 +3,6 @@
 import time
 import uuid
 from contextlib import asynccontextmanager
-import os
 from os import getenv
 from pathlib import Path
 
@@ -472,9 +471,9 @@ async def serve_image(filename: str):
     """Serve images from the project-level images directory."""
     base = _IMAGES_DIR.resolve()
     file_path = (base / filename).resolve()
-    base_str = str(base)
-    file_path_str = str(file_path)
-    if not (file_path_str == base_str or file_path_str.startswith(base_str + os.path.sep)):
+    try:
+        file_path.relative_to(base)
+    except ValueError:
         raise HTTPException(status_code=404, detail="Image not found")
     if not file_path.is_file():
         raise HTTPException(status_code=404, detail="Image not found")

agents/vanilla_python/openai_responses_agent/main.py

@@ -4,7 +4,6 @@
 import time
 import uuid
 from contextlib import asynccontextmanager
-import os
 from os import getenv
 from pathlib import Path
 
@@ -407,9 +406,9 @@ async def serve_image(filename: str):
     """Serve images from the project-level images directory."""
     base = _IMAGES_DIR.resolve()
     file_path = (base / filename).resolve()
-    base_str = str(base)
-    file_path_str = str(file_path)
-    if not (file_path_str == base_str or file_path_str.startswith(base_str + os.path.sep)):
+    try:
+        file_path.relative_to(base)
+    except ValueError:
         raise HTTPException(status_code=404, detail="Image not found")
     if not file_path.is_file():
         raise HTTPException(status_code=404, detail="Image not found")