monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WebHost: Prevent committing data packages with invalid checksums to database and prevent 500 error from invalid `zip` files. (#3206)

This commit is contained in:
Zach Parks 2024-04-26 22:18:12 -04:00 committed by GitHub
parent 4f1e696243
commit e76ba928a8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WebHostLib/upload.py
View File

@ -63,12 +63,13 @@ def process_multidata(compressed_multidata, files={}):
game_data = games_package_schema.validate(game_data) game_data = games_package_schema.validate(game_data)
game_data = {key: value for key, value in sorted(game_data.items())} game_data = {key: value for key, value in sorted(game_data.items())}
game_data["checksum"] = data_package_checksum(game_data) game_data["checksum"] = data_package_checksum(game_data)
game_data_package = GameDataPackage(checksum=game_data["checksum"],
data=pickle.dumps(game_data))
if original_checksum != game_data["checksum"]: if original_checksum != game_data["checksum"]:
raise Exception(f"Original checksum {original_checksum} != " raise Exception(f"Original checksum {original_checksum} != "
f"calculated checksum {game_data['checksum']} " f"calculated checksum {game_data['checksum']} "
f"for game {game}.") f"for game {game}.")
game_data_package = GameDataPackage(checksum=game_data["checksum"],
data=pickle.dumps(game_data))
decompressed_multidata["datapackage"][game] = { decompressed_multidata["datapackage"][game] = {
"version": game_data.get("version", 0), "version": game_data.get("version", 0),
"checksum": game_data["checksum"], "checksum": game_data["checksum"],
@ -192,6 +193,8 @@ def uploads():
res = upload_zip_to_db(zfile) res = upload_zip_to_db(zfile)
except VersionException: except VersionException:
flash(f"Could not load multidata. Wrong Version detected.") flash(f"Could not load multidata. Wrong Version detected.")
except Exception as e:
flash(f"Could not load multidata. File may be corrupted or incompatible. ({e})")
else: else:
if res is str: if res is str:
return res return res