Skip to content

[pull] master from kevoreilly:master #312

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
pull merged 1 commit into from
Oct 8, 2025
Merged

[pull] master from kevoreilly:master #312

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
22 changes: 16 additions & 6 deletions modules/reporting/gcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ def run(self, results):
)
return

tlp = results.get("info", {}).get("tlp")

# Read configuration options from gcs.conf and validate them
bucket_name = self.options.get("bucket_name")
if not bucket_name:
Expand Down Expand Up @@ -97,9 +99,9 @@ def run(self, results):
source_directory = self.analysis_path

if mode == "zip":
self.upload_zip_archive(bucket, analysis_id, source_directory, exclude_dirs, exclude_files)
self.upload_zip_archive(bucket, analysis_id, source_directory, exclude_dirs, exclude_files, tlp=tlp)
elif mode == "file":
self.upload_files_individually(bucket, analysis_id, source_directory, exclude_dirs, exclude_files)
self.upload_files_individually(bucket, analysis_id, source_directory, exclude_dirs, exclude_files, tlp=tlp)
else:
raise CuckooReportError("Invalid GCS upload mode specified: %s. Must be 'file' or 'zip'.", mode)

Expand All @@ -121,10 +123,14 @@ def _iter_files_to_upload(self, source_directory, exclude_dirs, exclude_files):
relative_path = os.path.relpath(local_path, source_directory)
yield local_path, relative_path

def upload_zip_archive(self, bucket, analysis_id, source_directory, exclude_dirs, exclude_files):
def upload_zip_archive(self, bucket, analysis_id, source_directory, exclude_dirs, exclude_files, tlp=None):
"""Compresses and uploads the analysis directory as a single zip file."""
log.debug("Compressing and uploading files for analysis ID %d to GCS bucket '%s'", analysis_id, bucket.name)
zip_name = "%s.zip" % analysis_id
if tlp:
zip_name = "%s_tlp_%s.zip" % analysis_id, tlp
else:
zip_name = "%s.zip" % analysis_id

blob_name = zip_name

with tempfile.NamedTemporaryFile(delete=False, suffix=".zip") as tmp_zip_file:
Expand All @@ -141,11 +147,15 @@ def upload_zip_archive(self, bucket, analysis_id, source_directory, exclude_dirs
os.unlink(tmp_zip_file_name)
log.info("Successfully uploaded archive for analysis %d to GCS.", analysis_id)

def upload_files_individually(self, bucket, analysis_id, source_directory, exclude_dirs, exclude_files):
def upload_files_individually(self, bucket, analysis_id, source_directory, exclude_dirs, exclude_files, tlp=None):
"""Uploads analysis files individually to the GCS bucket."""
log.debug("Uploading files for analysis ID %d to GCS bucket '%s'", analysis_id, bucket.name)
folder_name = analysis_id
if tlp:
folder_name = "%s_tlp_%s" % analysis_id, tlp

for local_path, relative_path in self._iter_files_to_upload(source_directory, exclude_dirs, exclude_files):
blob_name = f"{analysis_id}/{relative_path}"
blob_name = f"{folder_name}/{relative_path}"
log.debug("Uploading '%s' to '%s'", local_path, blob_name)
blob = bucket.blob(blob_name)
blob.upload_from_filename(local_path)
Expand Down
Loading