arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #646 from KeyboardNerd/spkg/model

Browse Source
This commit is contained in:
Sida Chen 2018-10-18 16:44:48 -04:00 committed by GitHub
commit 335cb65917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 71 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
database/affected_feature_type.go Normal file
View File

@ -0,0 +1,26 @@
// Copyright 2018 clair authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package database
// AffectedFeatureType indicates the type of feature that a vulnerability
// affects.
type AffectedFeatureType string
const (
// AffectSourcePackage indicates the vulnerability affects a source package.
AffectSourcePackage AffectedFeatureType = "source"
// AffectBinaryPackage indicates the vulnerability affects a binary package.
AffectBinaryPackage AffectedFeatureType = "binary"
)

8
database/models.go
View File

@ -199,8 +199,10 @@ type VulnerabilityWithFixedIn struct {
// by a Vulnerability. Namespace and Feature Name is unique. Affected Feature is
// bound to vulnerability.
type AffectedFeature struct {
Namespace Namespace
FeatureName string
// AffectedType determines which type of package it affects.
AffectedType AffectedFeatureType
Namespace Namespace
FeatureName string
// FixedInVersion is known next feature version that's not affected by the
// vulnerability. Empty FixedInVersion means the unaffected version is
// unknown.
@ -229,7 +231,7 @@ type Vulnerability struct {
Metadata MetadataMap
}
// VulnerabilityWithAffected is an vulnerability with all known affected
// VulnerabilityWithAffected is a vulnerability with all known affected
// features.
type VulnerabilityWithAffected struct {
Vulnerability

4
ext/vulnsrc/alpine/alpine.go
View File

@ -37,6 +37,9 @@ const (
secdbGitURL = "https://github.com/alpinelinux/alpine-secdb"
updaterFlag = "alpine-secdbUpdater"
nvdURLPrefix = "https://cve.mitre.org/cgi-bin/cvename.cgi?name="
// affected type indicates if the affected feature hint is for binary or
// source package.
affectedType = database.AffectBinaryPackage
)
func init() {
@ -226,6 +229,7 @@ func parseYAML(r io.Reader) (vulns []database.VulnerabilityWithAffected, err err
}
vuln.Affected = []database.AffectedFeature{
{
AffectedType: affectedType,
FeatureName: pkg.Name,
AffectedVersion: version,
FixedInVersion: fixedInVersion,

2
ext/vulnsrc/debian/debian.go
View File

@ -38,6 +38,7 @@ const (
url = "https://security-tracker.debian.org/tracker/data/json"
cveURLPrefix = "https://security-tracker.debian.org/tracker"
updaterFlag = "debianUpdater"
affectedType = database.AffectSourcePackage
)
type jsonData map[string]map[string]jsonVuln
@ -227,6 +228,7 @@ func parseDebianJSON(data *jsonData) (vulnerabilities []database.VulnerabilityWi
// Create and add the feature version.
pkg := database.AffectedFeature{
AffectedType: affectedType,
FeatureName: pkgName,
AffectedVersion: version,
FixedInVersion: fixedInVersion,

5
ext/vulnsrc/debian/debian_test.go
View File

@ -41,6 +41,7 @@ func TestDebianParser(t *testing.T) {
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "debian:8",
VersionFormat: dpkg.ParserName,
@ -49,6 +50,7 @@ func TestDebianParser(t *testing.T) {
AffectedVersion: versionfmt.MaxVersion,
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "debian:unstable",
VersionFormat: dpkg.ParserName,
@ -69,6 +71,7 @@ func TestDebianParser(t *testing.T) {
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "debian:8",
VersionFormat: dpkg.ParserName,
@ -78,6 +81,7 @@ func TestDebianParser(t *testing.T) {
AffectedVersion: "0.7.0",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "debian:unstable",
VersionFormat: dpkg.ParserName,
@ -87,6 +91,7 @@ func TestDebianParser(t *testing.T) {
AffectedVersion: "0.7.0",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "debian:8",
VersionFormat: dpkg.ParserName,

2
ext/vulnsrc/oracle/oracle.go
View File

@ -41,6 +41,7 @@ const (
ovalURI = "https://linux.oracle.com/oval/"
elsaFilePrefix = "com.oracle.elsa-"
updaterFlag = "oracleUpdater"
affectedType = database.AffectBinaryPackage
)
var (
@ -345,6 +346,7 @@ func toFeatures(criteria criteria) []database.AffectedFeature {
} else if strings.Contains(c.Comment, " is earlier than ") {
const prefixLen = len(" is earlier than ")
featureVersion.FeatureName = strings.TrimSpace(c.Comment[:strings.Index(c.Comment, " is earlier than ")])
featureVersion.AffectedType = affectedType
version := c.Comment[strings.Index(c.Comment, " is earlier than ")+prefixLen:]
err := versionfmt.Valid(rpm.ParserName, version)
if err != nil {

5
ext/vulnsrc/oracle/oracle_test.go
View File

@ -42,6 +42,7 @@ func TestOracleParser(t *testing.T) {
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "oracle:7",
VersionFormat: rpm.ParserName,
@ -51,6 +52,7 @@ func TestOracleParser(t *testing.T) {
AffectedVersion: "0:3.1.1-7.el7_1",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "oracle:7",
VersionFormat: rpm.ParserName,
@ -60,6 +62,7 @@ func TestOracleParser(t *testing.T) {
AffectedVersion: "0:3.1.1-7.el7_1",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "oracle:7",
VersionFormat: rpm.ParserName,
@ -86,6 +89,7 @@ func TestOracleParser(t *testing.T) {
assert.Equal(t, ` [38.1.0-1.0.1.el7_1] - Add firefox-oracle-default-prefs.js and remove the corresponding Red Hat file [38.1.0-1] - Update to 38.1.0 ESR [38.0.1-2] - Fixed rhbz#1222807 by removing preun section `, vulnerabilities[0].Description)
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "oracle:6",
VersionFormat: rpm.ParserName,
@ -95,6 +99,7 @@ func TestOracleParser(t *testing.T) {
AffectedVersion: "0:38.1.0-1.0.1.el6_6",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "oracle:7",
VersionFormat: rpm.ParserName,

2
ext/vulnsrc/rhel/rhel.go
View File

@ -43,6 +43,7 @@ const (
ovalURI = "https://www.redhat.com/security/data/oval/"
rhsaFilePrefix = "com.redhat.rhsa-"
updaterFlag = "rhelUpdater"
affectedType = database.AffectBinaryPackage
)
var (
@ -341,6 +342,7 @@ func toFeatures(criteria criteria) []database.AffectedFeature {
} else if strings.Contains(c.Comment, " is earlier than ") {
const prefixLen = len(" is earlier than ")
featureVersion.FeatureName = strings.TrimSpace(c.Comment[:strings.Index(c.Comment, " is earlier than ")])
featureVersion.AffectedType = affectedType
version := c.Comment[strings.Index(c.Comment, " is earlier than ")+prefixLen:]
err := versionfmt.Valid(rpm.ParserName, version)
if err != nil {

5
ext/vulnsrc/rhel/rhel_test.go
View File

@ -46,6 +46,7 @@ func TestRHELParserMultipleCVE(t *testing.T) {
database.MediumSeverity, database.MediumSeverity}
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "centos:6",
VersionFormat: rpm.ParserName,
@ -55,6 +56,7 @@ func TestRHELParserMultipleCVE(t *testing.T) {
AffectedVersion: "0:38.1.0-1.el6_6",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "centos:7",
VersionFormat: rpm.ParserName,
@ -94,6 +96,7 @@ func TestRHELParserOneCVE(t *testing.T) {
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "centos:7",
VersionFormat: rpm.ParserName,
@ -103,6 +106,7 @@ func TestRHELParserOneCVE(t *testing.T) {
FixedInVersion: "0:3.1.1-7.el7_1",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "centos:7",
VersionFormat: rpm.ParserName,
@ -112,6 +116,7 @@ func TestRHELParserOneCVE(t *testing.T) {
FixedInVersion: "0:3.1.1-7.el7_1",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "centos:7",
VersionFormat: rpm.ParserName,

8
ext/vulnsrc/ubuntu/ubuntu.go
View File

@ -35,9 +35,10 @@ import (
)
const (
trackerURI = "https://git.launchpad.net/ubuntu-cve-tracker"
updaterFlag = "ubuntuUpdater"
cveURL = "http://people.ubuntu.com/~ubuntu-security/cve/%s"
trackerURI = "https://git.launchpad.net/ubuntu-cve-tracker"
updaterFlag = "ubuntuUpdater"
cveURL = "http://people.ubuntu.com/~ubuntu-security/cve/%s"
affectedType = database.AffectSourcePackage
)
var (
@ -334,6 +335,7 @@ func parseUbuntuCVE(fileContent io.Reader) (vulnerability database.Vulnerability
// Create and add the new package.
featureVersion := database.AffectedFeature{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: releaseName,
VersionFormat: dpkg.ParserName,

3
ext/vulnsrc/ubuntu/ubuntu_test.go
View File

@ -46,6 +46,7 @@ func TestUbuntuParser(t *testing.T) {
expectedFeatures := []database.AffectedFeature{
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "ubuntu:14.04",
VersionFormat: dpkg.ParserName,
@ -54,6 +55,7 @@ func TestUbuntuParser(t *testing.T) {
AffectedVersion: versionfmt.MaxVersion,
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "ubuntu:15.04",
VersionFormat: dpkg.ParserName,
@ -63,6 +65,7 @@ func TestUbuntuParser(t *testing.T) {
AffectedVersion: "0.4-3",
},
{
AffectedType: affectedType,
Namespace: database.Namespace{
Name: "ubuntu:15.10",
VersionFormat: dpkg.ParserName,

2
updater.go
View File

@ -425,7 +425,7 @@ func doVulnerabilitiesNamespacing(vulnerabilities []database.VulnerabilityWithAf
for _, fv := range namespacedFeatures {
// validate vulnerabilities, throw out the invalid vulnerabilities
if fv.AffectedVersion == "" || fv.FeatureName == "" || fv.Namespace.Name == "" || fv.Namespace.VersionFormat == "" {
if fv.AffectedType == "" || fv.AffectedVersion == "" || fv.FeatureName == "" || fv.Namespace.Name == "" || fv.Namespace.VersionFormat == "" {
log.WithFields(log.Fields{
"Name": fv.FeatureName,
"Affected Version": fv.AffectedVersion,

9
updater_test.go
View File

@ -183,6 +183,7 @@ func newmockUpdaterDatastore() *mockUpdaterDatastore {
func TestDoVulnerabilitiesNamespacing(t *testing.T) {
fv1 := database.AffectedFeature{
AffectedType: database.AffectSourcePackage,
Namespace: database.Namespace{Name: "Namespace1"},
FeatureName: "Feature1",
FixedInVersion: "0.1",
@ -190,6 +191,7 @@ func TestDoVulnerabilitiesNamespacing(t *testing.T) {
}
fv2 := database.AffectedFeature{
AffectedType: database.AffectSourcePackage,
Namespace: database.Namespace{Name: "Namespace2"},
FeatureName: "Feature1",
FixedInVersion: "0.2",
@ -197,7 +199,7 @@ func TestDoVulnerabilitiesNamespacing(t *testing.T) {
}
fv3 := database.AffectedFeature{
AffectedType: database.AffectSourcePackage,
Namespace: database.Namespace{Name: "Namespace2"},
FeatureName: "Feature2",
FixedInVersion: "0.3",
@ -235,8 +237,9 @@ func TestCreatVulnerabilityNotification(t *testing.T) {
VersionFormat: vf1,
}
af1 := database.AffectedFeature{
Namespace: ns1,
FeatureName: "feature 1",
AffectedType: database.AffectSourcePackage,
Namespace: ns1,
FeatureName: "feature 1",
}
v1 := database.VulnerabilityWithAffected{