github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-20 16:24:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated to add notes

Browse Source
This commit is contained in:
Jeremy Long
2017-02-26 07:50:35 -05:00
parent 59e29b7afe
commit e0d5651b75
2 changed files with 51 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dependency-check-core/src/main/resources/templates/HtmlReport.vsl
View File

@@ -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 ##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> &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 #end
#if ($id.description) #if ($id.description || $id.notes)
<br/>$enc.html($id.description) <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 #end
</li> </li>
#end #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))) <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) #if ($vuln.cwe)
<br/>CWE: $vuln.cwe <br/>CWE: $vuln.cwe
#end
#if ($vuln.notes)
<br/>Notes: $enc.xml($vuln.notes)
#end</p> #end</p>
<p>$enc.html($vuln.description) <p>$enc.html($vuln.description)
#if ($vuln.getReferences().size()>0) #if ($vuln.getReferences().size()>0)
<ul> <ul>
#foreach($ref in $vuln.getReferences(true)) #foreach($ref in $vuln.getReferences(true))
<li>$enc.html($ref.source) - <a target="_blank" href="$enc.html($ref.url)">$ref.name</a></li> <li>$enc.html($ref.source) - <a target="_blank" href="$enc.html($ref.url)">$ref.name</a></li>
#end
</ul>
#end #end
</ul>
#end
</p> </p>
#if ($vuln.getVulnerableSoftware().size()<2) #if ($vuln.getVulnerableSoftware().size()<2)
@@ -947,8 +957,15 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
#if ($id.confidence) #if ($id.confidence)
&nbsp;&nbsp;<i>Confidence</i>:$id.confidence &nbsp;&nbsp;<i>Confidence</i>:$id.confidence
#end #end
#if ($id.description) #if ($id.description || $id.notes)
<br/>$enc.html($id.description) <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 #end
</li> </li>
#end #end
@@ -973,6 +990,9 @@ Getting Help: <a href="https://groups.google.com/forum/#!forum/dependency-check"
<br/>CVSS Score: $vuln.cvssScore <br/>CVSS Score: $vuln.cvssScore
#if ($vuln.cwe) #if ($vuln.cwe)
<br/>CWE: $vuln.cwe <br/>CWE: $vuln.cwe
#end
#if ($vuln.notes)
<br/>Notes: $enc.xml($vuln.notes)
#end</p> #end</p>
<p>$enc.html($vuln.description) <p>$enc.html($vuln.description)
#if ($vuln.getReferences().size()>0) #if ($vuln.getReferences().size()>0)

22
dependency-check-core/src/main/resources/templates/XmlReport.vsl
View File

@@ -19,7 +19,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
@version 1.2 @version 1.2
*#<?xml version="1.0"?> *#<?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> <scanInfo>
<engineVersion>$version</engineVersion> <engineVersion>$version</engineVersion>
#foreach($prop in $properties.getMetaData().entrySet()) #foreach($prop in $properties.getMetaData().entrySet())
@@ -60,6 +60,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
<name>($id.value)</name> <name>($id.value)</name>
#if( $id.url ) #if( $id.url )
<url>$enc.xml($id.url)</url> <url>$enc.xml($id.url)</url>
#end
#if ($id.notes)
<notes>$enc.xml($id.notes)</notes>
#end #end
</identifier> </identifier>
#end #end
@@ -101,6 +104,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
#end #end
#if( $id.description ) #if( $id.description )
<description>$enc.xml($id.description)</description> <description>$enc.xml($id.description)</description>
#end
#if ($id.notes)
<notes>$enc.xml($id.notes)</notes>
#end #end
</identifier> </identifier>
#end #end
@@ -112,6 +118,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
#end #end
#if( $id.description ) #if( $id.description )
<description>$enc.xml($id.description)</description> <description>$enc.xml($id.description)</description>
#end
#if ($id.notes)
<notes>$enc.xml($id.notes)</notes>
#end #end
</suppressedIdentifier> </suppressedIdentifier>
#end #end
@@ -140,6 +149,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
<cwe>$enc.xml($vuln.cwe)</cwe> <cwe>$enc.xml($vuln.cwe)</cwe>
#end #end
<description>$enc.xml($vuln.description)</description> <description>$enc.xml($vuln.description)</description>
#if ($vuln.notes)
<notes>$enc.xml($vuln.notes)</notes>
#end
<references> <references>
#foreach($ref in $vuln.getReferences()) #foreach($ref in $vuln.getReferences())
<reference> <reference>
@@ -160,6 +172,12 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
<suppressedVulnerability> <suppressedVulnerability>
<name>$enc.xml($vuln.name)</name> <name>$enc.xml($vuln.name)</name>
<cvssScore>$vuln.cvssScore</cvssScore> <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) #if ($vuln.cvssScore<4.0)
<severity>Low</severity> <severity>Low</severity>
#elseif ($vuln.cvssScore>=7.0) #elseif ($vuln.cvssScore>=7.0)
@@ -171,7 +189,9 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
<cwe>$enc.xml($vuln.cwe)</cwe> <cwe>$enc.xml($vuln.cwe)</cwe>
#end #end
<description>$enc.xml($vuln.description)</description> <description>$enc.xml($vuln.description)</description>
#if ($vuln.notes)
<notes>$enc.xml($vuln.notes)</notes> <notes>$enc.xml($vuln.notes)</notes>
#end
<references> <references>
#foreach($ref in $vuln.getReferences()) #foreach($ref in $vuln.getReferences())
<reference> <reference>