From ac9f56ea5ecc738eabd9282feae4679852155669 Mon Sep 17 00:00:00 2001
From: Adrian Garcia Badaracco <1755071+adriangb@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:06:52 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Close=20FormData=20(uploaded=20f?=
 =?UTF-8?q?iles)=20after=20the=20request=20is=20done=20(#5465)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Sebastián Ramírez <tiangolo@gmail.com>
---
 fastapi/routing.py           |  4 ++++
 tests/test_datastructures.py | 28 +++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/fastapi/routing.py b/fastapi/routing.py
index 7caf018b5..8c0bec5e6 100644
--- a/fastapi/routing.py
+++ b/fastapi/routing.py
@@ -3,6 +3,7 @@ import dataclasses
 import email.message
 import inspect
 import json
+from contextlib import AsyncExitStack
 from enum import Enum, IntEnum
 from typing import (
     Any,
@@ -190,6 +191,9 @@ def get_request_handler(
             if body_field:
                 if is_body_form:
                     body = await request.form()
+                    stack = request.scope.get("fastapi_astack")
+                    assert isinstance(stack, AsyncExitStack)
+                    stack.push_async_callback(body.close)
                 else:
                     body_bytes = await request.body()
                     if body_bytes:
diff --git a/tests/test_datastructures.py b/tests/test_datastructures.py
index 43f1a116c..2e6217d34 100644
--- a/tests/test_datastructures.py
+++ b/tests/test_datastructures.py
@@ -1,6 +1,10 @@
+from pathlib import Path
+from typing import List
+
 import pytest
-from fastapi import UploadFile
+from fastapi import FastAPI, UploadFile
 from fastapi.datastructures import Default
+from fastapi.testclient import TestClient
 
 
 def test_upload_file_invalid():
@@ -20,3 +24,25 @@ def test_default_placeholder_bool():
     placeholder_b = Default("")
     assert placeholder_a
     assert not placeholder_b
+
+
+def test_upload_file_is_closed(tmp_path: Path):
+    path = tmp_path / "test.txt"
+    path.write_bytes(b"<file content>")
+    app = FastAPI()
+
+    testing_file_store: List[UploadFile] = []
+
+    @app.post("/uploadfile/")
+    def create_upload_file(file: UploadFile):
+        testing_file_store.append(file)
+        return {"filename": file.filename}
+
+    client = TestClient(app)
+    with path.open("rb") as file:
+        response = client.post("/uploadfile/", files={"file": file})
+    assert response.status_code == 200, response.text
+    assert response.json() == {"filename": "test.txt"}
+
+    assert testing_file_store
+    assert testing_file_store[0].file.closed