Skip to content

WebHost: Show error instead of 500 for unexpected files in multidata zip #2260

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

Merged
merged 5 commits into from
Oct 10, 2023
Merged

WebHost: Show error instead of 500 for unexpected files in multidata zip #2260

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fea3e79
WebHost: Show error instead of 500 for unexpected files in multidata zip
remyjette Oct 3, 2023
7ab6ed3
Add filename to error message
remyjette Oct 3, 2023
d93f372
Merge branch 'main' into invalid-zip-500
remyjette Oct 3, 2023
6cc9b04
Apply suggestions from code review
remyjette Oct 10, 2023
dd5dde0
Merge branch 'main' into invalid-zip-500
remyjette Oct 10, 2023
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
12 changes: 10 additions & 2 deletions WebHostLib/upload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,21 @@ def upload_zip_to_db(zfile: zipfile.ZipFile, owner=None, meta={"race": False}, s

# Factorio
elif file.filename.endswith(".zip"):
_, _, slot_id, *_ = file.filename.split('_')[0].split('-', 3)
try:
_, _, slot_id, *_ = file.filename.split('_')[0].split('-', 3)
except Exception:
flash("Error: Unexpected file found in .zip: " + file.filename)
return
data = zfile.open(file, "r").read()
files[int(slot_id[1:])] = data

# All other files using the standard MultiWorld.get_out_file_name_base method
else:
_, _, slot_id, *_ = file.filename.split('.')[0].split('_', 3)
try:
_, _, slot_id, *_ = file.filename.split('.')[0].split('_', 3)
except Exception:
flash("Error: Unexpected file found in .zip: " + file.filename)
return
data = zfile.open(file, "r").read()
files[int(slot_id[1:])] = data

Expand Down