diff --git a/api/CHANGELOG.md b/api/CHANGELOG.md index 862c468984..f2ad299064 100644 --- a/api/CHANGELOG.md +++ b/api/CHANGELOG.md @@ -5,9 +5,14 @@ All notable changes to the **Prowler API** are documented in this file. ## [1.15.1] (Prowler v5.14.1) ### Fixed +<<<<<<< HEAD - Typo in PDF reporting [(#9322)](https://github.com/prowler-cloud/prowler/pull/9322) - IaC provider initialization failure when mutelist processor is configured [(#9331)](https://github.com/prowler-cloud/prowler/pull/9331) - Match logic for ThreatScore when counting findings [(#9348)](https://github.com/prowler-cloud/prowler/pull/9348) +======= +- Fix typo in PDF reporting [(#9345)](https://github.com/prowler-cloud/prowler/pull/9345) +- Fix IaC provider initialization failure when mutelist processor is configured [(#9331)](https://github.com/prowler-cloud/prowler/pull/9331) +>>>>>>> bb43e924e (fix(report): use pagina for ENS in footer (#9345)) --- diff --git a/api/src/backend/tasks/jobs/report.py b/api/src/backend/tasks/jobs/report.py index 7dae6ae8be..76a6527560 100644 --- a/api/src/backend/tasks/jobs/report.py +++ b/api/src/backend/tasks/jobs/report.py @@ -1,6 +1,7 @@ import io import os from collections import defaultdict +from functools import partial from pathlib import Path from shutil import rmtree @@ -772,7 +773,9 @@ def _create_section_score_chart( return buffer -def _add_pdf_footer(canvas_obj: canvas.Canvas, doc: SimpleDocTemplate) -> None: +def _add_pdf_footer( + canvas_obj: canvas.Canvas, doc: SimpleDocTemplate, compliance_name: str +) -> None: """ Add footer with page number and branding to each page of the PDF. @@ -782,7 +785,9 @@ def _add_pdf_footer(canvas_obj: canvas.Canvas, doc: SimpleDocTemplate) -> None: """ canvas_obj.saveState() width, height = doc.pagesize - page_num_text = f"Page {doc.page}" + page_num_text = ( + f"{'Página' if 'ens' in compliance_name.lower() else 'Page'} {doc.page}" + ) canvas_obj.setFont("PlusJakartaSans", 9) canvas_obj.setFillColorRGB(0.4, 0.4, 0.4) canvas_obj.drawString(30, 20, page_num_text) @@ -1595,7 +1600,11 @@ def generate_threatscore_report( elements.append(PageBreak()) # Build the PDF - doc.build(elements, onFirstPage=_add_pdf_footer, onLaterPages=_add_pdf_footer) + doc.build( + elements, + onFirstPage=partial(_add_pdf_footer, compliance_name=compliance_name), + onLaterPages=partial(_add_pdf_footer, compliance_name=compliance_name), + ) except Exception as e: tb_lineno = e.__traceback__.tb_lineno if e.__traceback__ else "unknown" logger.info(f"Error building the document, line {tb_lineno} -- {e}") @@ -2818,7 +2827,11 @@ def generate_ens_report( # Build the PDF logger.info("Building PDF...") - doc.build(elements, onFirstPage=_add_pdf_footer, onLaterPages=_add_pdf_footer) + doc.build( + elements, + onFirstPage=partial(_add_pdf_footer, compliance_name=compliance_name), + onLaterPages=partial(_add_pdf_footer, compliance_name=compliance_name), + ) except Exception as e: tb_lineno = e.__traceback__.tb_lineno if e.__traceback__ else "unknown" logger.error(f"Error building ENS report, line {tb_lineno} -- {e}") @@ -3365,7 +3378,11 @@ def generate_nis2_report( # Build the PDF logger.info("Building NIS2 PDF...") - doc.build(elements, onFirstPage=_add_pdf_footer, onLaterPages=_add_pdf_footer) + doc.build( + elements, + onFirstPage=partial(_add_pdf_footer, compliance_name=compliance_name), + onLaterPages=partial(_add_pdf_footer, compliance_name=compliance_name), + ) logger.info(f"NIS2 report successfully generated at {output_path}") except Exception as e: