From e0d5651b7558ee99e18bd3285ee1181e21472baa Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Sun, 26 Feb 2017 07:50:35 -0500
Subject: [PATCH] updated to add notes

---
 .../main/resources/templates/HtmlReport.vsl   | 40 ++++++++++++++-----
 .../main/resources/templates/XmlReport.vsl    | 22 +++++++++-
 2 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/dependency-check-core/src/main/resources/templates/HtmlReport.vsl b/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
index 02035e96e..62e7b8b26 100644
--- a/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
+++ b/dependency-check-core/src/main/resources/templates/HtmlReport.vsl
@@ -812,8 +812,15 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
                                     ##yes, we are HTML Encoding into JavaScript... the escape utils don't have a JS Encode and I haven't written one yet
                                     &nbsp;&nbsp;<button class="copybutton" title="Generate Suppression XML for this CPE for this file" onclick="copyText('$enc.html($dependency.FileNameForJavaScript)', '$enc.html($dependency.Sha1sum)', '$enc.html($suppressGav)', 'cpe', '$enc.html($id.value)')">suppress</button>
                                 #end
-                                #if ($id.description)
-                                    <br/>$enc.html($id.description)
+                                #if ($id.description || $id.notes)
+                                    <ul>
+                                    #if ($id.description)
+                                        <li>Description: $enc.html($id.description)</li>
+                                    #end
+                                    #if ($id.notes)
+                                        <li>Notes: $enc.xml($id.notes)</li>
+                                    #end
+                                    </ul>
                                 #end
                                 </li>
                             #end
@@ -838,15 +845,18 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
                             <br/>CVSS Score: $vuln.cvssScore (AV:$enc.html($vuln.cvssAccessVector.substring(0,1))/AC:$enc.html($vuln.cvssAccessComplexity.substring(0,1))/Au:$enc.html($vuln.cvssAuthentication.substring(0,1))/C:$enc.html($vuln.cvssConfidentialityImpact.substring(0,1))/I:$enc.html($vuln.cvssIntegrityImpact.substring(0,1))/A:$enc.html($vuln.cvssAvailabilityImpact.substring(0,1)))
                             #if ($vuln.cwe)
                                 <br/>CWE: $vuln.cwe
+                            #end
+                            #if ($vuln.notes)
+                                <br/>Notes: $enc.xml($vuln.notes)
                             #end</p>
                             <p>$enc.html($vuln.description)
-                                #if ($vuln.getReferences().size()>0)
-                                    <ul>
-                                    #foreach($ref in $vuln.getReferences(true))
-                                        <li>$enc.html($ref.source) - <a target="_blank" href="$enc.html($ref.url)">$ref.name</a></li>
-                                    #end
-                                    </ul>
+                            #if ($vuln.getReferences().size()>0)
+                                <ul>
+                                #foreach($ref in $vuln.getReferences(true))
+                                    <li>$enc.html($ref.source) - <a target="_blank" href="$enc.html($ref.url)">$ref.name</a></li>
                                 #end
+                                </ul>
+                            #end
                             </p>
 
                             #if ($vuln.getVulnerableSoftware().size()<2)
@@ -947,8 +957,15 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
                                         #if ($id.confidence)
                                             &nbsp;&nbsp;<i>Confidence</i>:$id.confidence
                                         #end
-                                        #if ($id.description)
-                                            <br/>$enc.html($id.description)
+                                        #if ($id.description || $id.notes)
+                                            <ul>
+                                            #if ($id.description)
+                                                <li>Description: $enc.html($id.description)</li>
+                                            #end
+                                            #if ($id.notes)
+                                                <li>Notes: $enc.xml($id.notes)</li>
+                                            #end
+                                            </ul>
                                         #end
                                         </li>
                                     #end
@@ -973,6 +990,9 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
                                     <br/>CVSS Score: $vuln.cvssScore
                                     #if ($vuln.cwe)
                                         <br/>CWE: $vuln.cwe
+                                    #end
+                                    #if ($vuln.notes)
+                                        <br/>Notes: $enc.xml($vuln.notes)
                                     #end</p>
                                     <p>$enc.html($vuln.description)
                                         #if ($vuln.getReferences().size()>0)
diff --git a/dependency-check-core/src/main/resources/templates/XmlReport.vsl b/dependency-check-core/src/main/resources/templates/XmlReport.vsl
index 859b0b974..143826c57 100644
--- a/dependency-check-core/src/main/resources/templates/XmlReport.vsl
+++ b/dependency-check-core/src/main/resources/templates/XmlReport.vsl
@@ -19,7 +19,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
 @version 1.2
 
 *#<?xml version="1.0"?>
-<analysis xmlns="https://jeremylong.github.io/DependencyCheck/dependency-check.1.3.xsd">
+<analysis xmlns="https://jeremylong.github.io/DependencyCheck/dependency-check.1.4.xsd">
     <scanInfo>
         <engineVersion>$version</engineVersion>
 #foreach($prop in $properties.getMetaData().entrySet())
@@ -60,6 +60,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                         <name>($id.value)</name>
 #if( $id.url )
                         <url>$enc.xml($id.url)</url>
+#end
+#if ($id.notes)
+                        <notes>$enc.xml($id.notes)</notes>
 #end
                     </identifier>
 #end
@@ -101,6 +104,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
 #end
 #if( $id.description )
                     <description>$enc.xml($id.description)</description>
+#end
+#if ($id.notes)
+                    <notes>$enc.xml($id.notes)</notes>
 #end
                 </identifier>
 #end
@@ -112,6 +118,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
 #end
 #if( $id.description )
                     <description>$enc.xml($id.description)</description>
+#end
+#if ($id.notes)
+                    <notes>$enc.xml($id.notes)</notes>
 #end
                 </suppressedIdentifier>
 #end
@@ -140,6 +149,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                     <cwe>$enc.xml($vuln.cwe)</cwe>
 #end
                     <description>$enc.xml($vuln.description)</description>
+#if ($vuln.notes)
+                    <notes>$enc.xml($vuln.notes)</notes>
+#end
                     <references>
 #foreach($ref in $vuln.getReferences())
                         <reference>
@@ -160,6 +172,12 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                 <suppressedVulnerability>
                     <name>$enc.xml($vuln.name)</name>
                     <cvssScore>$vuln.cvssScore</cvssScore>
+                    <cvssAccessVector>$enc.xml($vuln.cvssAccessVector)</cvssAccessVector>
+                    <cvssAccessComplexity>$enc.xml($vuln.cvssAccessComplexity)</cvssAccessComplexity>
+                    <cvssAuthenticationr>$enc.xml($vuln.cvssAuthentication)</cvssAuthenticationr>
+                    <cvssConfidentialImpact>$enc.xml($vuln.cvssConfidentialityImpact)</cvssConfidentialImpact>
+                    <cvssIntegrityImpact>$enc.xml($vuln.cvssIntegrityImpact)</cvssIntegrityImpact>
+                    <cvssAvailabilityImpact>$enc.xml($vuln.cvssAvailabilityImpact)</cvssAvailabilityImpact>
 #if ($vuln.cvssScore<4.0)
                     <severity>Low</severity>
 #elseif ($vuln.cvssScore>=7.0)
@@ -171,7 +189,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
                     <cwe>$enc.xml($vuln.cwe)</cwe>
 #end
                     <description>$enc.xml($vuln.description)</description>
+#if ($vuln.notes)
                     <notes>$enc.xml($vuln.notes)</notes>
+#end
                     <references>
 #foreach($ref in $vuln.getReferences())
                         <reference>