Skip to content
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

db: Update trivy-db to include CVSS score info #530

Merged
merged 4 commits into from
Jul 7, 2020

Conversation

simar7
Copy link
Member

@simar7 simar7 commented Jun 11, 2020

After aquasecurity/trivy-db#48 gets merged, Trivy can also display the CVSS Score attached to a severity along with the vector.

image

Addresses: #92

Signed-off-by: Simarpreet Singh [email protected]

@simar7 simar7 requested a review from knqyf263 June 11, 2020 23:57
@simar7 simar7 self-assigned this Jun 11, 2020
@simar7 simar7 force-pushed the cvss-scores-with-vectors branch from 74912ec to d4df1e0 Compare June 12, 2020 00:26
@knqyf263
Copy link
Collaborator

I tested this branch in my environment and realized that go.mod pointed to the old commit. We need to update go.mod.

Signed-off-by: Simarpreet Singh <[email protected]>
@simar7 simar7 force-pushed the cvss-scores-with-vectors branch from b68e1b3 to 28809bd Compare June 26, 2020 01:50
@simar7
Copy link
Member Author

simar7 commented Jun 26, 2020

I tested this branch in my environment and realized that go.mod pointed to the old commit. We need to update go.mod.

I updated it. Would you give it another try @knqyf263?

@knqyf263
Copy link
Collaborator

I tested this branch and I found they were snake case...

        "CVSS": {
          "nvd": {
            "v2_vector": "AV:L/AC:M/Au:N/C:P/I:N/A:N",
            "v3_vector": "CVSS:3.1/AV:L/AC:H/PR:L/UI:N/S:U/C:H/I:N/A:N",
            "v2_score": 1.9,
            "v3_score": 4.7
          },
          "redhat": {
            "v3_vector": "CVSS:3.0/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:N/A:N",
            "v3_score": 5.5
          }
        },

All other keys are upper camel case.

@simar7
Copy link
Member Author

simar7 commented Jun 30, 2020

I tested this branch and I found they were snake case...

        "CVSS": {
          "nvd": {
            "v2_vector": "AV:L/AC:M/Au:N/C:P/I:N/A:N",
            "v3_vector": "CVSS:3.1/AV:L/AC:H/PR:L/UI:N/S:U/C:H/I:N/A:N",
            "v2_score": 1.9,
            "v3_score": 4.7
          },
          "redhat": {
            "v3_vector": "CVSS:3.0/AV:L/AC:L/PR:L/UI:N/S:U/C:H/I:N/A:N",
            "v3_score": 5.5
          }
        },

All other keys are upper camel case.

OK I've updated here aquasecurity/trivy-db#50

@simar7
Copy link
Member Author

simar7 commented Jul 2, 2020

I updated trivy-db to include the new CamelCase changes. Could you take another look at it @knqyf263?

Copy link
Collaborator

@knqyf263 knqyf263 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM :shipit:

@simar7 simar7 merged commit d18d17b into master Jul 7, 2020
@simar7 simar7 deleted the cvss-scores-with-vectors branch July 7, 2020 15:16
yashvardhan-kukreja pushed a commit to yashvardhan-kukreja/trivy that referenced this pull request Aug 12, 2020
parent 4b57c0d
author Simarpreet Singh <[email protected]> 1594135002 -0700
committer Yashvardhan Kukreja <[email protected]> 1597228077 +0530
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEo6kc/h77LUwnQeM/dxKAODWqo7oFAl8zxC0ACgkQdxKAODWq
 o7pG3g//VIXCQt6z8dhORimZEAXLbwI7WuUYxkkGGKceuhCWwEs7HVJLkNBiIml1
 6gDnc8sMkG7FqFGAi5RHvdez9vqWZRxaoWgJ2J39u/sTow3QEwvzIAdjG7+4LHOs
 7mgg82qQp5Vb0UVudEitc3bqukoO61B0pszC3S8wacq3uWfq5IPRvVePBA0SD9+W
 jykmLzVp5NGeKRnOCuJw9HkRP9+lKfCJwb4K8xbTjJjuWUDj9k6oRV1XKNQcyWCi
 KzEEV1snKne8dsUYPf9dN6FuJFi6c+a4L7vX96dlKLKJDQD0y1qQHhdBSNwqP7Wj
 RHL/WuMt3Yx6sZe30dPA3I7Tj2zizodjRs+Qst1Jfyjv/5e4Ap2gqmf39pse4O8n
 Ct4UA+5zTsulyT/5aUa/gIYFUH+luznCqiYoQtQ7TgELtcVOcgGfJciq+kPp6NWP
 GS2IcBH/XSOkQ4nRQrbQ/vutItYNUcE2Oe0xLerTih3+Sx+SKufSecLoSqOTgJdG
 TEqU6UkZB3mV3Y5j9MYmvF2Yvq+Ll2tw5FzxLA6kg+eTa1ochn/xwi11/kDQYqf3
 CkH8Z4/ZgHx5xHwLkLxMleaiQP3EbyxaEBZYgzrOzp8rnT4HU+FeSUrkqlcyBrRN
 HSFMQlKXq+o/yfgVVh51LyGSFlHncVm1Jv6UirsGj7NAvso+BqA=
 =QhX4
 -----END PGP SIGNATURE-----

# This is a combination of 6 commits.
# This is the 1st commit message:

db: Update trivy-db to include CVSS score info (aquasecurity#530)

* mod: Update trivy-db to include CVSS score info

Signed-off-by: Simarpreet Singh <[email protected]>

* mod: Update go.mod

Signed-off-by: Simarpreet Singh <[email protected]>

* mod: Update trivy-db to latest

Signed-off-by: Simarpreet Singh <[email protected]>
# This is the commit message aquasecurity#2:

Adding contrib/junit.tpl to docker image (aquasecurity#554)


# This is the commit message aquasecurity#3:

Fixing `Error retrieving template from path` when --format is not template but template is provided (aquasecurity#556)


# This is the commit message aquasecurity#4:

added: display last db update whenever trivy server is started in trivy client/server setup

# This is the commit message aquasecurity#5:

Added: entry for prometheus/client_golang package

# This is the commit message aquasecurity#6:

Added: prometheus metrics endpoint support for Last DB Update and Last DB Update Attempt metric

# This is the commit message aquasecurity#7:

Added: entry for prometheus/client_golang package

# This is the commit message aquasecurity#8:

Added: prometheus metrics endpoint support for Last DB Update and Last DB Update Attempt metric

# This is the commit message aquasecurity#9:

Refactored: Shifted the GaugeVec global var to config.go . Removed unnecessarily repeated vars. Added nil check for GaugeVec

# This is the commit message aquasecurity#10:

Added: Nil GaugeVec Fail check

# This is the commit message aquasecurity#11:

Added: nil check for metrics registry

# This is the commit message aquasecurity#12:

Modified: tests with respect to nil metrics registry

# This is the commit message aquasecurity#13:

Merge with master

# This is the commit message aquasecurity#14:

Merge branch 'master' into issue-aquasecurity#346

# This is the commit message aquasecurity#15:

Resolved merge conflicts

# This is the commit message aquasecurity#16:

Resolved merge conflicts

# This is the commit message aquasecurity#17:

feat(vulnerability): add CWE-ID (aquasecurity#561)

* chore(mod): update dependency

* test(vulnerability): add CweIDs
liamg pushed a commit that referenced this pull request Jun 7, 2022
* mod: Update trivy-db to include CVSS score info

Signed-off-by: Simarpreet Singh <[email protected]>

* mod: Update go.mod

Signed-off-by: Simarpreet Singh <[email protected]>

* mod: Update trivy-db to latest

Signed-off-by: Simarpreet Singh <[email protected]>
liamg added a commit that referenced this pull request Jun 7, 2022
liamg added a commit that referenced this pull request Jun 7, 2022
josedonizetti pushed a commit to josedonizetti/trivy that referenced this pull request Jun 24, 2022
…quasecurity#530)

Bumps [github.com/hashicorp/hcl/v2](https://github.com/hashicorp/hcl) from 2.11.1 to 2.12.0.
- [Release notes](https://github.com/hashicorp/hcl/releases)
- [Changelog](https://github.com/hashicorp/hcl/blob/main/CHANGELOG.md)
- [Commits](hashicorp/hcl@v2.11.1...v2.12.0)

---
updated-dependencies:
- dependency-name: github.com/hashicorp/hcl/v2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Liam Galvin <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants