updated report to support changes in PR #714

This commit is contained in:
Jeremy Long
2017-06-04 20:51:27 -04:00
parent 52b2b4794e
commit 66dbcb98d2

View File

@@ -17,7 +17,10 @@
#if($artifactID)"artifactID":"$enc.json($artifactID)",#end #if($artifactID)"artifactID":"$enc.json($artifactID)",#end
#if($version)"version":"$enc.json($version)",#end #if($version)"version":"$enc.json($version)",#end
"reportDate": "$scanDateXML", "reportDate": "$scanDateXML",
"credits": "This report contains data retrieved from the National Vulnerability Database: http://nvd.nist.gov" "credits": {
"NVD": "This report contains data retrieved from the National Vulnerability Database: http://nvd.nist.gov",
"NSP": "This report may contain data retrieved from the Node Security Platform: https://nodesecurity.io"
}
}, },
"dependencies": [ "dependencies": [
#foreach($dependency in $dependencies)#if($foreach.count > 1),#end{ #foreach($dependency in $dependencies)#if($foreach.count > 1),#end{
@@ -31,20 +34,24 @@
,"relatedDependencies": [ ,"relatedDependencies": [
#foreach($related in $dependency.getRelatedDependencies()) #if($foreach.count > 1),#end { #foreach($related in $dependency.getRelatedDependencies()) #if($foreach.count > 1),#end {
"filePath": "$enc.json($related.FilePath)", "filePath": "$enc.json($related.FilePath)",
"sha1": "$enc.json($related.Sha1sum)", "sha1": "#if($related.Sha1sum)$enc.json($related.Sha1sum)#end",
"md5": "$enc.json($related.Md5sum)"#if($related.getIdentifiers()),#end "md5": "#if($related.Md5sum)$enc.json($related.Md5sum)#end"#if($related.getIdentifiers()),
"identifiers": [ "identifiers": [
#foreach($id in $related.getIdentifiers()) #foreach($id in $related.getIdentifiers())
#if ($id.type=="maven") #if ($id.type=="maven")
{ {
"type": "$enc.json($id.type)", "type": "$enc.json($id.type)",
"name": "$id.value" "name": "$id.value"
#if( $id.url ),"url": "$enc.json($id.url)"#end #if ($id.url),"url": "$enc.json($id.url)"#end
#if ($id.notes),"notes": "$enc.json($id.notes)"#end #if ($id.notes),"notes": "$enc.json($id.notes)"#end
} }
#end #end
#if ($id.type=="npm")
,"id":"$enc.json($id.value)"
,"description":"$enc.json($id.description)"
#end
#end #end
] ]#end
} }
#end #end
] ]
@@ -112,12 +119,14 @@
#foreach($vuln in $dependency.getVulnerabilities())#if($foreach.count > 1),#end { #foreach($vuln in $dependency.getVulnerabilities())#if($foreach.count > 1),#end {
"name": "$enc.json($vuln.name)", "name": "$enc.json($vuln.name)",
"cvssScore": "$vuln.cvssScore", "cvssScore": "$vuln.cvssScore",
"cvssAccessVector": "$enc.json($vuln.cvssAccessVector)", #if ($vuln.getSource().name().equals("NVD"))
"cvssAccessComplexity": "$enc.json($vuln.cvssAccessComplexity)", "cvssAccessVector": "$enc.json($vuln.cvssAccessVector)",
"cvssAuthenticationr": "$enc.json($vuln.cvssAuthentication)", "cvssAccessComplexity": "$enc.json($vuln.cvssAccessComplexity)",
"cvssConfidentialImpact": "$enc.json($vuln.cvssConfidentialityImpact)", "cvssAuthenticationr": "$enc.json($vuln.cvssAuthentication)",
"cvssIntegrityImpact": "$enc.json($vuln.cvssIntegrityImpact)", "cvssConfidentialImpact": "$enc.json($vuln.cvssConfidentialityImpact)",
"cvssAvailabilityImpact": "$enc.json($vuln.cvssAvailabilityImpact)", "cvssIntegrityImpact": "$enc.json($vuln.cvssIntegrityImpact)",
"cvssAvailabilityImpact": "$enc.json($vuln.cvssAvailabilityImpact)",
#end
#if ($vuln.cvssScore<4.0)"severity": "Low", #if ($vuln.cvssScore<4.0)"severity": "Low",
#elseif ($vuln.cvssScore>=7.0)"severity": "High", #elseif ($vuln.cvssScore>=7.0)"severity": "High",
#else "severity": "Medium",#end #else "severity": "Medium",#end