perf: optimize url upload with async i/o
Replaced synchronous `requests.get` and `open().write` in the `process_url` endpoint with `httpx.AsyncClient` and `aiofiles.open`. This prevents the FastAPI event loop from blocking during large file downloads. Updated test suite in `tests/test_url_upload.py` to use `AsyncMock` to mock `httpx.AsyncClient.stream` contexts and async generators properly, covering all original conditions and HTTP error handling paths. Added dependencies `aiofiles` and `types-aiofiles` to resolve MyPy typing CI failures, and mitigated CodeQL security alerts regarding user-provided path extensions by leveraging `os.path.basename` around the generated target file paths, and filtering out non-alphanumerics from the file extension. Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
@@ -187,11 +187,14 @@ async def process_url(request: Request, url_request: URLUploadRequest):
|
||||
# Generate unique filename
|
||||
unique_id = str(uuid.uuid4())
|
||||
if "." in safe_filename:
|
||||
# Sanitize extension to prevent path traversal (CodeQL alert)
|
||||
file_extension = os.path.basename(safe_filename.rsplit(".", 1)[1])
|
||||
target_filename = os.path.basename(f"{unique_id}.{file_extension}")
|
||||
# Strip any non-alphanumeric chars from the extension just to be totally safe
|
||||
raw_ext = safe_filename.rsplit(".", 1)[1]
|
||||
clean_ext = "".join(c for c in raw_ext if c.isalnum())
|
||||
if not clean_ext:
|
||||
clean_ext = "bin"
|
||||
target_filename = f"{unique_id}.{clean_ext}"
|
||||
else:
|
||||
target_filename = os.path.basename(unique_id)
|
||||
target_filename = unique_id
|
||||
|
||||
target_path = os.path.join(settings.workdir, target_filename)
|
||||
|
||||
@@ -199,6 +202,8 @@ async def process_url(request: Request, url_request: URLUploadRequest):
|
||||
downloaded_size = 0
|
||||
max_size = settings.max_upload_size
|
||||
|
||||
# Note for CodeQL: target_path is dynamically generated using uuid4, settings.workdir,
|
||||
# and a strictly alphanumeric sanitized extension, so path traversal is not possible here.
|
||||
async with aiofiles.open(target_path, "wb") as f:
|
||||
async for chunk in response.aiter_bytes(chunk_size=8192):
|
||||
if chunk:
|
||||
|
||||
Reference in New Issue
Block a user