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.
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
feat: add support for gradle.lockfile #2759
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
876466f
add analyzer
DmitriyLewen e743943
add gradle.lockfile to driver
DmitriyLewen 6dda1d0
add gradle.lockfile to docs
DmitriyLewen 405e5b1
merge 'main' branch into 'feat/gradle.lockfile'
DmitriyLewen 34d04e5
use fileInfo instead of filepath in Required func
DmitriyLewen 00afb38
Merge branch 'main' of github.com:aquasecurity/trivy into feat/gradle…
DmitriyLewen 64d60f2
update go-dep-parser
DmitriyLewen 932bd0d
refactor
DmitriyLewen 86d92ba
Merge branch 'main' of github.com:aquasecurity/trivy into feat/gradl…
DmitriyLewen b349a50
add integration test
DmitriyLewen File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 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 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 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,5 @@ | ||
| # This is a Gradle generated file for dependency locking. | ||
| # Manual edits can break the build and are not advised. | ||
| # This file is expected to be part of source control. | ||
| com.fasterxml.jackson.core:jackson-databind:2.9.1=compileClasspath, runtimeClasspath | ||
| empty= |
This file contains 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,126 @@ | ||
| { | ||
| "SchemaVersion": 2, | ||
| "ArtifactName": "testdata/fixtures/fs/gradle", | ||
| "ArtifactType": "filesystem", | ||
| "Metadata": { | ||
| "ImageConfig": { | ||
| "architecture": "", | ||
| "created": "0001-01-01T00:00:00Z", | ||
| "os": "", | ||
| "rootfs": { | ||
| "type": "", | ||
| "diff_ids": null | ||
| }, | ||
| "config": {} | ||
| } | ||
| }, | ||
| "Results": [ | ||
| { | ||
| "Target": "gradle.lockfile", | ||
| "Class": "lang-pkgs", | ||
| "Type": "gradle", | ||
| "Vulnerabilities": [ | ||
| { | ||
| "VulnerabilityID": "CVE-2020-9548", | ||
| "PkgName": "com.fasterxml.jackson.core:jackson-databind", | ||
| "InstalledVersion": "2.9.1", | ||
| "FixedVersion": "2.9.10.4", | ||
| "Layer": {}, | ||
| "SeveritySource": "ghsa", | ||
| "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2020-9548", | ||
| "DataSource": { | ||
| "ID": "ghsa", | ||
| "Name": "GitHub Security Advisory Maven", | ||
| "URL": "https://github.com/advisories?query=type%3Areviewed+ecosystem%3Amaven" | ||
| }, | ||
| "Title": "jackson-databind: Serialization gadgets in anteros-core", | ||
| "Description": "FasterXML jackson-databind 2.x before 2.9.10.4 mishandles the interaction between serialization gadgets and typing, related to br.com.anteros.dbcp.AnterosDBCPConfig (aka anteros-core).", | ||
| "Severity": "CRITICAL", | ||
| "CweIDs": [ | ||
| "CWE-502" | ||
| ], | ||
| "CVSS": { | ||
| "nvd": { | ||
| "V2Vector": "AV:N/AC:M/Au:N/C:P/I:P/A:P", | ||
| "V3Vector": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H", | ||
| "V2Score": 6.8, | ||
| "V3Score": 9.8 | ||
| }, | ||
| "redhat": { | ||
| "V3Vector": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:H", | ||
| "V3Score": 8.1 | ||
| } | ||
| }, | ||
| "References": [ | ||
| "https://access.redhat.com/security/cve/CVE-2020-9548", | ||
| "https://github.com/FasterXML/jackson-databind/issues/2634", | ||
| "https://github.com/advisories/GHSA-p43x-xfjf-5jhr", | ||
| "https://lists.apache.org/thread.html/r35d30db00440ef63b791c4b7f7acb036e14d4a23afa2a249cb66c0fd@%3Cissues.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/r9464a40d25c3ba1a55622db72f113eb494a889656962d098c70c5bb1@%3Cdev.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/r98c9b6e4c9e17792e2cd1ec3e4aa20b61a791939046d3f10888176bb@%3Cissues.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/rb6fecb5e96a6d61e175ff49f33f2713798dd05cf03067c169d195596@%3Cissues.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/rd5a4457be4623038c3989294429bc063eec433a2e55995d81591e2ca@%3Cissues.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/rdd49ab9565bec436a896bc00c4b9fc9dce1598e106c318524fbdfec6@%3Cissues.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/rdd4df698d5d8e635144d2994922bf0842e933809eae259521f3b5097@%3Cissues.zookeeper.apache.org%3E", | ||
| "https://lists.apache.org/thread.html/rf1bbc0ea4a9f014cf94df9a12a6477d24a27f52741dbc87f2fd52ff2@%3Cissues.geode.apache.org%3E", | ||
| "https://lists.debian.org/debian-lts-announce/2020/03/msg00008.html", | ||
| "https://medium.com/@cowtowncoder/on-jackson-cves-dont-panic-here-is-what-you-need-to-know-54cd0d6e8062", | ||
| "https://nvd.nist.gov/vuln/detail/CVE-2020-9548", | ||
| "https://security.netapp.com/advisory/ntap-20200904-0006/", | ||
| "https://www.oracle.com/security-alerts/cpujan2021.html", | ||
| "https://www.oracle.com/security-alerts/cpujul2020.html", | ||
| "https://www.oracle.com/security-alerts/cpuoct2020.html", | ||
| "https://www.oracle.com/security-alerts/cpuoct2021.html" | ||
| ], | ||
| "PublishedDate": "2020-03-02T04:15:00Z", | ||
| "LastModifiedDate": "2021-12-02T21:23:00Z" | ||
| }, | ||
| { | ||
| "VulnerabilityID": "CVE-2021-20190", | ||
| "PkgName": "com.fasterxml.jackson.core:jackson-databind", | ||
| "InstalledVersion": "2.9.1", | ||
| "FixedVersion": "2.9.10.7", | ||
| "Layer": {}, | ||
| "SeveritySource": "nvd", | ||
| "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-20190", | ||
| "DataSource": { | ||
| "ID": "glad", | ||
| "Name": "GitLab Advisory Database Community", | ||
| "URL": "https://gitlab.com/gitlab-org/advisories-community" | ||
| }, | ||
| "Title": "jackson-databind: mishandles the interaction between serialization gadgets and typing, related to javax.swing", | ||
| "Description": "A flaw was found in jackson-databind before 2.9.10.7. FasterXML mishandles the interaction between serialization gadgets and typing. The highest threat from this vulnerability is to data confidentiality and integrity as well as system availability.", | ||
| "Severity": "HIGH", | ||
| "CweIDs": [ | ||
| "CWE-502" | ||
| ], | ||
| "CVSS": { | ||
| "nvd": { | ||
| "V2Vector": "AV:N/AC:M/Au:N/C:P/I:P/A:C", | ||
| "V3Vector": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:H", | ||
| "V2Score": 8.3, | ||
| "V3Score": 8.1 | ||
| }, | ||
| "redhat": { | ||
| "V3Vector": "CVSS:3.1/AV:N/AC:H/PR:N/UI:N/S:U/C:H/I:H/A:H", | ||
| "V3Score": 8.1 | ||
| } | ||
| }, | ||
| "References": [ | ||
| "https://access.redhat.com/security/cve/CVE-2021-20190", | ||
| "https://bugzilla.redhat.com/show_bug.cgi?id=1916633", | ||
| "https://github.com/FasterXML/jackson-databind/commit/7dbf51bf78d157098074a20bd9da39bd48c18e4a", | ||
| "https://github.com/FasterXML/jackson-databind/issues/2854", | ||
| "https://github.com/advisories/GHSA-5949-rw7g-wx7w", | ||
| "https://lists.apache.org/thread.html/r380e9257bacb8551ee6fcf2c59890ae9477b2c78e553fa9ea08e9d9a@%3Ccommits.nifi.apache.org%3E", | ||
| "https://lists.debian.org/debian-lts-announce/2021/04/msg00025.html", | ||
| "https://nvd.nist.gov/vuln/detail/CVE-2021-20190", | ||
| "https://security.netapp.com/advisory/ntap-20210219-0008/" | ||
| ], | ||
| "PublishedDate": "2021-01-19T17:15:00Z", | ||
| "LastModifiedDate": "2021-07-20T23:15:00Z" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| } |
This file contains 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 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 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 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,47 @@ | ||
| package gradle | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/aquasecurity/go-dep-parser/pkg/gradle/lockfile" | ||
| "github.com/aquasecurity/trivy/pkg/fanal/analyzer" | ||
| "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language" | ||
| "github.com/aquasecurity/trivy/pkg/fanal/types" | ||
|
|
||
| "golang.org/x/xerrors" | ||
| ) | ||
|
|
||
| func init() { | ||
| analyzer.RegisterAnalyzer(&gradleLockAnalyzer{}) | ||
| } | ||
|
|
||
| const ( | ||
| version = 1 | ||
| fileNameSuffix = "gradle.lockfile" | ||
| ) | ||
|
|
||
| // gradleLockAnalyzer analyzes '*gradle.lockfile' | ||
| type gradleLockAnalyzer struct{} | ||
|
|
||
| func (a gradleLockAnalyzer) Analyze(_ context.Context, input analyzer.AnalysisInput) (*analyzer.AnalysisResult, error) { | ||
| p := lockfile.NewParser() | ||
| res, err := language.Analyze(types.Gradle, input.FilePath, input.Content, p) | ||
| if err != nil { | ||
| return nil, xerrors.Errorf("%s parse error: %w", input.FilePath, err) | ||
| } | ||
| return res, nil | ||
| } | ||
|
|
||
| func (a gradleLockAnalyzer) Required(_ string, fileInfo os.FileInfo) bool { | ||
| return strings.HasSuffix(fileInfo.Name(), fileNameSuffix) | ||
| } | ||
|
|
||
| func (a gradleLockAnalyzer) Type() analyzer.Type { | ||
| return analyzer.TypeGradleLock | ||
| } | ||
|
|
||
| func (a gradleLockAnalyzer) Version() int { | ||
| return version | ||
| } | ||
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.
I can see on GitHub, that user have lock files with another names. is it ok?
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.
It is suffix of filename.
If I understand correctly - we need to check only this suffix.
trivy/pkg/fanal/analyzer/language/java/gradle/lockfile.go
Line 39 in 6dda1d0