From 40f1ecfb064fe51152be8090392afd1aa4905b63 Mon Sep 17 00:00:00 2001
From: skyanth <skyanth@gmail.com>
Date: Wed, 29 Mar 2017 11:40:12 +0200
Subject: [PATCH] implemented finding count placeholder

---
 xml/RELEASE_NOTES.md       |  7 +++++++
 xml/dtd/pentestreport.xsd  | 33 ++++++++++++++++++++-------------
 xml/xslt/placeholders.xslt | 12 ++++++++++--
 3 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/xml/RELEASE_NOTES.md b/xml/RELEASE_NOTES.md
index e665000..d0517cc 100644
--- a/xml/RELEASE_NOTES.md
+++ b/xml/RELEASE_NOTES.md
@@ -1,6 +1,13 @@
 RELEASE NOTES
 =============
 
+March 29th, 2017
+----------------
+
+### Finding Count placeholders
+
+In reports, you now have access to the `<finding_count>` placeholder. It takes an optional attribute `@threatLevel` and returns the number of findings with that threatLevel in the report. If no `@threatLevel` attribute is added, it returns the total number of findings in the report. Useful for Results in a Nutshell type of texts.
+
 March 20th, 2017
 ----------------
 
diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd
index 56231df..d4c965a 100644
--- a/xml/dtd/pentestreport.xsd
+++ b/xml/dtd/pentestreport.xsd
@@ -193,6 +193,20 @@
     </xs:simpleType>
   </xs:attribute>
   
+  <xs:attribute name="threatLevel" default="N/A">
+        <xs:simpleType> 
+          <xs:restriction base="xs:string"> 
+            <xs:enumeration value="N/A"/>
+            <xs:enumeration value="Unknown"/>
+            <xs:enumeration value="Low"/>
+            <xs:enumeration value="Moderate"/>
+            <xs:enumeration value="Elevated"/>
+            <xs:enumeration value="High"/>
+            <xs:enumeration value="Extreme"/>
+          </xs:restriction> 
+        </xs:simpleType>
+      </xs:attribute>
+  
   <xs:element name="non-finding">
     <xs:complexType>
       <xs:sequence>
@@ -263,19 +277,7 @@
         </xs:choice>
       </xs:sequence>
       <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="threatLevel" use="optional" default="N/A">
-        <xs:simpleType> 
-          <xs:restriction base="xs:string"> 
-            <xs:enumeration value="N/A"/>
-            <xs:enumeration value="Unknown"/>
-            <xs:enumeration value="Low"/>
-            <xs:enumeration value="Moderate"/>
-            <xs:enumeration value="Elevated"/>
-            <xs:enumeration value="High"/>
-            <xs:enumeration value="Extreme"/>
-          </xs:restriction> 
-        </xs:simpleType>
-      </xs:attribute>
+      <xs:attribute ref="threatLevel" use="optional" default="N/A"/>
       <xs:attribute name="status" use="optional">
         <xs:simpleType> 
           <xs:restriction base="xs:string"> 
@@ -380,6 +382,11 @@
       <xs:element name="p_testingduration"/>
       <xs:element name="p_reportwritingduration"/>
       <xs:element name="p_reportdue"/>
+      <xs:element name="finding_count">
+        <xs:complexType>
+          <xs:attribute ref="threatLevel" use="required"/>
+        </xs:complexType>
+      </xs:element>
     </xs:choice>
     
 </xs:group>
diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt
index a5b4759..338c6d2 100644
--- a/xml/xslt/placeholders.xslt
+++ b/xml/xslt/placeholders.xslt
@@ -59,7 +59,8 @@
     </xsl:template>
     <xsl:template match="client_rate">
         <xsl:param name="roleTitle" select="@title"/>
-        <xsl:param name="placeholderElement" select="/*/meta//client/rates/rate[@title=$roleTitle]"/>
+        <xsl:param name="placeholderElement"
+            select="/*/meta//client/rates/rate[@title = $roleTitle]"/>
         <xsl:call-template name="checkPlaceholder">
             <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
         </xsl:call-template>
@@ -345,6 +346,12 @@
             <xsl:with-param name="placeholderElement" select="$placeholderElement"/>
         </xsl:call-template>
     </xsl:template>
+
+    <xsl:template match="finding_count">
+        <xsl:param name="threatLevel" select="@threatLevel"/>
+            <xsl:value-of select="count(//finding[@threatLevel=$threatLevel])" />
+    </xsl:template>
+
     <xsl:template name="checkPlaceholder">
         <xsl:param name="placeholderElement" select="/"/>
         <xsl:param name="caps" select="'none'"/>
@@ -362,7 +369,8 @@
                         <xsl:variable name="fee" select="$placeholderElement * 1"/>
                         <xsl:number value="$fee" grouping-separator="," grouping-size="3"/>
                     </xsl:when>
-                    <xsl:when test="self::contract_end_date or self::contract_start_date or self::generate_raterevisiondate">
+                    <xsl:when
+                        test="self::contract_end_date or self::contract_start_date or self::generate_raterevisiondate">
                         <!-- pretty printing for date -->
                         <xsl:value-of
                             select="format-date($placeholderElement, '[MNn] [D1], [Y]', 'en', (), ())"