mirror of
https://github.com/prowler-cloud/prowler.git
synced 2026-11-09 04:38:49 +00:00
fix(api): log comp report output dir failures with exc_info (#12142)
Co-authored-by: Alan Buscaglia <gentlemanprogramming@gmail.com>
This commit is contained in:
1 parent
3b577907e4
commit
a6d5dbacd9
5 files changed
+319
-3
No files matched your search
@@ -13,6 +13,7 @@ from api.db_utils import rls_transaction
|
||||
from api.models import Provider, Scan, ScanSummary, StateChoices, ThreatScoreSnapshot
|
||||
from celery.utils.log import get_task_logger
|
||||
from config.django.base import DJANGO_TMP_OUTPUT_DIRECTORY
|
||||
from config.settings.sentry import ERROR_CATEGORY_ATTRIBUTE, FILESYSTEM_ERROR_CATEGORY
|
||||
from prowler.lib.check.compliance_models import (
|
||||
Compliance,
|
||||
get_bulk_compliance_frameworks_universal,
|
||||
@@ -960,7 +961,15 @@ def generate_compliance_reports(
|
||||
first_output_path = next(iter(output_paths.values()))
|
||||
out_dir = str(Path(first_output_path).parent.parent)
|
||||
except Exception as e:
|
||||
logger.error("Error generating output directory: %s", e)
|
||||
# logger.exception attaches the exception (and its traceback) to the
|
||||
# Sentry event and the filesystem category opts that event into the
|
||||
# errno fingerprint, so ENOSPC, ENOENT and EACCES raised from this same
|
||||
# call site land on separate issues.
|
||||
logger.exception(
|
||||
"Error generating output directory: %s",
|
||||
e,
|
||||
extra={ERROR_CATEGORY_ATTRIBUTE: FILESYSTEM_ERROR_CATEGORY},
|
||||
)
|
||||
error_dict = {"error": str(e), "upload": False, "path": ""}
|
||||
if generate_threatscore:
|
||||
results["threatscore"] = error_dict.copy()
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import errno
|
||||
import logging
|
||||
import os
|
||||
import time
|
||||
import uuid
|
||||
@@ -14,6 +16,11 @@ from api.models import (
|
||||
StateChoices,
|
||||
StatusChoices,
|
||||
)
|
||||
from config.settings.sentry import (
|
||||
ERROR_CATEGORY_ATTRIBUTE,
|
||||
FILESYSTEM_ERROR_CATEGORY,
|
||||
before_send,
|
||||
)
|
||||
from prowler.lib.check.models import Severity
|
||||
from reportlab.lib import colors
|
||||
from tasks.jobs.report import (
|
||||
@@ -1676,6 +1683,78 @@ class TestGenerateComplianceReportsCIS:
|
||||
assert result["cis"]["upload"] is False
|
||||
assert result["cis"]["error"] == "dir boom"
|
||||
|
||||
@patch("tasks.jobs.report._aggregate_requirement_statistics_from_database")
|
||||
@patch("tasks.jobs.report._generate_compliance_output_directory")
|
||||
@patch("tasks.jobs.report.Compliance.get_bulk")
|
||||
def test_output_directory_failures_are_grouped_per_errno(
|
||||
self,
|
||||
mock_get_bulk,
|
||||
mock_generate_output_dir,
|
||||
mock_stats,
|
||||
monkeypatch,
|
||||
caplog,
|
||||
tenants_fixture,
|
||||
scans_fixture,
|
||||
aws_provider,
|
||||
):
|
||||
"""A full disk and a missing mount point must not share a Sentry issue.
|
||||
|
||||
Both are OSError raised from the same ``os.makedirs`` call, so they only
|
||||
stay apart if the exception reaches ``before_send``, which fingerprints
|
||||
it by errno.
|
||||
"""
|
||||
tenant = tenants_fixture[0]
|
||||
scan = scans_fixture[0]
|
||||
provider = aws_provider
|
||||
|
||||
self._force_scan_has_findings(monkeypatch)
|
||||
mock_stats.return_value = {}
|
||||
mock_get_bulk.return_value = {"cis_5.0_aws": Mock()}
|
||||
|
||||
fingerprints = []
|
||||
for error_number, message in (
|
||||
(errno.ENOSPC, "No space left on device: '/tmp/prowler_api_output'"),
|
||||
(errno.ENOENT, "No such file or directory: '/mnt/output'"),
|
||||
):
|
||||
mock_generate_output_dir.side_effect = OSError(error_number, message)
|
||||
caplog.clear()
|
||||
|
||||
with caplog.at_level(logging.ERROR, logger="tasks.jobs.report"):
|
||||
generate_compliance_reports(
|
||||
tenant_id=str(tenant.id),
|
||||
scan_id=str(scan.id),
|
||||
provider_id=str(provider.id),
|
||||
generate_threatscore=False,
|
||||
generate_ens=False,
|
||||
generate_nis2=False,
|
||||
generate_csa=False,
|
||||
generate_cis=True,
|
||||
)
|
||||
|
||||
record = next(
|
||||
record
|
||||
for record in caplog.records
|
||||
if "Error generating output directory" in record.getMessage()
|
||||
)
|
||||
# Without exc_info the Sentry event carries no exception at all and
|
||||
# nothing can tell the two failures apart.
|
||||
assert record.exc_info is not None
|
||||
# The category is what scopes the errno fingerprint to this record.
|
||||
assert (
|
||||
getattr(record, ERROR_CATEGORY_ATTRIBUTE, None)
|
||||
== FILESYSTEM_ERROR_CATEGORY
|
||||
)
|
||||
|
||||
# Same hint the Sentry logging integration builds for this record.
|
||||
event = {}
|
||||
before_send(event, {"log_record": record, "exc_info": record.exc_info})
|
||||
fingerprints.append(event["fingerprint"])
|
||||
|
||||
assert fingerprints == [
|
||||
["{{ default }}", "errno:ENOSPC"],
|
||||
["{{ default }}", "errno:ENOENT"],
|
||||
]
|
||||
|
||||
|
||||
class TestPickLatestCisVariant:
|
||||
"""Unit tests for `_pick_latest_cis_variant` helper."""
|
||||
|
||||
Reference in new issue
Block a user