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

Merge pull request #362 from jzelinskie/malformedpkg

Browse Source 
Handle Parsing of Malformed Packages
This commit is contained in:
Jimmy Zelinskie 2017-04-11 22:31:40 -04:00 committed by GitHub
commit b5f4e0f3a3
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/featurefmt/apk/apk.go
View File

@ -66,6 +66,10 @@ func (l lister) ListFeatures(files tarutil.FilesMap) ([]database.FeatureVersion,
} else { } else {
ipkg.Version = version ipkg.Version = version
} }
case line == "":
// Restart if the parser reaches another package definition before
// creating a valid package.
ipkg = database.FeatureVersion{}
} }
// If we have a whole feature, store it in the set and try to parse a new // If we have a whole feature, store it in the set and try to parse a new

2
ext/featurefmt/apk/testdata/installed vendored
View File

@ -20,6 +20,8 @@ R:ld-musl-x86_64.so.1
a:0:0:755 a:0:0:755
Z:Q1KUwsFGLHn/enpN9+QIpK/FmixtQ= Z:Q1KUwsFGLHn/enpN9+QIpK/FmixtQ=
P:invalidPackageWithoutAVersion
C:Q1yhJHGSZ80L7cL0y4UKKGrBPwrUQ= C:Q1yhJHGSZ80L7cL0y4UKKGrBPwrUQ=
P:busybox P:busybox
V:1.24.2-r9 V:1.24.2-r9

3
ext/featurefmt/dpkg/dpkg.go
View File

@ -97,6 +97,9 @@ func (l lister) ListFeatures(files tarutil.FilesMap) ([]database.FeatureVersion,
} else { } else {
pkg.Version = version pkg.Version = version
} }
} else if line == "" {
pkg.Feature.Name = ""
pkg.Version = ""
} }
// Add the package to the result array if we have all the informations // Add the package to the result array if we have all the informations

2
ext/featurefmt/dpkg/testdata/status vendored
View File

@ -60,6 +60,8 @@ This package is not necessary for most modern Linux systems, where the udev
subsystem provides a more dynamic mechanism for device file management. subsystem provides a more dynamic mechanism for device file management.
Original-Maintainer: Debian QA Group <packages@qa.debian.org> Original-Maintainer: Debian QA Group <packages@qa.debian.org>
Package: brokenPackageWithNoVersionThatShouldGetThrownOut
Package: libgcc1 Package: libgcc1
Status: install ok installed Status: install ok installed
Priority: required Priority: required