summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2019-02-15 11:25:34 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2019-02-15 11:25:34 +0000
commit88c3358be22923c9e302383d8a3ac8fd2b957d45 (patch)
tree0e507d1a80a1d9c27cc6a970de79f22bc1c72571
parent83a760c5924831216a5153696cb1ae5e11984581 (diff)
parent76dec7001574eec5826b2a2b6ef4bf05af5af3d6 (diff)
downloadgitlab-ce-88c3358be22923c9e302383d8a3ac8fd2b957d45.tar.gz
Merge branch '9251-skip_whitelisted_vulnerabilities-ce' into 'master'
Backport fixtures update for Container Scanning See merge request gitlab-org/gitlab-ce!25183
-rw-r--r--spec/fixtures/security-reports/master/gl-container-scanning-report.json23
1 files changed, 18 insertions, 5 deletions
diff --git a/spec/fixtures/security-reports/master/gl-container-scanning-report.json b/spec/fixtures/security-reports/master/gl-container-scanning-report.json
index 68c6099836b..03dfc647162 100644
--- a/spec/fixtures/security-reports/master/gl-container-scanning-report.json
+++ b/spec/fixtures/security-reports/master/gl-container-scanning-report.json
@@ -1,11 +1,14 @@
{
"image": "registry.gitlab.com/groulot/container-scanning-test/master:5f21de6956aee99ddb68ae49498662d9872f50ff",
"unapproved": [
- "CVE-2017-18018",
- "CVE-2016-2781",
- "CVE-2017-12424",
- "CVE-2007-5686",
- "CVE-2013-4235"
+ "CVE-2017-18269",
+ "CVE-2017-16997",
+ "CVE-2018-1000001",
+ "CVE-2016-10228",
+ "CVE-2018-18520",
+ "CVE-2010-4052",
+ "CVE-2018-16869",
+ "CVE-2018-18311"
],
"vulnerabilities": [
{
@@ -87,6 +90,16 @@
"link": "https://security-tracker.debian.org/tracker/CVE-2018-18311",
"severity": "Unknown",
"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"
}
]
}