From d3fc7efa09975c24f4a33ca54ce36230399854e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Lajeunesse-Robert?= Date: Thu, 17 Apr 2025 09:11:25 -0400 Subject: [PATCH 1/2] Updated trivy version --- scanners/boostsecurityio/trivy-fs/module.yaml | 10 +++++----- scanners/boostsecurityio/trivy-image/module.yaml | 10 +++++----- scanners/boostsecurityio/trivy-sbom-image/module.yaml | 10 +++++----- scanners/boostsecurityio/trivy-sbom/module.yaml | 10 +++++----- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/scanners/boostsecurityio/trivy-fs/module.yaml b/scanners/boostsecurityio/trivy-fs/module.yaml index e43eda76..9e1edaef 100644 --- a/scanners/boostsecurityio/trivy-fs/module.yaml +++ b/scanners/boostsecurityio/trivy-fs/module.yaml @@ -31,11 +31,11 @@ config: setup: - name: download trivy environment: - VERSION: 0.57.0 - LINUX_X86_64_SHA: cf08a8cd861e5192631fc03bb21efde27c1d93e4407ab70bab32e572bafcbf07 - LINUX_ARM64_SHA: 29012fdb5ba18da506d1c8b6f389c2ec9d113db965c254971f35267ebb45dd64 - MACOS_X86_64_SHA: e7955b6d38d8125d4aa8936e6af51b0de2b0e0840b4feb90b44002bf7f47bf13 - MACOS_ARM64_SHA: 61230c8a56e463e8eba2bf922bc688b7bd40352187e1f725c79861b0801437f0 + VERSION: 0.61.0 + LINUX_X86_64_SHA: 31af7049380abcdc422094638cc33364593f0ccc89c955dd69d27aca288ae79c + LINUX_ARM64_SHA: d18a9ec7d408d541182e7f3165cdaa934fd05f586e4f22ce547ed1f1640e8c3f + MACOS_X86_64_SHA: 7454cd0d31dec55498baa2fbec9c4034c23ab52df45bb256c29297f2099129f8 + MACOS_ARM64_SHA: 9ad04f68b7823109b93d3c6b4e069d932348bf2847e4ccd197787f87f346138e run: | BINARY_URL="https://github.com/aquasecurity/trivy/releases/download/v${VERSION}" ARCH=$(uname -m) diff --git a/scanners/boostsecurityio/trivy-image/module.yaml b/scanners/boostsecurityio/trivy-image/module.yaml index f60805cd..e6357025 100644 --- a/scanners/boostsecurityio/trivy-image/module.yaml +++ b/scanners/boostsecurityio/trivy-image/module.yaml @@ -13,11 +13,11 @@ config: setup: - name: download trivy environment: - VERSION: 0.57.0 - LINUX_X86_64_SHA: cf08a8cd861e5192631fc03bb21efde27c1d93e4407ab70bab32e572bafcbf07 - LINUX_ARM64_SHA: 29012fdb5ba18da506d1c8b6f389c2ec9d113db965c254971f35267ebb45dd64 - MACOS_X86_64_SHA: e7955b6d38d8125d4aa8936e6af51b0de2b0e0840b4feb90b44002bf7f47bf13 - MACOS_ARM64_SHA: 61230c8a56e463e8eba2bf922bc688b7bd40352187e1f725c79861b0801437f0 + VERSION: 0.61.0 + LINUX_X86_64_SHA: 31af7049380abcdc422094638cc33364593f0ccc89c955dd69d27aca288ae79c + LINUX_ARM64_SHA: d18a9ec7d408d541182e7f3165cdaa934fd05f586e4f22ce547ed1f1640e8c3f + MACOS_X86_64_SHA: 7454cd0d31dec55498baa2fbec9c4034c23ab52df45bb256c29297f2099129f8 + MACOS_ARM64_SHA: 9ad04f68b7823109b93d3c6b4e069d932348bf2847e4ccd197787f87f346138e run: | BINARY_URL="https://github.com/aquasecurity/trivy/releases/download/v${VERSION}" ARCH=$(uname -m) diff --git a/scanners/boostsecurityio/trivy-sbom-image/module.yaml b/scanners/boostsecurityio/trivy-sbom-image/module.yaml index 0cc15fb3..d1fb8132 100644 --- a/scanners/boostsecurityio/trivy-sbom-image/module.yaml +++ b/scanners/boostsecurityio/trivy-sbom-image/module.yaml @@ -12,11 +12,11 @@ config: setup: - name: download trivy environment: - VERSION: 0.57.0 - LINUX_X86_64_SHA: cf08a8cd861e5192631fc03bb21efde27c1d93e4407ab70bab32e572bafcbf07 - LINUX_ARM64_SHA: 29012fdb5ba18da506d1c8b6f389c2ec9d113db965c254971f35267ebb45dd64 - MACOS_X86_64_SHA: e7955b6d38d8125d4aa8936e6af51b0de2b0e0840b4feb90b44002bf7f47bf13 - MACOS_ARM64_SHA: 61230c8a56e463e8eba2bf922bc688b7bd40352187e1f725c79861b0801437f0 + VERSION: 0.61.0 + LINUX_X86_64_SHA: 31af7049380abcdc422094638cc33364593f0ccc89c955dd69d27aca288ae79c + LINUX_ARM64_SHA: d18a9ec7d408d541182e7f3165cdaa934fd05f586e4f22ce547ed1f1640e8c3f + MACOS_X86_64_SHA: 7454cd0d31dec55498baa2fbec9c4034c23ab52df45bb256c29297f2099129f8 + MACOS_ARM64_SHA: 9ad04f68b7823109b93d3c6b4e069d932348bf2847e4ccd197787f87f346138e run: | BINARY_URL="https://github.com/aquasecurity/trivy/releases/download/v${VERSION}" ARCH=$(uname -m) diff --git a/scanners/boostsecurityio/trivy-sbom/module.yaml b/scanners/boostsecurityio/trivy-sbom/module.yaml index 553d3897..daa3e836 100644 --- a/scanners/boostsecurityio/trivy-sbom/module.yaml +++ b/scanners/boostsecurityio/trivy-sbom/module.yaml @@ -12,11 +12,11 @@ config: setup: - name: download trivy environment: - VERSION: 0.57.0 - LINUX_X86_64_SHA: cf08a8cd861e5192631fc03bb21efde27c1d93e4407ab70bab32e572bafcbf07 - LINUX_ARM64_SHA: 29012fdb5ba18da506d1c8b6f389c2ec9d113db965c254971f35267ebb45dd64 - MACOS_X86_64_SHA: e7955b6d38d8125d4aa8936e6af51b0de2b0e0840b4feb90b44002bf7f47bf13 - MACOS_ARM64_SHA: 61230c8a56e463e8eba2bf922bc688b7bd40352187e1f725c79861b0801437f0 + VERSION: 0.61.0 + LINUX_X86_64_SHA: 31af7049380abcdc422094638cc33364593f0ccc89c955dd69d27aca288ae79c + LINUX_ARM64_SHA: d18a9ec7d408d541182e7f3165cdaa934fd05f586e4f22ce547ed1f1640e8c3f + MACOS_X86_64_SHA: 7454cd0d31dec55498baa2fbec9c4034c23ab52df45bb256c29297f2099129f8 + MACOS_ARM64_SHA: 9ad04f68b7823109b93d3c6b4e069d932348bf2847e4ccd197787f87f346138e run: | BINARY_URL="https://github.com/aquasecurity/trivy/releases/download/v${VERSION}" ARCH=$(uname -m) From 123e531982048fcdec535acb712d357277898ed8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Lajeunesse-Robert?= Date: Fri, 2 May 2025 11:21:43 -0400 Subject: [PATCH 2/2] Updated module include files to comply with Trivy version --- scanners/boostsecurityio/trivy-fs/module.yaml | 46 ++++++++++++++----- .../boostsecurityio/trivy-sbom/module.yaml | 40 ++++++++++++++++ 2 files changed, 74 insertions(+), 12 deletions(-) diff --git a/scanners/boostsecurityio/trivy-fs/module.yaml b/scanners/boostsecurityio/trivy-fs/module.yaml index 9e1edaef..46cfcb21 100644 --- a/scanners/boostsecurityio/trivy-fs/module.yaml +++ b/scanners/boostsecurityio/trivy-fs/module.yaml @@ -10,23 +10,45 @@ config: require_full_repo: true support_diff_scan: true include_files: - - buildscript-gradle.lockfile - - Cargo.lock - - composer.lock + # C/C++ https://trivy.dev/v0.61/docs/coverage/language/c/ - conan.lock - - Gemfile.lock - - go.mod - - gradle.lockfile + # Dart https://trivy.dev/v0.61/docs/coverage/language/dart/ + - pubspec.lock + # Dotnet https://trivy.dev/v0.61/docs/coverage/language/dotnet/ + - "*.deps.json" + - packages.config + - "*Packages.props" + - packages.lock.json + # Elixir https://trivy.dev/v0.61/docs/coverage/language/elixir/ - mix.lock + # Go https://trivy.dev/v0.61/docs/coverage/language/golang/ + - go.mod + # Java https://trivy.dev/v0.61/docs/coverage/language/java/ + - "*gradle.lockfile" + - pom.xml + - "*.sbt.lock" + # NodeJs https://trivy.dev/v0.61/docs/coverage/language/nodejs/ - package-lock.json - - packages.lock.json - - Pipfile.lock + - yarn.lock - pnpm-lock.yaml - - poetry.lock - - pom.xml - - pubspec.lock + # Php https://trivy.dev/v0.61/docs/coverage/language/php/ + - composer.lock + - installed.json + # Python https://trivy.dev/v0.61/docs/coverage/language/python/ + - Pipfile.lock - requirements.txt - - yarn.lock + - poetry.lock + - uv.lock + # Ruby https://trivy.dev/v0.61/docs/coverage/language/ruby/ + - Gemfile.lock + - .gemspec + # RUST https://trivy.dev/v0.61/docs/coverage/language/rust/ + - Cargo.lock + # Swift https://trivy.dev/v0.61/docs/coverage/language/swift/ + - Package.resolved + - Podfile.lock + # Julia https://trivy.dev/v0.61/docs/coverage/language/julia/ + - Manifest.toml setup: - name: download trivy diff --git a/scanners/boostsecurityio/trivy-sbom/module.yaml b/scanners/boostsecurityio/trivy-sbom/module.yaml index daa3e836..32e51147 100644 --- a/scanners/boostsecurityio/trivy-sbom/module.yaml +++ b/scanners/boostsecurityio/trivy-sbom/module.yaml @@ -8,6 +8,46 @@ scan_types: config: support_diff_scan: false + include_files: + # C/C++ https://trivy.dev/v0.61/docs/coverage/language/c/ + - conan.lock + # Dart https://trivy.dev/v0.61/docs/coverage/language/dart/ + - pubspec.lock + # Dotnet https://trivy.dev/v0.61/docs/coverage/language/dotnet/ + - "*.deps.json" + - packages.config + - "*Packages.props" + - packages.lock.json + # Elixir https://trivy.dev/v0.61/docs/coverage/language/elixir/ + - mix.lock + # Go https://trivy.dev/v0.61/docs/coverage/language/golang/ + - go.mod + # Java https://trivy.dev/v0.61/docs/coverage/language/java/ + - "*gradle.lockfile" + - pom.xml + - "*.sbt.lock" + # NodeJs https://trivy.dev/v0.61/docs/coverage/language/nodejs/ + - package-lock.json + - yarn.lock + - pnpm-lock.yaml + # Php https://trivy.dev/v0.61/docs/coverage/language/php/ + - composer.lock + - installed.json + # Python https://trivy.dev/v0.61/docs/coverage/language/python/ + - Pipfile.lock + - requirements.txt + - poetry.lock + - uv.lock + # Ruby https://trivy.dev/v0.61/docs/coverage/language/ruby/ + - Gemfile.lock + - .gemspec + # RUST https://trivy.dev/v0.61/docs/coverage/language/rust/ + - Cargo.lock + # Swift https://trivy.dev/v0.61/docs/coverage/language/swift/ + - Package.resolved + - Podfile.lock + # Julia https://trivy.dev/v0.61/docs/coverage/language/julia/ + - Manifest.toml setup: - name: download trivy