From f05196d65d2d26f34f0cd995bdee0c80532c2099 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Wed, 11 Dec 2019 09:36:55 +0100
Subject: [PATCH] remove single p tag from impact/description

---
 xml/xslt/gitlab_export_cleanup.xsl | 49 +++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/xml/xslt/gitlab_export_cleanup.xsl b/xml/xslt/gitlab_export_cleanup.xsl
index 66c5c01..0aaef2c 100644
--- a/xml/xslt/gitlab_export_cleanup.xsl
+++ b/xml/xslt/gitlab_export_cleanup.xsl
@@ -3,7 +3,7 @@
     xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" version="2.0">
 
     <xsl:output indent="yes" method="xml"/>
-    
+
     <xsl:template match="@* | node()">
         <xsl:copy>
             <xsl:apply-templates select="@* | node()"/>
@@ -12,42 +12,55 @@
 
     <!-- remove all spans; they are not used in pentext -->
     <xsl:template match="span">
-            <xsl:apply-templates/>
+        <xsl:apply-templates/>
     </xsl:template>
-    
+
     <!-- remove all divs; they are not used in findings -->
     <xsl:template match="div">
-            <xsl:apply-templates/>
+        <xsl:apply-templates/>
     </xsl:template>
-    
+
     <!-- convert <pre><code> to <pre> -->
     <xsl:template match="pre/code">
-            <xsl:apply-templates/>
+        <xsl:apply-templates/>
     </xsl:template>
-    
+
     <!-- remove @class from pre -->
     <xsl:template match="pre/@class"/>
-    
+
     <!-- remove @class from a -->
     <xsl:template match="a/@class"/>
-    
+
     <!-- remove h*, make bold paragraph -->
     <xsl:template match="h2 | h3 | h4 | h5">
-        <p><b><xsl:apply-templates/></b></p>
+        <p>
+            <b>
+                <xsl:apply-templates/>
+            </b>
+        </p>
     </xsl:template>
-    
+
     <!-- TODO: change <img src="/uploads/ac943b3c98d3630f7b1d787c00aa9417/file.png"/> to 
     <img src="../screenshots/file.png"/> -->
-    
+
     <!-- get rid of superfluous breaks before images or h3 tags -->
     <!-- (not perfect, ideally post-process result later to flatten img or h3 out of p -->
-    <xsl:template match="br[following-sibling::img] | br[following-sibling::h3] | br[following-sibling::p]">
-    </xsl:template>
-    
+    <xsl:template
+        match="br[following-sibling::img] | br[following-sibling::h3] | br[following-sibling::p]"> </xsl:template>
+
     <!-- insert default img width to nudge pentesters :) -->
     <xsl:template match="img[not(@height) and not(@width)]">
-        <xsl:copy><xsl:attribute name="width">17</xsl:attribute>
-        <xsl:apply-templates select="@* | node()"/></xsl:copy>
+        <xsl:copy>
+            <xsl:attribute name="width">17</xsl:attribute>
+            <xsl:apply-templates select="@* | node()"/>
+        </xsl:copy>
     </xsl:template>
-    
+
+    <!--if a description or an impact tag contains only a p, remove the p (unless it has element children).-->
+    <xsl:template
+        match="description/p[not(preceding-sibling::*)][not(following-sibling::*)][not(*)] | impact/p[not(preceding-sibling::*)][not(following-sibling::*)][not(*)]">
+        <xsl:apply-templates/>
+    </xsl:template>
+
+
 </xsl:stylesheet>