Improve file size limits #356
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hannesbraun
force-pushed
the
max-zip-size
branch
from
cb2c6f7 to
d2c9259
Compare
The parameter max_file_size now also controls the maximum size of the sum of file sizes in an uploaded zip file. This allows uploading zip files larger than 1 MB (if configured).
hannesbraun
force-pushed
the
max-zip-size
branch
from
d2c9259 to
3a1a6ad
Compare
ifrh
reviewed
Dec 31, 2022
| @@ -47,7 +47,8 @@ def clean_file(self): | |||
| zip = zipfile.ZipFile(data) | |||
| if zip.testzip(): | |||
| raise forms.ValidationError(_('The zip file seems to be corrupt.')) | |||
| if sum(fileinfo.file_size for fileinfo in zip.infolist()) > 1000000: | |||
| if sum(fileinfo.file_size for fileinfo in zip.infolist()) > max_file_size: | |||
There was a problem hiding this comment.
better fix is:
if sum(fileinfo.file_size for fileinfo in zip.infolist()) > (max_file_size * len(zip.infolist())):
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This allows submitting a zip file larger than 1 MB. Until now, there was a hard-coded limitation of 1 MB in the size of the sum of the file sizes in an uploaded zip file. The goal was to prevent accepting zip bombs. However, this limit can sometimes be exceeded when the zip file contains images or PDF files. To keep things simple, using the same limit as for the maximum file size is probably fine, in my opinion, and serves the purpose.
Additionally, I fixed the following:
max_file_sizewas technically incorrect. As we're multiplying by 1024, the correct unit is kibibyte.Again: the tests don't pass because I didn't merge #348 into this branch.