Compare commits

...

2 Commits

Author SHA1 Message Date
DmitriyLewen
27a3e55e8e fix(java): download java-db once (#5442) 2023-10-28 12:20:47 +09:00
dependabot[bot]
d223732657 chore(deps): bump google.golang.org/grpc from 1.57.0 to 1.57.1 (#5447)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-28 12:20:43 +09:00
4 changed files with 16 additions and 17 deletions

2
go.mod
View File

@@ -368,7 +368,7 @@ require (
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
google.golang.org/grpc v1.57.0 // indirect google.golang.org/grpc v1.57.1 // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect

4
go.sum
View File

@@ -2436,8 +2436,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg=
google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

View File

@@ -15,7 +15,6 @@ import (
"github.com/aquasecurity/trivy/pkg/fanal/analyzer/language" "github.com/aquasecurity/trivy/pkg/fanal/analyzer/language"
"github.com/aquasecurity/trivy/pkg/fanal/types" "github.com/aquasecurity/trivy/pkg/fanal/types"
"github.com/aquasecurity/trivy/pkg/javadb" "github.com/aquasecurity/trivy/pkg/javadb"
"github.com/aquasecurity/trivy/pkg/log"
"github.com/aquasecurity/trivy/pkg/parallel" "github.com/aquasecurity/trivy/pkg/parallel"
) )
@@ -34,8 +33,7 @@ var requiredExtensions = []string{
// javaLibraryAnalyzer analyzes jar/war/ear/par files // javaLibraryAnalyzer analyzes jar/war/ear/par files
type javaLibraryAnalyzer struct { type javaLibraryAnalyzer struct {
client *javadb.DB slow bool
slow bool
} }
func newJavaLibraryAnalyzer(options analyzer.AnalyzerOptions) (analyzer.PostAnalyzer, error) { func newJavaLibraryAnalyzer(options analyzer.AnalyzerOptions) (analyzer.PostAnalyzer, error) {
@@ -46,23 +44,20 @@ func newJavaLibraryAnalyzer(options analyzer.AnalyzerOptions) (analyzer.PostAnal
func (a *javaLibraryAnalyzer) PostAnalyze(ctx context.Context, input analyzer.PostAnalysisInput) (*analyzer.AnalysisResult, error) { func (a *javaLibraryAnalyzer) PostAnalyze(ctx context.Context, input analyzer.PostAnalysisInput) (*analyzer.AnalysisResult, error) {
// TODO: think about the sonatype API and "--offline" // TODO: think about the sonatype API and "--offline"
var err error client, err := javadb.NewClient()
log.Logger.Info("JAR files found")
a.client, err = javadb.NewClient()
if err != nil { if err != nil {
return nil, xerrors.Errorf("Unable to initialize the Java DB: %s", err) return nil, xerrors.Errorf("Unable to initialize the Java DB: %s", err)
} }
defer func() { _ = a.client.Close() }() defer func() { _ = client.Close() }()
log.Logger.Info("Analyzing JAR files takes a while...")
// Skip analyzing JAR files as the nil client means the Java DB was not downloaded successfully. // Skip analyzing JAR files as the nil client means the Java DB was not downloaded successfully.
if a.client == nil { if client == nil {
return nil, nil return nil, nil
} }
// It will be called on each JAR file // It will be called on each JAR file
onFile := func(path string, info fs.FileInfo, r dio.ReadSeekerAt) (*types.Application, error) { onFile := func(path string, info fs.FileInfo, r dio.ReadSeekerAt) (*types.Application, error) {
p := jar.NewParser(a.client, jar.WithSize(info.Size()), jar.WithFilePath(path)) p := jar.NewParser(client, jar.WithSize(info.Size()), jar.WithFilePath(path))
return language.ParsePackage(types.Jar, path, r, p, input.Options.FileChecksum) return language.ParsePackage(types.Jar, path, r, p, input.Options.FileChecksum)
} }

View File

@@ -7,6 +7,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"sort" "sort"
"sync"
"time" "time"
"golang.org/x/xerrors" "golang.org/x/xerrors"
@@ -31,6 +32,7 @@ type Updater struct {
skip bool skip bool
quiet bool quiet bool
registryOption ftypes.RegistryOptions registryOption ftypes.RegistryOptions
once sync.Once // we need to update java-db once per run
} }
func (u *Updater) Update() error { func (u *Updater) Update() error {
@@ -93,10 +95,12 @@ func Update() error {
if updater == nil { if updater == nil {
return xerrors.New("Java DB client not initialized") return xerrors.New("Java DB client not initialized")
} }
if err := updater.Update(); err != nil {
return xerrors.Errorf("Java DB update error: %w", err) var err error
} updater.once.Do(func() {
return nil err = updater.Update()
})
return err
} }
type DB struct { type DB struct {