diff --git a/GNUmakefile b/GNUmakefile index 8795b72c59..04ebf65eae 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -88,7 +88,7 @@ NOW=$(shell date --iso-8601=seconds) NOW_JSON_DIR := '${BASE_DIR}/$(NOW)' ONE_SEC_AFTER=$(shell date -d '+1 second' --iso-8601=seconds) ONE_SEC_AFTER_JSON_DIR := '${BASE_DIR}/$(ONE_SEC_AFTER)' -LIBS := 'bundler' 'pip' 'pipenv' 'poetry' 'composer' 'npm' 'yarn' 'pnpm' 'cargo' 'gomod' 'gosum' 'gobinary' 'jar' 'pom' 'gradle' 'nuget-lock' 'nuget-config' 'dotnet-deps' 'nvd_exact' 'nvd_rough' 'nvd_vendor_product' 'nvd_match_no_jvn' 'jvn_vendor_product' 'jvn_vendor_product_nover' +LIBS := 'bundler' 'pip' 'pipenv' 'poetry' 'composer' 'npm' 'yarn' 'pnpm' 'cargo' 'gomod' 'gosum' 'gobinary' 'jar' 'pom' 'gradle' 'nuget-lock' 'nuget-config' 'dotnet-deps' 'conan' 'nvd_exact' 'nvd_rough' 'nvd_vendor_product' 'nvd_match_no_jvn' 'jvn_vendor_product' 'jvn_vendor_product_nover' diff: # git clone git@github.com:vulsio/vulsctl.git diff --git a/integration b/integration index d077446e63..a36b4595ee 160000 --- a/integration +++ b/integration @@ -1 +1 @@ -Subproject commit d077446e63f19ad4b805cb4fd32f576487a8ec78 +Subproject commit a36b4595ee6b728ec7ec505e860de14f5791e7a8 diff --git a/models/library.go b/models/library.go index 5a7992b131..1c14c68793 100644 --- a/models/library.go +++ b/models/library.go @@ -147,6 +147,8 @@ var FindLockFiles = []string{ ftypes.GoMod, ftypes.GoSum, // java ftypes.MavenPom, "*.jar", "*.war", "*.ear", "*.par", "*gradle.lockfile", + // C / C++ + ftypes.ConanLock, } // GetLibraryKey returns target library key @@ -168,6 +170,8 @@ func (s LibraryScanner) GetLibraryKey() string { return ".net" case ftypes.Pipenv, ftypes.Poetry, ftypes.Pip, ftypes.PythonPkg: return "python" + case ftypes.ConanLock: + return "c" default: return "" } diff --git a/scanner/base.go b/scanner/base.go index 9281c5e4f4..d2feaf25e6 100644 --- a/scanner/base.go +++ b/scanner/base.go @@ -28,7 +28,7 @@ import ( "golang.org/x/xerrors" // Import library scanner - // _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/c/conan" + _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/c/conan" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dotnet/deps" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/dotnet/nuget" _ "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language/golang/binary"