From 83fac1031d8f73a79d1e2d3ed5fce02569371c52 Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Thu, 13 Aug 2026 16:42:12 +0200 Subject: [PATCH 1/3] Fix: use pretty status names in summary tables Fix: some XML formatting cleanup --- xslt/auto.xslt | 89 ++++++++++++++++++---------------------------- xslt/findings.xslt | 2 +- 2 files changed, 36 insertions(+), 55 deletions(-) diff --git a/xslt/auto.xslt b/xslt/auto.xslt index e401ee6..a8d7c1f 100644 --- a/xslt/auto.xslt +++ b/xslt/auto.xslt @@ -2,8 +2,9 @@ @@ -146,10 +147,7 @@ - + #ededed @@ -185,40 +183,36 @@ - + + + - Status: + Status: - + - + - + - + - + - + @@ -342,10 +336,7 @@ - + #ededed @@ -371,55 +362,50 @@ - + - Type: + Type: - - + + + + + - Status: + Status: - + - + - + - + - + - + @@ -437,19 +423,14 @@ - + - + - + diff --git a/xslt/findings.xslt b/xslt/findings.xslt index 60ed26c..556714f 100644 --- a/xslt/findings.xslt +++ b/xslt/findings.xslt @@ -175,7 +175,7 @@ Update - + From 65ef6a5775b9349852535468e2694b6a7895886d Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Thu, 13 Aug 2026 16:47:28 +0200 Subject: [PATCH 2/3] Feature: add support for "won't fix" status --- doc/report/Report Writing - Procedure.md | 2 +- dtd/pentestreport.xsd | 1 + xslt/auto.xslt | 16 ++++++++++++++++ xslt/css.xslt | 4 ++++ xslt/findings.xslt | 14 ++++++++++++-- xslt/functions_params_vars.xslt | 4 ++++ xslt/generate_html_report.xsl | 5 +++++ xslt/styles_rep.xslt | 5 ++++- 8 files changed, 47 insertions(+), 4 deletions(-) diff --git a/doc/report/Report Writing - Procedure.md b/doc/report/Report Writing - Procedure.md index 76113f8..7599a75 100644 --- a/doc/report/Report Writing - Procedure.md +++ b/doc/report/Report Writing - Procedure.md @@ -332,7 +332,7 @@ A finding consists of a `` element with the following attributes: There are two optional fields: - `status`, which can denote whether the finding is `new`, `unresolved`, - `not_retested` or `resolved`. + `not_retested`, `resolved`, or `wont_fix`. - `prefix`, to add a prefix to a finding identifier. Furthermore, the `` is made up of several sub-elements: diff --git a/dtd/pentestreport.xsd b/dtd/pentestreport.xsd index 46a4495..25d16ff 100644 --- a/dtd/pentestreport.xsd +++ b/dtd/pentestreport.xsd @@ -227,6 +227,7 @@ + diff --git a/xslt/auto.xslt b/xslt/auto.xslt index a8d7c1f..cea217e 100644 --- a/xslt/auto.xslt +++ b/xslt/auto.xslt @@ -215,6 +215,14 @@ + + + + + + + + @@ -408,6 +416,14 @@ + + + + + + + + diff --git a/xslt/css.xslt b/xslt/css.xslt index 509ccf1..c8e5ec0 100644 --- a/xslt/css.xslt +++ b/xslt/css.xslt @@ -602,6 +602,10 @@ there. color: ; } +.status-wont_fix { + color: ; +} + .status-resolved { color: ; } diff --git a/xslt/findings.xslt b/xslt/findings.xslt index 556714f..f1230e6 100644 --- a/xslt/findings.xslt +++ b/xslt/findings.xslt @@ -32,7 +32,7 @@ + test="@status = 'new' or @status = 'resolved' or @status = 'unresolved' or @status = 'not_retested' or @status = 'wont_fix'"> Status: @@ -52,6 +52,11 @@ + + + + + @@ -157,7 +162,7 @@ + test="../@status = 'resolved' or ../@status = 'unresolved' or ../@status = 'not_retested' or ../@status = 'wont_fix'"> @@ -175,6 +180,11 @@ Update + + + Update + + diff --git a/xslt/functions_params_vars.xslt b/xslt/functions_params_vars.xslt index d11078c..086b79f 100644 --- a/xslt/functions_params_vars.xslt +++ b/xslt/functions_params_vars.xslt @@ -53,6 +53,7 @@ #CC4900 #FF5C00 #FE9920 + #333333 #15B01A @@ -320,6 +321,9 @@ + + + diff --git a/xslt/generate_html_report.xsl b/xslt/generate_html_report.xsl index f5bdafa..4220413 100644 --- a/xslt/generate_html_report.xsl +++ b/xslt/generate_html_report.xsl @@ -626,6 +626,11 @@ + + + + + diff --git a/xslt/styles_rep.xslt b/xslt/styles_rep.xslt index 7bc4070..919f6d8 100644 --- a/xslt/styles_rep.xslt +++ b/xslt/styles_rep.xslt @@ -16,7 +16,10 @@ - + + + + From 0ac2f694b6fb41c7b2a082e39340edd54d82eddf Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Fri, 14 Aug 2026 14:33:30 +0200 Subject: [PATCH 3/3] Rename "wont_fix" to "accepted_risk" --- doc/report/Report Writing - Procedure.md | 2 +- dtd/pentestreport.xsd | 2 +- xslt/auto.xslt | 8 ++++---- xslt/css.xslt | 4 ++-- xslt/findings.xslt | 12 ++++++------ xslt/functions_params_vars.xslt | 6 +++--- xslt/generate_html_report.xsl | 4 ++-- xslt/styles_rep.xslt | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/doc/report/Report Writing - Procedure.md b/doc/report/Report Writing - Procedure.md index 7599a75..157b759 100644 --- a/doc/report/Report Writing - Procedure.md +++ b/doc/report/Report Writing - Procedure.md @@ -332,7 +332,7 @@ A finding consists of a `` element with the following attributes: There are two optional fields: - `status`, which can denote whether the finding is `new`, `unresolved`, - `not_retested`, `resolved`, or `wont_fix`. + `not_retested`, `resolved`, or `accepted_risk`. - `prefix`, to add a prefix to a finding identifier. Furthermore, the `` is made up of several sub-elements: diff --git a/dtd/pentestreport.xsd b/dtd/pentestreport.xsd index 25d16ff..a6f88d6 100644 --- a/dtd/pentestreport.xsd +++ b/dtd/pentestreport.xsd @@ -227,7 +227,7 @@ - + diff --git a/xslt/auto.xslt b/xslt/auto.xslt index cea217e..2c4c5e3 100644 --- a/xslt/auto.xslt +++ b/xslt/auto.xslt @@ -215,10 +215,10 @@ - + - + @@ -416,10 +416,10 @@ - + - + diff --git a/xslt/css.xslt b/xslt/css.xslt index c8e5ec0..229aa11 100644 --- a/xslt/css.xslt +++ b/xslt/css.xslt @@ -602,8 +602,8 @@ there. color: ; } -.status-wont_fix { - color: ; +.status-accepted_risk { + color: ; } .status-resolved { diff --git a/xslt/findings.xslt b/xslt/findings.xslt index f1230e6..5159e91 100644 --- a/xslt/findings.xslt +++ b/xslt/findings.xslt @@ -32,7 +32,7 @@ + test="@status = 'new' or @status = 'resolved' or @status = 'unresolved' or @status = 'not_retested' or @status = 'accepted_risk'"> Status: @@ -52,8 +52,8 @@ - - + + @@ -162,7 +162,7 @@ + test="../@status = 'resolved' or ../@status = 'unresolved' or ../@status = 'not_retested' or ../@status = 'accepted_risk'"> @@ -180,8 +180,8 @@ Update - - + + Update diff --git a/xslt/functions_params_vars.xslt b/xslt/functions_params_vars.xslt index 086b79f..9119904 100644 --- a/xslt/functions_params_vars.xslt +++ b/xslt/functions_params_vars.xslt @@ -53,7 +53,7 @@ #CC4900 #FF5C00 #FE9920 - #333333 + #333333 #15B01A @@ -321,8 +321,8 @@ - - + + diff --git a/xslt/generate_html_report.xsl b/xslt/generate_html_report.xsl index 4220413..8390893 100644 --- a/xslt/generate_html_report.xsl +++ b/xslt/generate_html_report.xsl @@ -626,8 +626,8 @@ - - + + diff --git a/xslt/styles_rep.xslt b/xslt/styles_rep.xslt index 919f6d8..34afbdf 100644 --- a/xslt/styles_rep.xslt +++ b/xslt/styles_rep.xslt @@ -16,8 +16,8 @@ - - + +