Commit 144ab22b authored by Olivier Gonzalez's avatar Olivier Gonzalez Committed by Kamil Trzciński

Skip whitelisted vulnerabilities in Container Scanning

Update fixture to provide meaningful data.
parent 9d95687e
---
title: Skip whitelisted vulnerabilities in Container Scanning reports
merge_request: 9528
author:
type: fixed
...@@ -26,9 +26,13 @@ module Gitlab ...@@ -26,9 +26,13 @@ module Gitlab
# Transforms the Clair JSON report into the expected format # Transforms the Clair JSON report into the expected format
def format_report(data) def format_report(data)
vulnerabilities = data['vulnerabilities'] vulnerabilities = data['vulnerabilities']
unapproved = data['unapproved']
results = [] results = []
vulnerabilities.each do |vulnerability| vulnerabilities.each do |vulnerability|
# We only report unapproved vulnerabilities
next unless unapproved.include?(vulnerability['vulnerability'])
results.append(format_vulnerability(vulnerability)) results.append(format_vulnerability(vulnerability))
end end
......
...@@ -25,7 +25,7 @@ describe Gitlab::Ci::Parsers::Security::ContainerScanning do ...@@ -25,7 +25,7 @@ describe Gitlab::Ci::Parsers::Security::ContainerScanning do
end end
end end
it "parses all identifiers and occurrences" do it "parses all identifiers and occurrences for unapproved vulnerabilities" do
expect(report.occurrences.length).to eq(8) expect(report.occurrences.length).to eq(8)
expect(report.identifiers.length).to eq(8) expect(report.identifiers.length).to eq(8)
expect(report.scanners.length).to eq(1) expect(report.scanners.length).to eq(1)
......
{ {
"image": "registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff", "image": "registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff",
"unapproved": [ "unapproved": [
"CVE-2017-18018", "CVE-2017-18269",
"CVE-2016-2781", "CVE-2017-16997",
"CVE-2017-12424", "CVE-2018-1000001",
"CVE-2007-5686", "CVE-2016-10228",
"CVE-2013-4235" "CVE-2018-18520",
"CVE-2010-4052",
"CVE-2018-16869",
"CVE-2018-18311"
], ],
"vulnerabilities": [ "vulnerabilities": [
{ {
...@@ -87,6 +90,16 @@ ...@@ -87,6 +90,16 @@
"link": "https://security-tracker.debian.org/tracker/CVE-2018-18311", "link": "https://security-tracker.debian.org/tracker/CVE-2018-18311",
"severity": "Unknown", "severity": "Unknown",
"fixedby": "5.24.1-3+deb9u5" "fixedby": "5.24.1-3+deb9u5"
},
{
"featurename": "foo",
"featureversion": "1.3",
"vulnerability": "CVE-2018-666",
"namespace": "debian:9",
"description": "Foo has a vulnerability nobody cares about and whitelist.",
"link": "https://security-tracker.debian.org/tracker/CVE-2018-666",
"severity": "Unknown",
"fixedby": "1.4"
} }
] ]
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment