added electron cataloger & bin classifier #4679
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| # Cataloger capabilities. See ../README.md for documentation. | ||
|
|
||
| catalogers: | ||
| - ecosystem: javascript # MANUAL | ||
| name: electron-cataloger # AUTO-GENERATED | ||
| type: generic # AUTO-GENERATED | ||
| source: # AUTO-GENERATED | ||
| file: syft/pkg/cataloger/electron/cataloger.go | ||
| function: NewCataloger | ||
| selectors: # AUTO-GENERATED | ||
| - asar | ||
| - directory | ||
| - electron | ||
| - image | ||
| - javascript | ||
| - language | ||
| - package | ||
| parsers: # AUTO-GENERATED structure | ||
| - function: parsePackageJSON | ||
| detector: # AUTO-GENERATED | ||
| method: glob # AUTO-GENERATED | ||
| criteria: # AUTO-GENERATED | ||
| - '**/Contents/Resources/app/node_modules/*/package.json' | ||
| - '**/Contents/Resources/app/node_modules/*/*/package.json' | ||
| - '**/Contents/Resources/app/node_modules/*/*/*/package.json' | ||
| - '**/resources/app/node_modules/*/package.json' | ||
| - '**/resources/app/node_modules/*/*/package.json' | ||
| - '**/resources/app/node_modules/*/*/*/package.json' | ||
| capabilities: # MANUAL - preserved across regeneration | ||
| - name: license | ||
| default: true | ||
| - name: dependency.depth | ||
| default: | ||
| - direct | ||
| - indirect | ||
| - name: dependency.edges | ||
| default: "" | ||
| - name: dependency.kinds | ||
| default: | ||
| - runtime | ||
| - name: package_manager.files.listing | ||
| default: false | ||
| - name: package_manager.files.digests | ||
| default: false | ||
| - name: package_manager.package_integrity_hash | ||
| default: false | ||
| - function: parseAsarArchive | ||
| detector: # AUTO-GENERATED | ||
| method: glob # AUTO-GENERATED | ||
| criteria: # AUTO-GENERATED | ||
| - '**/app.asar' | ||
| - '**/Contents/Resources/app.asar' | ||
| - '**/Contents/Resources/electron.asar' | ||
| - '**/Contents/Resources/app/node_modules.asar' | ||
| - '**/resources/app.asar' | ||
| - '**/resources/electron.asar' | ||
| - '**/resources/app/node_modules.asar' | ||
| metadata_types: # AUTO-GENERATED | ||
| - pkg.NpmPackage | ||
| package_types: # AUTO-GENERATED | ||
| - npm | ||
| purl_types: # AUTO-GENERATED | ||
| - npm | ||
| json_schema_types: # AUTO-GENERATED | ||
| - JavascriptNpmPackage | ||
| capabilities: # MANUAL - preserved across regeneration | ||
| - name: license | ||
| default: true | ||
| - name: dependency.depth | ||
| default: | ||
| - direct | ||
| - indirect | ||
| - name: dependency.edges | ||
| default: "" | ||
| - name: dependency.kinds | ||
| default: | ||
| - runtime | ||
| - name: package_manager.files.listing | ||
| default: false | ||
| - name: package_manager.files.digests | ||
| default: false | ||
| - name: package_manager.package_integrity_hash | ||
| default: false |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package electron | ||
|
|
||
| import ( | ||
| "github.com/anchore/syft/syft/pkg" | ||
| "github.com/anchore/syft/syft/pkg/cataloger/generic" | ||
| ) | ||
|
|
||
| const catalogerName = "electron-cataloger" | ||
|
|
||
| // NewCataloger returns a cataloger for packaged Electron apps. | ||
| func NewCataloger() pkg.Cataloger { | ||
| return generic.NewCataloger(catalogerName). | ||
| WithParserByGlobs(parseAsarArchive, | ||
| "**/app.asar", | ||
| "**/Contents/Resources/app.asar", // macOS | ||
| "**/Contents/Resources/electron.asar", // macOS alt | ||
| "**/Contents/Resources/app/node_modules.asar", // macOS VS Code style | ||
| "**/resources/app.asar", // Linux/Win | ||
| "**/resources/electron.asar", // Linux/Win alt | ||
| "**/resources/app/node_modules.asar", // Linux/Win VS Code style | ||
| ). | ||
| WithParserByGlobs(parsePackageJSON, | ||
| "**/Contents/Resources/app/node_modules/*/package.json", // macOS | ||
|
Contributor
There was a problem hiding this comment. I think these paths would be covered by the package json cataloger, which is not enabled by default for directory scans (I think there is a desire to identify "full OS" scans and use the same catalogers as images, so that could change at some point). But if the package json cataloger is enabled, does this result in duplicate results and we're just deduplicating later? |
||
| "**/Contents/Resources/app/node_modules/*/*/package.json", // macOS scoped | ||
| "**/Contents/Resources/app/node_modules/*/*/*/package.json", // macOS nested | ||
| "**/resources/app/node_modules/*/package.json", // Linux/Win | ||
| "**/resources/app/node_modules/*/*/package.json", // Linux/Win scoped | ||
| "**/resources/app/node_modules/*/*/*/package.json", // Linux/Win nested | ||
| ) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: is this change necessary? there's an unfortunate inconsistency here now