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.

Sign up for GitHub

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

Jump to bottom

fix(java): download java-db once #5442

Merged
merged 2 commits into from
Oct 26, 2023
Merged

fix(java): download java-db once #5442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6d9bb7
fix: download java-db once
DmitriyLewen Oct 25, 2023
faaad2c
fix: create new client for each `PostAnalyze` run
DmitriyLewen Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions pkg/fanal/analyzer/language/java/jar/jar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"github.com/aquasecurity/trivy/pkg/fanal/analyzer/language"
"github.com/aquasecurity/trivy/pkg/fanal/types"
"github.com/aquasecurity/trivy/pkg/javadb"
"github.com/aquasecurity/trivy/pkg/log"
"github.com/aquasecurity/trivy/pkg/parallel"
)

Expand All @@ -34,8 +33,7 @@ var requiredExtensions = []string{

// javaLibraryAnalyzer analyzes jar/war/ear/par files
type javaLibraryAnalyzer struct {
client *javadb.DB
slow bool
slow bool
}

func newJavaLibraryAnalyzer(options analyzer.AnalyzerOptions) (analyzer.PostAnalyzer, error) {
Expand All @@ -46,23 +44,20 @@ func newJavaLibraryAnalyzer(options analyzer.AnalyzerOptions) (analyzer.PostAnal

func (a *javaLibraryAnalyzer) PostAnalyze(ctx context.Context, input analyzer.PostAnalysisInput) (*analyzer.AnalysisResult, error) {
// TODO: think about the sonatype API and "--offline"
var err error
log.Logger.Info("JAR files found")
a.client, err = javadb.NewClient()
client, err := javadb.NewClient()
if err != nil {
return nil, xerrors.Errorf("Unable to initialize the Java DB: %s", err)
}
defer func() { _ = a.client.Close() }()
log.Logger.Info("Analyzing JAR files takes a while...")
defer func() { _ = client.Close() }()

// 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
}

// It will be called on each JAR file
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)
}

Expand Down
12 changes: 8 additions & 4 deletions pkg/javadb/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"sort"
"sync"
"time"

"golang.org/x/xerrors"
Expand All @@ -31,6 +32,7 @@ type Updater struct {
skip bool
quiet bool
registryOption ftypes.RegistryOptions
once sync.Once // we need to update java-db once per run
}

func (u *Updater) Update() error {
Expand Down Expand Up @@ -93,10 +95,12 @@ func Update() error {
if updater == nil {
return xerrors.New("Java DB client not initialized")
}
if err := updater.Update(); err != nil {
return xerrors.Errorf("Java DB update error: %w", err)
}
return nil

var err error
updater.once.Do(func() {
err = updater.Update()
})
return err
}

type DB struct {
Expand Down