Better support of custom modules in autoreporter (#836)

CERT-Polska · Mar 6, 2024 · c01352e · c01352e
1 parent f82250f
commit c01352e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/artemis/reporting/export/deduplication.py b/artemis/reporting/export/deduplication.py
@@ -123,14 +123,17 @@ def _process_non_ip_report(processed_report: Report) -> None:
 
 def _all_reports_are_old(reports: List[Report]) -> bool:
     for report in reports:
-        if SEVERITY_MAP[report.report_type] == Severity.LOW:
+        if report.report_type not in SEVERITY_MAP:
             threshold_days = Config.Reporting.MIN_DAYS_BETWEEN_REMINDERS__SEVERITY_LOW
-        elif SEVERITY_MAP[report.report_type] == Severity.MEDIUM:
-            threshold_days = Config.Reporting.MIN_DAYS_BETWEEN_REMINDERS__SEVERITY_MEDIUM
-        elif SEVERITY_MAP[report.report_type] == Severity.HIGH:
-            threshold_days = Config.Reporting.MIN_DAYS_BETWEEN_REMINDERS__SEVERITY_HIGH
         else:
-            assert False
+            if SEVERITY_MAP[report.report_type] == Severity.LOW:
+                threshold_days = Config.Reporting.MIN_DAYS_BETWEEN_REMINDERS__SEVERITY_LOW
+            elif SEVERITY_MAP[report.report_type] == Severity.MEDIUM:
+                threshold_days = Config.Reporting.MIN_DAYS_BETWEEN_REMINDERS__SEVERITY_MEDIUM
+            elif SEVERITY_MAP[report.report_type] == Severity.HIGH:
+                threshold_days = Config.Reporting.MIN_DAYS_BETWEEN_REMINDERS__SEVERITY_HIGH
+            else:
+                assert False
 
         if report.timestamp and report.timestamp >= datetime.datetime.now() - datetime.timedelta(days=threshold_days):
             return False

diff --git a/scripts/export_emails b/scripts/export_emails
@@ -18,6 +18,11 @@ if exists */docker-compose.yml; then
     done
 fi
 
+if exists */docker-compose.additional*; then
+    for DOCKER_COMPOSE_FILE in */docker-compose.additional*; do
+        FILE_OPTIONS="$FILE_OPTIONS -f $DOCKER_COMPOSE_FILE"
+    done
+fi
 
 docker compose $FILE_OPTIONS $ADDITIONAL_DOCKER_COMPOSE_OPTIONS build autoreporter
 docker compose $FILE_OPTIONS $ADDITIONAL_DOCKER_COMPOSE_OPTIONS run autoreporter python3 -m artemis.reporting.export.main "$@"