Skip to content

Surround decompression with try..catch + strip ".gz" from filename #3756

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 1 commit into from
Jan 12, 2025
Merged

Surround decompression with try..catch + strip ".gz" from filename #3756

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
10 changes: 8 additions & 2 deletions utils/proxy/_deserializer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,12 @@ def json_load():
item["content"] = json.loads(part.content)

elif content_type_part == "application/gzip":
with gzip.GzipFile(fileobj=io.BytesIO(part.content)) as gz_file:
content = gz_file.read()
try:
with gzip.GzipFile(fileobj=io.BytesIO(part.content)) as gz_file:
content = gz_file.read()
except:
item["system-tests-error"] = "Can't decompress gzip data"
continue

_deserialize_file_in_multipart_form_data(item, headers, export_content_files_to, content)

Expand Down Expand Up @@ -239,6 +243,8 @@ def _deserialize_file_in_multipart_form_data(
item["system-tests-error"] = "Filename not found in content-disposition, please contact #apm-shared-testing"
else:
filename = meta_data["filename"].strip('"')
if filename.lower().endswith(".gz"):
filename = filename[:-3]
file_path = f"{export_content_files_to}/{md5(content).hexdigest()}_{filename}"

with open(file_path, "wb") as f:
Expand Down
Loading