github-mirrors/odc-analyzer
1
0
Fork 0
mirror of https://github.com/ysoftdevs/odc-analyzer.git synced 2026-04-10 19:07:00 +02:00
Code Issues 2 Packages Projects Releases Wiki Activity

Added suppressed vulnerabilities to statistics

Browse Source
This commit is contained in:
Šesták Vít
2016-12-19 12:56:14 +01:00
parent 307155129c
commit 0ef9636148
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/com/ysoft/odc/OdcParser.scala
View File

@@ -83,6 +83,7 @@ final case class GroupedDependency(dependencies: Map[Dependency, Set[ReportInfo]
def mavenIdentifiers = identifiers.filter(_.identifierType == "maven") def mavenIdentifiers = identifiers.filter(_.identifierType == "maven")
def cpeIdentifiers = identifiers.filter(_.identifierType == "cpe") def cpeIdentifiers = identifiers.filter(_.identifierType == "cpe")
def vulnerabilities: Set[Vulnerability] = dependencies.keySet.flatMap(_.vulnerabilities) def vulnerabilities: Set[Vulnerability] = dependencies.keySet.flatMap(_.vulnerabilities)
def suppressedVulnerabilities: Set[Vulnerability] = dependencies.keySet.flatMap(_.suppressedVulnerabilities)
def plainLibraryIdentifiers: Set[PlainLibraryIdentifier] = identifiers.flatMap(_.toLibraryIdentifierOption) def plainLibraryIdentifiers: Set[PlainLibraryIdentifier] = identifiers.flatMap(_.toLibraryIdentifierOption)
def hasCpe: Boolean = cpeIdentifiers.nonEmpty def hasCpe: Boolean = cpeIdentifiers.nonEmpty
} }

1
app/controllers/DependencyCheckReportsParser.scala
View File

@@ -123,6 +123,7 @@ object DependencyCheckReportsParser{
lazy val groupedDependenciesByPlainLibraryIdentifier: Map[PlainLibraryIdentifier, Set[GroupedDependency]] = lazy val groupedDependenciesByPlainLibraryIdentifier: Map[PlainLibraryIdentifier, Set[GroupedDependency]] =
groupedDependencies.toSet.flatMap((grDep: GroupedDependency) => grDep.plainLibraryIdentifiers.map(_ -> grDep)).groupBy(_._1).mapValues(_.map(_._2)).map(identity) groupedDependencies.toSet.flatMap((grDep: GroupedDependency) => grDep.plainLibraryIdentifiers.map(_ -> grDep)).groupBy(_._1).mapValues(_.map(_._2)).map(identity)
lazy val vulnerableDependencies = groupedDependencies.filter(_.vulnerabilities.nonEmpty) lazy val vulnerableDependencies = groupedDependencies.filter(_.vulnerabilities.nonEmpty)
lazy val suppressedOnlyDependencies = groupedDependencies.filter(gd => gd.vulnerabilities.isEmpty && gd.suppressedIdentifiers.nonEmpty)
private val ProjectSelectorPattern = """^project:(.*)$""".r private val ProjectSelectorPattern = """^project:(.*)$""".r
private val TeamSelectorPattern = """^team:(.*)$""".r private val TeamSelectorPattern = """^team:(.*)$""".r

1
app/controllers/Statistics.scala
View File

@@ -202,6 +202,7 @@ class Statistics @Inject() (
Future.successful(Ok(views.html.statistics.vulnerableLibraries( Future.successful(Ok(views.html.statistics.vulnerableLibraries(
projectsWithSelection = selection.projectsWithSelection, projectsWithSelection = selection.projectsWithSelection,
vulnerableDependencies = reports.vulnerableDependencies, vulnerableDependencies = reports.vulnerableDependencies,
dependenciesWithSuppressedVulnerabilitiesOnlyCount = reports.suppressedOnlyDependencies.size,
allDependenciesCount = reports.groupedDependencies.size, allDependenciesCount = reports.groupedDependencies.size,
reports = reports reports = reports
))) )))

7
app/views/statistics/vulnerableLibraries.scala.html
View File

@@ -2,6 +2,7 @@
projectsWithSelection: ProjectsWithSelection, projectsWithSelection: ProjectsWithSelection,
vulnerableDependencies: Seq[GroupedDependency], vulnerableDependencies: Seq[GroupedDependency],
allDependenciesCount: Int, allDependenciesCount: Int,
dependenciesWithSuppressedVulnerabilitiesOnlyCount: Int,
reports: DependencyCheckReportsParser.Result reports: DependencyCheckReportsParser.Result
)(implicit header: DefaultRequest) )(implicit header: DefaultRequest)
@@ -17,7 +18,9 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
var data = [ var data = [
['Vulnerable', (@(vulnerableDependencies.size))], ['No known vulnerability', (@(allDependenciesCount - vulnerableDependencies.size))] ['Vulnerable', (@(vulnerableDependencies.size))],
['Suppressed vulnerabilities only', (@(dependenciesWithSuppressedVulnerabilitiesOnlyCount))],
['No known vulnerability', (@(allDependenciesCount - vulnerableDependencies.size - dependenciesWithSuppressedVulnerabilitiesOnlyCount))]
]; ];
var plot1 = jQuery.jqplot ('vulnerable-dependencies-chart', [data], { var plot1 = jQuery.jqplot ('vulnerable-dependencies-chart', [data], {
seriesDefaults: { seriesDefaults: {
@@ -29,7 +32,7 @@ $(document).ready(function(){
showDataLabels: true, showDataLabels: true,
dataLabels: 'value', dataLabels: 'value',
startAngle: -90, startAngle: -90,
seriesColors: ['red', 'green'], seriesColors: ['red', 'yellow', 'green'],
legendOptions: { legendOptions: {
textColor: 'white' textColor: 'white'
} }