-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cmd/vulnreport: add command unexclude
Command `vulnreport unexclude` converts an excluded report to a regular report. Will be used as part of an experiment to add back reports that were previously excluded from vulndb. Change-Id: I420a8262144fe6b0f459cb1a8438062931a15700 Reviewed-on: https://go-review.googlesource.com/c/vulndb/+/559815 Reviewed-by: Damien Neil <dneil@google.com> Reviewed-by: Zvonimir Pavlinovic <zpavlinovic@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
- Loading branch information
Showing
3 changed files
with
120 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // Copyright 2024 The Go Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style | ||
| // license that can be found in the LICENSE file. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
|
|
||
| "golang.org/x/vulndb/cmd/vulnreport/log" | ||
| "golang.org/x/vulndb/internal/derrors" | ||
| "golang.org/x/vulndb/internal/genai" | ||
| "golang.org/x/vulndb/internal/ghsa" | ||
| "golang.org/x/vulndb/internal/proxy" | ||
| "golang.org/x/vulndb/internal/report" | ||
| ) | ||
|
|
||
| // unexclude converts an excluded report into a regular report. | ||
| func unexclude(ctx context.Context, filename string, gc *ghsa.Client, pc *proxy.Client, ac *genai.GeminiClient) (err error) { | ||
| defer derrors.Wrap(&err, "unexclude(%s)", filename) | ||
|
|
||
| log.Infof("unexclude %s", filename) | ||
|
|
||
| r, err := report.Read(filename) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if !r.IsExcluded() { | ||
| log.Infof("report %s is not excluded, can't unexclude", r.ID) | ||
| return nil | ||
| } | ||
|
|
||
| // Usually, we only unexclude reports that are effectively private or not importable. | ||
| if r.Excluded != "EFFECTIVELY_PRIVATE" && r.Excluded != "NOT_IMPORTABLE" { | ||
| if *force { | ||
| log.Warnf("report %s is excluded for reason %q, but -f was specified, continuing", r.ID, r.Excluded) | ||
| } else { | ||
| log.Infof("report %s is excluded for reason %q - we don't unexclude these report types (use -f to force)", r.ID, r.Excluded) | ||
| return nil | ||
| } | ||
| } | ||
|
|
||
| log.Infof("creating regular report based on excluded report %s", filename) | ||
| aliases := r.Aliases() | ||
| id := r.ID | ||
| var modulePath string | ||
| if len(r.Modules) > 0 { | ||
| modulePath = r.Modules[0].Module | ||
| } | ||
| newR, err := reportFromAliases(ctx, id, modulePath, aliases, pc, gc, ac) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Remove description because this is a "basic" report. | ||
| newR.Description = "" | ||
|
|
||
| if err := os.Remove(filename); err != nil { | ||
| log.Errf("could not remove excluded report: %v", err) | ||
| } | ||
| log.Infof("removed excluded report %s", filename) | ||
|
|
||
| newFilename, err := writeReport(newR) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| log.Out(newFilename) | ||
|
|
||
| return nil | ||
| } |