Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix shenanigans with plugin uploading on web UI

Browse source
This commit is contained in:
Théophile Diot 2024-04-03 13:41:14 +01:00
parent f418a8d643
commit 5be457d6a9
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
1 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/ui/main.py
View file

@ -1245,10 +1245,9 @@ def plugins():
except BadZipFile:
errors += 1
error = 1
flash(
f"{file} is not a valid zip file. ({folder_name or temp_folder_name})",
"error",
)
message = f"{file} is not a valid zip file. ({folder_name or temp_folder_name})"
app.logger.exception(message)
flash(message, "error")
else:
try:
with tar_open(str(tmp_ui_path.joinpath(file)), errorlevel=2) as tar_file:
@ -1265,24 +1264,21 @@ def plugins():
except ReadError:
errors += 1
error = 1
flash(
f"Couldn't read file {file} ({folder_name or temp_folder_name})",
"error",
)
message = f"Couldn't read file {file} ({folder_name or temp_folder_name})"
app.logger.exception(message)
flash(message, "error")
except CompressionError:
errors += 1
error = 1
flash(
f"{file} is not a valid tar file ({folder_name or temp_folder_name})",
"error",
)
message = f"{file} is not a valid tar file ({folder_name or temp_folder_name})"
app.logger.exception(message)
flash(message, "error")
except HeaderError:
errors += 1
error = 1
flash(
f"The file plugin.json in {file} is not valid ({folder_name or temp_folder_name})",
"error",
)
message = f"The file plugin.json in {file} is not valid ({folder_name or temp_folder_name})"
app.logger.exception(message)
flash(message, "error")
if is_dir:
dirs = [d for d in listdir(str(temp_folder_path)) if temp_folder_path.joinpath(d).is_dir()]
@ -1452,7 +1448,8 @@ def upload_plugin():
if not uploaded_file.filename.endswith((".zip", ".tar.gz", ".tar.xz")):
return {"status": "ko"}, 422
folder_name = Path(secure_filename(uploaded_file.filename)).stem
file_name = Path(secure_filename(uploaded_file.filename)).name
folder_name = file_name.replace(".tar.gz", "").replace(".tar.xz", "").replace(".zip", "")
with BytesIO(uploaded_file.read()) as io:
io.seek(0, 0)
@ -1488,7 +1485,7 @@ def upload_plugin():
if len(plugins) <= 1:
io.seek(0, 0)
# deepcode ignore PT: The folder name is being sanitized before
tmp_ui_path.joinpath(folder_name).write_bytes(io.read())
tmp_ui_path.joinpath(file_name).write_bytes(io.read())
return {"status": "ok"}, 201
for plugin in plugins: