updated to use displayFileName field instead of FileName when writing information about dependencies

Former-commit-id: bd3383ac4831bc44db6b63083e47802cce04b520
This commit is contained in:
Jeremy Long
2014-05-10 06:58:51 -04:00
parent d125a7f09d
commit 1485733715
3 changed files with 9 additions and 9 deletions

View File

@@ -532,11 +532,11 @@ arising out of or in connection with the use of this tool, the analysis performe
#foreach($dependency in $dependencies) #foreach($dependency in $dependencies)
#set($lnkcnt=$lnkcnt+1) #set($lnkcnt=$lnkcnt+1)
<li class="#if($dependency.getVulnerabilities().size()==0)notvulnerable#else vulnerable#end"> <li class="#if($dependency.getVulnerabilities().size()==0)notvulnerable#else vulnerable#end">
<a href="#l${lnkcnt}_$enc.html($enc.url($dependency.Sha1sum))">$enc.html($dependency.FileName)</a> <a href="#l${lnkcnt}_$enc.html($enc.url($dependency.Sha1sum))">$enc.html($dependency.DisplayFileName)</a>
#if($dependency.getRelatedDependencies().size()>0) #if($dependency.getRelatedDependencies().size()>0)
<ul> <ul>
#foreach($related in $dependency.getRelatedDependencies()) #foreach($related in $dependency.getRelatedDependencies())
<li>$enc.html($related.FileName)</li> <li>$enc.html($related.DisplayFileName)</li>
#end #end
</ul> </ul>
#end #end
@@ -549,7 +549,7 @@ arising out of or in connection with the use of this tool, the analysis performe
#set($vsctr=0) ##counter to create unique groups for vulnerable software #set($vsctr=0) ##counter to create unique groups for vulnerable software
#foreach($dependency in $dependencies) #foreach($dependency in $dependencies)
#set($lnkcnt=$lnkcnt+1) #set($lnkcnt=$lnkcnt+1)
<h3 class="subsectionheader standardsubsection#if($dependency.getVulnerabilities().size()==0) notvulnerable#end"><a name="l${lnkcnt}_$enc.html($dependency.Sha1sum)"></a>$enc.html($dependency.FileName)</h3> <h3 class="subsectionheader standardsubsection#if($dependency.getVulnerabilities().size()==0) notvulnerable#end"><a name="l${lnkcnt}_$enc.html($dependency.Sha1sum)"></a>$enc.html($dependency.DisplayFileName)</h3>
<div class="subsectioncontent#if($dependency.getVulnerabilities().size()==0) notvulnerable#end"> <div class="subsectioncontent#if($dependency.getVulnerabilities().size()==0) notvulnerable#end">
#if ($dependency.description) #if ($dependency.description)
<p><b>Description:</b>&nbsp;$enc.html($dependency.description)<br/></p> <p><b>Description:</b>&nbsp;$enc.html($dependency.description)<br/></p>
@@ -582,7 +582,7 @@ arising out of or in connection with the use of this tool, the analysis performe
<div id="content$cnt" class="subsectioncontent standardsubsection hidden"> <div id="content$cnt" class="subsectioncontent standardsubsection hidden">
<ul> <ul>
#foreach($related in $dependency.getRelatedDependencies()) #foreach($related in $dependency.getRelatedDependencies())
<li>$enc.html($related.FileName) <li>$enc.html($related.DisplayFileName)
<ul> <ul>
<li>File Path:&nbsp;$enc.html($related.FilePath)</li> <li>File Path:&nbsp;$enc.html($related.FilePath)</li>
<li>SHA1:&nbsp;$enc.html($related.Sha1sum)</li> <li>SHA1:&nbsp;$enc.html($related.Sha1sum)</li>
@@ -699,7 +699,7 @@ arising out of or in connection with the use of this tool, the analysis performe
#foreach($dependency in $dependencies) #foreach($dependency in $dependencies)
#if ($dependency.getSuppressedIdentifiers().size()>0 || $dependency.getSuppressedVulnerabilities().size()>0) #if ($dependency.getSuppressedIdentifiers().size()>0 || $dependency.getSuppressedVulnerabilities().size()>0)
#set($lnkcnt=$lnkcnt+1) #set($lnkcnt=$lnkcnt+1)
<h3 class="subsectionheader standardsubsection">$enc.html($dependency.FileName)</h3> <h3 class="subsectionheader standardsubsection">$enc.html($dependency.DisplayFileName)</h3>
<div class="subsectioncontent"> <div class="subsectioncontent">
#if ($dependency.description) #if ($dependency.description)
<p><b>Description:</b>&nbsp;$enc.html($dependency.description)<br/></p> <p><b>Description:</b>&nbsp;$enc.html($dependency.description)<br/></p>
@@ -732,7 +732,7 @@ arising out of or in connection with the use of this tool, the analysis performe
<div id="content$cnt" class="subsectioncontent standardsubsection hidden"> <div id="content$cnt" class="subsectioncontent standardsubsection hidden">
<ul> <ul>
#foreach($related in $dependency.getRelatedDependencies()) #foreach($related in $dependency.getRelatedDependencies())
<li>$enc.html($related.FileName) <li>$enc.html($related.DisplayFileName)
<ul> <ul>
<li>File Path:&nbsp;$enc.html($related.FilePath)</li> <li>File Path:&nbsp;$enc.html($related.FilePath)</li>
<li>SHA1:&nbsp;$enc.html($related.Sha1sum)</li> <li>SHA1:&nbsp;$enc.html($related.Sha1sum)</li>

View File

@@ -222,10 +222,10 @@ arising out of or in connection with the use of this tool, the analysis performe
($vuln.cvssScore) ($vuln.cvssScore)
<td>#set($cnt=$cnt+1) <td>#set($cnt=$cnt+1)
#if($dependency.getRelatedDependencies().size()>0)<span id="header$cnt" class="expandable collapsedList">#end #if($dependency.getRelatedDependencies().size()>0)<span id="header$cnt" class="expandable collapsedList">#end
$enc.html($dependency.FileName) $enc.html($dependency.DisplayFileName)
#if($dependency.getRelatedDependencies().size()>0)&nbsp;&nbsp;&nbsp;</span><div id="content$cnt" class="hidden">#end #if($dependency.getRelatedDependencies().size()>0)&nbsp;&nbsp;&nbsp;</span><div id="content$cnt" class="hidden">#end
#foreach($related in $dependency.getRelatedDependencies()) #foreach($related in $dependency.getRelatedDependencies())
$enc.html($related.FileName)<br/> $enc.html($related.DisplayFileName)<br/>
#end #end
#if($dependency.getRelatedDependencies().size()>0)</div#end #if($dependency.getRelatedDependencies().size()>0)</div#end
</td> </td>

View File

@@ -36,7 +36,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved.
<dependencies> <dependencies>
#foreach($dependency in $dependencies) #foreach($dependency in $dependencies)
<dependency> <dependency>
<fileName>$enc.xml($dependency.FileName)</fileName> <fileName>$enc.xml($dependency.DisplayFileName)</fileName>
<filePath>$enc.xml($dependency.FilePath)</filePath> <filePath>$enc.xml($dependency.FilePath)</filePath>
<md5>$enc.xml($dependency.Md5sum)</md5> <md5>$enc.xml($dependency.Md5sum)</md5>
<sha1>$enc.xml($dependency.Sha1sum)</sha1> <sha1>$enc.xml($dependency.Sha1sum)</sha1>