Skip to content

Don't use MEMFILE_MAX as the total multipart memory cap #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gyanu2507 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't use MEMFILE_MAX as the total multipart memory cap #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bottle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,8 @@ def POST(self):
if not boundary:
raise MultipartError("Invalid content type header, missing boundary")
parser = _MultipartParser(self.body, boundary, self.content_length,
mem_limit=self.MEMFILE_MAX, memfile_limit=self.MEMFILE_MAX,
memfile_limit=self.MEMFILE_MAX,
mem_limit=self.MEMFILE_MAX * 128,
charset=charset)

for part in parser.parse():
Expand Down
17 changes: 17 additions & 0 deletions test/test_environ.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,23 @@ def test_multipart(self):
self.assertEqual(['value2', '万难'], request.forms.getall('field2'))
self.assertTrue('field2' not in request.files)

def test_multipart_file_larger_than_memfile_max(self):
content = 'x' * (BaseRequest.MEMFILE_MAX + 50)
e = tools.multipart_environ(fields=[], files=[('file1', 'big.bin', content)])
request = BaseRequest(e)
uploaded = request.files['file1']
self.assertEqual(len(uploaded.file.read()), BaseRequest.MEMFILE_MAX + 50)

def test_multipart_many_small_files_above_memfile_total(self):
chunk = 'x' * (BaseRequest.MEMFILE_MAX // 2 + 20)
e = tools.multipart_environ(fields=[], files=[
('file1', 'a.bin', chunk),
('file2', 'b.bin', chunk),
])
request = BaseRequest(e)
self.assertEqual(len(request.files['file1'].file.read()), len(chunk))
self.assertEqual(len(request.files['file2'].file.read()), len(chunk))

def test_json_empty(self):
""" Environ: Request.json property with empty body. """
self.assertEqual(BaseRequest({}).json, None)
Expand Down