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: fetch sub-manifests from keppel #275

Merged
merged 3 commits into from
Oct 9, 2024
Merged

fix: fetch sub-manifests from keppel #275

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4287d0
fix: fetch sub-manifests from keppel
drochow Oct 8, 2024
718cbf2
refactor: renamed method and added comment
drochow Oct 8, 2024
25259f4
refactor: combined two error cases into one condition
drochow Oct 8, 2024
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
62 changes: 49 additions & 13 deletions scanner/keppel/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func HandleAccount(fqdn string, account models.Account, keppelScanner *scanner.S
if err != nil {
log.WithFields(log.Fields{
"account:": account.Name,
}).WithError(err).Error("Error during ProcessRepository")
}).WithError(err).Error("Error during listing ProcessRepository")
return err
}

Expand Down Expand Up @@ -129,11 +129,34 @@ func HandleRepository(fqdn string, account models.Account, repository models.Rep
}).Error("Component not found")
return
}
if manifest.VulnerabilityStatus == "Unsupported" {
log.WithFields(log.Fields{
"account:": account.Name,
"repository": repository.Name,
}).Warn("Manifest has UNSUPPORTED type: " + manifest.MediaType)
continue
}
if manifest.VulnerabilityStatus == "Clean" {
log.WithFields(log.Fields{
"account:": account.Name,
"repository": repository.Name,
}).Info("Manifest has no Vulnerabilities")
continue
}
HandleManifest(account, repository, manifest, component, keppelScanner, keppelProcessor)
}
}

func HandleManifest(account models.Account, repository models.Repository, manifest models.Manifest, component *client.Component, keppelScanner *scanner.Scanner, keppelProcessor *processor.Processor) {
childManifests, err := keppelScanner.ListManifestsOfManifest(account.Name, repository.Name, manifest.Digest)
dorneanu marked this conversation as resolved.
Show resolved Hide resolved

if err != nil {
log.WithFields(log.Fields{
"account:": account.Name,
"repository": repository.Name,
}).WithError(err).Error("Error during ListManifestsOfManifest")
}

componentVersion, err := keppelProcessor.ProcessManifest(manifest, component.Id)
if err != nil {
Copy link
Collaborator

Choose a reason for hiding this comment

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

why not if err != nil || componentVersion == nil ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

done

log.WithFields(log.Fields{
Expand All @@ -146,20 +169,33 @@ func HandleManifest(account models.Account, repository models.Repository, manife
"account:": account.Name,
"repository": repository.Name,
}).WithError(err).Error("Error during GetComponentVersion")
return
}
if componentVersion == nil {
log.WithFields(log.Fields{
"account:": account.Name,
"repository": repository.Name,
}).WithError(err).Error("Error during GetComponentVersion")
return
}
}
trivyReport, err := keppelScanner.GetTrivyReport(account.Name, repository.Name, manifest.Digest)
if err != nil {
log.WithFields(log.Fields{
"account:": account.Name,
"repository": repository.Name,
}).WithError(err).Error("Error during GetTrivyReport")
return
}

if trivyReport == nil {
return
}
childManifests = append(childManifests, manifest)

keppelProcessor.ProcessReport(*trivyReport, componentVersion.Id)
for _, m := range childManifests {
trivyReport, err := keppelScanner.GetTrivyReport(account.Name, repository.Name, m.Digest)
if err != nil {
log.WithFields(log.Fields{
"account:": account.Name,
"repository": repository.Name,
}).WithError(err).Error("Error during GetTrivyReport")
return
}

if trivyReport == nil {
return
}

keppelProcessor.ProcessReport(*trivyReport, componentVersion.Id)
}
}
1 change: 1 addition & 0 deletions scanner/keppel/processor/processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ func (p *Processor) ProcessManifest(manifest models.Manifest, componentId string
})

if err != nil {
log.WithError(err).Error("Error while creating component")
return nil, err
}

Expand Down
31 changes: 31 additions & 0 deletions scanner/keppel/scanner/scanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,28 @@ func (s *Scanner) ListManifests(account string, repository string) ([]models.Man
return manifestResponse.Manifests, nil
}

func (s *Scanner) ListManifestsOfManifest(account string, repository string, manifest string) ([]models.Manifest, error) {
dorneanu marked this conversation as resolved.
Show resolved Hide resolved
url := fmt.Sprintf("%s/v2/%s/%s/manifests/%s", s.KeppelBaseUrl, account, repository, manifest)
body, err := s.sendRequest(url, s.AuthToken)
if err != nil {
log.WithFields(log.Fields{
"url": url,
}).WithError(err).Error("Error during request in ListManifests")
return nil, err
}

var manifestResponse models.ManifestResponse
if err = json.Unmarshal(body, &manifestResponse); err != nil {
log.WithFields(log.Fields{
"url": url,
"body": body,
}).WithError(err).Error("Error during unmarshal in ListManifests")
return nil, err
}

return manifestResponse.Manifests, nil
}

func (s *Scanner) GetTrivyReport(account string, repository string, manifest string) (*models.TrivyReport, error) {
url := fmt.Sprintf("%s/keppel/v1/accounts/%s/repositories/%s/_manifests/%s/trivy_report", s.KeppelBaseUrl, account, repository, manifest)
body, err := s.sendRequest(url, s.AuthToken)
Expand All @@ -172,6 +194,14 @@ func (s *Scanner) GetTrivyReport(account string, repository string, manifest str

var trivyReport models.TrivyReport
if err = json.Unmarshal(body, &trivyReport); err != nil {
if strings.Contains(string(body), "not") {
log.WithFields(log.Fields{
"url": url,
"body": body,
}).Info("Trivy report not found")
return nil, fmt.Errorf("Trivy report not found")
}

log.WithFields(log.Fields{
"url": url,
"body": body,
Expand All @@ -195,6 +225,7 @@ func (s *Scanner) sendRequest(url string, token string) ([]byte, error) {
}

resp, err := client.Do(req)

if err != nil {
return nil, err
}
Expand Down
Loading