From 1ec7a06def9fe5f3774bd3348835765122675b33 Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Mon, 12 May 2025 20:02:11 +0200 Subject: [PATCH 1/2] excel export: enhance error logging --- dojo/reports/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dojo/reports/views.py b/dojo/reports/views.py index d6a73cd6137..64a16281a21 100644 --- a/dojo/reports/views.py +++ b/dojo/reports/views.py @@ -944,6 +944,7 @@ def get(self, request): row_num = 1 for finding in findings: + logger.debug(f"processing finding: {finding.id}") if row_num == 1: col_num = 1 for key in dir(finding): @@ -955,7 +956,7 @@ def get(self, request): cell.font = font_bold col_num += 1 except Exception as exc: - logger.error("Error in attribute: " + str(exc)) + logger.warning(f"Error in attribute: {key}" + str(exc)) cell = worksheet.cell(row=row_num, column=col_num, value=key) col_num += 1 continue @@ -1007,7 +1008,7 @@ def get(self, request): worksheet.cell(row=row_num, column=col_num, value=value) col_num += 1 except Exception as exc: - logger.error("Error in attribute: " + str(exc)) + logger.warning(f"Error in attribute: {key}" + str(exc)) worksheet.cell(row=row_num, column=col_num, value="Value not supported") col_num += 1 continue From 6ceefa92bbcd75ce891d907cdaefedacb40b46dc Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Mon, 12 May 2025 21:22:16 +0200 Subject: [PATCH 2/2] excel export: fix foreign key errors --- dojo/reports/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dojo/reports/views.py b/dojo/reports/views.py index 64a16281a21..d5853c375b2 100644 --- a/dojo/reports/views.py +++ b/dojo/reports/views.py @@ -816,7 +816,7 @@ def get(self, request): writer = csv.writer(response) allowed_attributes = get_attributes() excludes_list = get_excludes() - allowed_foreign_keys = get_attributes() + allowed_foreign_keys = get_foreign_keys() first_row = True for finding in findings: @@ -940,7 +940,7 @@ def get(self, request): self.font_bold = font_bold allowed_attributes = get_attributes() excludes_list = get_excludes() - allowed_foreign_keys = get_attributes() + allowed_foreign_keys = get_foreign_keys() row_num = 1 for finding in findings: