Skip to content

Expand deb cataloger to include opkg #1985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spiffcs merged 3 commits into from
Aug 3, 2023
+5 −1
Merged

Expand deb cataloger to include opkg #1985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c559a89
Add opkg info directory and status file to deb cataloger
Jun 27, 2023
0d5b5e2
Fix deb unit tests
Aug 1, 2023
89ebbc2
Add newlines to bogus files for deb glob paths test
Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion syft/pkg/cataloger/deb/cataloger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ func NewDpkgdbCataloger() *generic.Cataloger {
return generic.NewCataloger(catalogerName).
// note: these globs have been intentionally split up in order to improve search performance,
// please do NOT combine into: "**/var/lib/dpkg/{status,status.d/*}"
WithParserByGlobs(parseDpkgDB, "**/var/lib/dpkg/status", "**/var/lib/dpkg/status.d/*")
WithParserByGlobs(parseDpkgDB, "**/var/lib/dpkg/status", "**/var/lib/dpkg/status.d/*", "**/lib/opkg/info/*", "**/lib/opkg/status")
}
2 changes: 2 additions & 0 deletions syft/pkg/cataloger/deb/cataloger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ func TestCataloger_Globs(t *testing.T) {
expected: []string{
"var/lib/dpkg/status",
"var/lib/dpkg/status.d/pkg-1.0",
"usr/lib/opkg/status",
"usr/lib/opkg/info/pkg-1.0",
},
},
}
Expand Down
1 change: 1 addition & 0 deletions syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/info/pkg-1.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bogus package
1 change: 1 addition & 0 deletions syft/pkg/cataloger/deb/test-fixtures/glob-paths/usr/lib/opkg/status
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bogus status