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

Merge pull request #734 from jeremylong/updateJsonReport

Browse Source 
Update json report
This commit is contained in:
Jeremy Long
2017-05-20 06:06:39 -04:00
committed by GitHub
parent b6a7d0ee9b ea93f315d5
commit f584be7f44
3 changed files with 169 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
dependency-check-core/src/main/resources/templates/JsonReport.vsl
View File

@@ -1,6 +1,5 @@
{ {
"reportSchema": "1.0", "reportSchema": "1.0",
"analysis": {
"scanInfo": { "scanInfo": {
"engineVersion": "$version", "engineVersion": "$version",
"dataSource": [ "dataSource": [
@@ -110,8 +109,7 @@
] ]
#if($dependency.getVulnerabilities().size()>0 || $dependency.getSuppressedVulnerabilities().size()>0) #if($dependency.getVulnerabilities().size()>0 || $dependency.getSuppressedVulnerabilities().size()>0)
,"vulnerabilities": [ ,"vulnerabilities": [
#foreach($vuln in $dependency.getVulnerabilities()) #foreach($vuln in $dependency.getVulnerabilities())#if($foreach.count > 1),#end {
#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)", "cvssAccessVector": "$enc.json($vuln.cvssAccessVector)",
@@ -120,36 +118,29 @@
"cvssConfidentialImpact": "$enc.json($vuln.cvssConfidentialityImpact)", "cvssConfidentialImpact": "$enc.json($vuln.cvssConfidentialityImpact)",
"cvssIntegrityImpact": "$enc.json($vuln.cvssIntegrityImpact)", "cvssIntegrityImpact": "$enc.json($vuln.cvssIntegrityImpact)",
"cvssAvailabilityImpact": "$enc.json($vuln.cvssAvailabilityImpact)", "cvssAvailabilityImpact": "$enc.json($vuln.cvssAvailabilityImpact)",
#if ($vuln.cvssScore<4.0) #if ($vuln.cvssScore<4.0)"severity": "Low",
"severity": "Low", #elseif ($vuln.cvssScore>=7.0)"severity": "High",
#elseif ($vuln.cvssScore>=7.0) #else "severity": "Medium",#end
"severity": "High", "cwe": "#if ($vuln.cwe)$enc.json($vuln.cwe)#end",
#else
"severity": "Medium",
#end
#if($vuln.cwe)"cwe": "$enc.json($vuln.cwe)",#end
"description": "$enc.json($vuln.description)", "description": "$enc.json($vuln.description)",
#if ($vuln.notes)"notes": "$enc.json($vuln.notes)"#end "notes": "#if ($vuln.notes)$enc.json($vuln.notes)#end",
"references": [ "references": [
#foreach($ref in $vuln.getReferences()) #foreach($ref in $vuln.getReferences())
#if($foreach.count > 1),#end { #if($foreach.count > 1),#end {
"source": "$enc.json($ref.source)", "source": "$enc.json($ref.source)",
"url": "$enc.json($ref.url)", "url": "$enc.json($ref.url)",
"name": "$enc.json($ref.name)" "name": "$enc.json($ref.name)"
} }#end
#end
], ],
"vulnerableSoftware": [ "vulnerableSoftware": [
#foreach($vs in $vuln.getVulnerableSoftware()) #foreach($vs in $vuln.getVulnerableSoftware())
#if($foreach.count > 1),#end { #if($foreach.count > 1),#end {
#if($vs.hasPreviousVersion()) "allPreviousVersion": "true",#end
"software": "$enc.json($vs.name)" "software": "$enc.json($vs.name)"
} #if($vs.hasPreviousVersion()) ,"allPreviousVersion": "true"#end
#end
]
}#end }#end
] ]
#end }#end
]#end
#if($dependency.getSuppressedVulnerabilities().size()>0 || $dependency.getSuppressedVulnerabilities().size()>0) #if($dependency.getSuppressedVulnerabilities().size()>0 || $dependency.getSuppressedVulnerabilities().size()>0)
,"suppressedVulnerabilities": [ ,"suppressedVulnerabilities": [
@@ -166,33 +157,26 @@
#elseif ($vuln.cvssScore>=7.0) "severity": "High", #elseif ($vuln.cvssScore>=7.0) "severity": "High",
#else "severity": "Medium", #else "severity": "Medium",
#end #end
#if ($vuln.cwe)"cwe": "$enc.json($vuln.cwe)",#end "cwe": "#if ($vuln.cwe)$enc.json($vuln.cwe)#end",
"description": "$enc.json($vuln.description)" "description": "$enc.json($vuln.description)",
#if ($vuln.notes),"notes": "$enc.json($vuln.notes)"#end "notes": "#if ($vuln.notes)$enc.json($vuln.notes)#end",
,"references": [ "references": [
#foreach($ref in $vuln.getReferences()) #foreach($ref in $vuln.getReferences())
#if($foreach.count > 1),#end { #if($foreach.count > 1),#end {
"source": "$enc.json($ref.source)", "source": "$enc.json($ref.source)",
"url": "$enc.json($ref.url)", "url": "$enc.json($ref.url)",
"name": "$enc.json($ref.name)" "name": "$enc.json($ref.name)"
} }#end
#end
], ],
"vulnerableSoftware": [ "vulnerableSoftware": [
#foreach($vs in $vuln.getVulnerableSoftware()) #foreach($vs in $vuln.getVulnerableSoftware())
#if($foreach.count > 1),#end { #if($foreach.count > 1),#end {
#if($vs.hasPreviousVersion()) "allPreviousVersion": "true",#end
"name": "$enc.json($vs.name)" "name": "$enc.json($vs.name)"
} #if($vs.hasPreviousVersion()) ,"allPreviousVersion": "true"#end
#end }#end
]
}#end
]#end
}#end
] ]
} }
#end
]
#end
}
#end
]
}
}

4
dependency-check-maven/src/it/729-system-scope-resolved/postbuild.groovy
View File

@@ -25,6 +25,6 @@ def slurper = new JsonSlurper()
def json = slurper.parse(new File(basedir, "target/dependency-check-report.json"), "UTF-8") def json = slurper.parse(new File(basedir, "target/dependency-check-report.json"), "UTF-8")
assert json instanceof Map assert json instanceof Map
assert json.analysis.dependencies instanceof List assert json.dependencies instanceof List
assert json.analysis.dependencies.size()==1 assert json.dependencies.size()==1
return true; return true;

4
dependency-check-maven/src/it/729-system-scope-skipped/postbuild.groovy
View File

@@ -25,6 +25,6 @@ def slurper = new JsonSlurper()
def json = slurper.parse(new File(basedir, "target/dependency-check-report.json"), "UTF-8") def json = slurper.parse(new File(basedir, "target/dependency-check-report.json"), "UTF-8")
assert json instanceof Map assert json instanceof Map
assert json.analysis.dependencies instanceof List assert json.dependencies instanceof List
assert json.analysis.dependencies.size()==0 assert json.dependencies.size()==0
return true; return true;