oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 08:53:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

add acceptance test to cover gem cataloger + fix gem cataloger parent dir (#207)

Browse Source 
Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
This commit is contained in:
Alex Goodman 2020-10-08 13:13:31 -04:00 committed by GitHub
parent da0eb6f20f
commit 335a6b022f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syft/cataloger/ruby/catalogers.go
View File

@ -19,7 +19,7 @@ func NewGemFileLockCataloger() *common.GenericCataloger {
// NewGemSpecCataloger returns a new Bundler cataloger object tailored for detecting installations of gems (e.g. Gemspec). // NewGemSpecCataloger returns a new Bundler cataloger object tailored for detecting installations of gems (e.g. Gemspec).
func NewGemSpecCataloger() *common.GenericCataloger { func NewGemSpecCataloger() *common.GenericCataloger {
globParsers := map[string]common.ParserFn{ globParsers := map[string]common.ParserFn{
"**/specification/*.gemspec": parseGemSpecEntries, "**/specifications/*.gemspec": parseGemSpecEntries,
} }
return common.NewGenericCataloger(nil, globParsers, "ruby-gemspec-cataloger") return common.NewGenericCataloger(nil, globParsers, "ruby-gemspec-cataloger")

2
test/inline-compare/Makefile
View File

@ -25,7 +25,7 @@ all: clean-syft
compare-image: $(SYFT_REPORT) $(INLINE_REPORT) compare-image: $(SYFT_REPORT) $(INLINE_REPORT)
./compare.py $(COMPARE_IMAGE) ./compare.py $(COMPARE_IMAGE)
.PHONY: gather-iamge .PHONY: gather-image
gather-image: $(SYFT_REPORT) $(INLINE_REPORT) gather-image: $(SYFT_REPORT) $(INLINE_REPORT)
$(INLINE_REPORT): $(INLINE_REPORT):

2
test/inline-compare/compare-all.sh
View File

@ -2,7 +2,7 @@
set -eu set -eu
# TODO: Add "alpine:3.12.0" back in when we've figured out how to handle the apk version field w/ and w/o release information (see issue: https://github.com/anchore/syft/pull/195) # TODO: Add "alpine:3.12.0" back in when we've figured out how to handle the apk version field w/ and w/o release information (see issue: https://github.com/anchore/syft/pull/195)
images=("debian:10.5" "centos:8.2.2004") images=("debian:10.5" "centos:8.2.2004" "rails:5.0.1")
# gather all image analyses # gather all image analyses
for img in "${images[@]}"; do for img in "${images[@]}"; do

25
test/inline-compare/compare.py
View File

@ -33,8 +33,9 @@ class InlineScan:
def packages(self): def packages(self):
python_packages, python_metadata = self._python_packages() python_packages, python_metadata = self._python_packages()
os_pacakges, os_metadata = self._os_packages() gem_packages, gem_metadata = self._gem_packages()
return python_packages | os_pacakges, {**python_metadata, **os_metadata} os_packages, os_metadata = self._os_packages()
return python_packages | os_packages | gem_packages , {**python_metadata, **os_metadata, **gem_metadata}
def _report_path(self, report): def _report_path(self, report):
return os.path.join( return os.path.join(
@ -67,6 +68,18 @@ class InlineScan:
return packages, metadata return packages, metadata
def _gem_packages(self):
packages = set()
metadata = collections.defaultdict(dict)
for entry in self._enumerate_section(
report="content-gem", section="content"
):
package = Package(name=entry["package"], type=entry["type"].lower(),)
packages.add(package)
metadata[package.type][package] = Metadata(version=entry["version"])
return packages, metadata
def _os_packages(self): def _os_packages(self):
packages = set() packages = set()
metadata = collections.defaultdict(dict) metadata = collections.defaultdict(dict)
@ -162,7 +175,7 @@ def main(image):
for package in syft_packages: for package in syft_packages:
metadata = syft_metadata[package.type][package] metadata = syft_metadata[package.type][package]
# we only want to really count mismatched metadata for packages that are at least found by inline # we only want to really count mismatched metadata for packages that are at least found by inline
if package in inline_metadata[package.type]: if package in inline_metadata.get(package.type, []):
syft_overlap_metadata_set.add((package, metadata)) syft_overlap_metadata_set.add((package, metadata))
same_metadata = syft_overlap_metadata_set & inline_metadata_set same_metadata = syft_overlap_metadata_set & inline_metadata_set
@ -202,8 +215,10 @@ def main(image):
print(colors.bold+"Summary:", colors.reset) print(colors.bold+"Summary:", colors.reset)
print(" Image: %s" % image) print(" Image: %s" % image)
print(" Inline Packages: %d" % len(inline_packages)) print(" Inline Packages : %d" % len(inline_packages))
print(" Syft Packages: %d" % len(syft_packages)) print(" Syft Packages : %d" % len(syft_packages))
print(" (extra) : %d" % len(bonus_packages))
print(" (missing) : %d" % len(missing_packages))
print( print(
" Baseline Packages Matched: %2.3f %% (%d/%d packages)" " Baseline Packages Matched: %2.3f %% (%d/%d packages)"
% (percent_overlap_packages, len(same_packages), len(inline_packages)) % (percent_overlap_packages, len(same_packages), len(inline_packages))

0
test/integration/test-fixtures/image-pkg-coverage/ruby/specification/bundler.gemspec → test/integration/test-fixtures/image-pkg-coverage/ruby/specifications/bundler.gemspec
View File