pepelyaevip/vuln-list-update
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

feat(glad): add ability to set custom repository uri (#136)

Browse Source
This commit is contained in:
Alan (Maciej) Paruszewski 2022-04-21 11:39:18 +02:00 committed by GitHub
parent bc6508033e
commit de6aced299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
glad/glad.go
View File

@ -16,8 +16,9 @@ import (
) )
const ( const (
repoURL = "https://gitlab.com/gitlab-org/advisories-community.git" repoURL = "https://gitlab.com/gitlab-org/advisories-community.git"
gladDir = "glad" // GitLab Advisory Database repoBranch = "main"
gladDir = "glad" // GitLab Advisory Database
) )
var ( var (
@ -26,16 +27,20 @@ var (
) )
type Updater struct { type Updater struct {
vulnListDir string alternativeRepoBranch string
cacheDir string alternativeRepoURL string
appFs afero.Fs vulnListDir string
cacheDir string
appFs afero.Fs
} }
func NewUpdater() Updater { func NewUpdater(alternativeRepoURL string, alternativeRepoBranch string) Updater {
return Updater{ return Updater{
vulnListDir: utils.VulnListDir(), alternativeRepoBranch: alternativeRepoBranch,
cacheDir: utils.CacheDir(), alternativeRepoURL: alternativeRepoURL,
appFs: afero.NewOsFs(), vulnListDir: utils.VulnListDir(),
cacheDir: utils.CacheDir(),
appFs: afero.NewOsFs(),
} }
} }
@ -44,7 +49,18 @@ func (u Updater) Update() error {
gc := git.Config{} gc := git.Config{}
dir := filepath.Join(u.cacheDir, gladDir) dir := filepath.Join(u.cacheDir, gladDir)
if _, err := gc.CloneOrPull(repoURL, dir, "main", false); err != nil { defaultOrAlternativeRepoURL := repoURL
defaultOrAlternativeRepoBranch := repoBranch
if len(u.alternativeRepoURL) > 0 {
defaultOrAlternativeRepoURL = u.alternativeRepoURL
}
if len(u.alternativeRepoBranch) > 0 {
defaultOrAlternativeRepoBranch = u.alternativeRepoBranch
}
if _, err := gc.CloneOrPull(defaultOrAlternativeRepoURL, dir, defaultOrAlternativeRepoBranch, false); err != nil {
return xerrors.Errorf("failed to clone or pull: %w", err) return xerrors.Errorf("failed to clone or pull: %w", err)
} }

6
main.go
View File

@ -47,7 +47,9 @@ const (
var ( var (
target = flag.String("target", "", "update target (nvd, alpine, alpine-unfixed, redhat, redhat-oval, "+ target = flag.String("target", "", "update target (nvd, alpine, alpine-unfixed, redhat, redhat-oval, "+
"debian, debian-oval, ubuntu, amazon, oracle-oval, suse-cvrf, photon, arch-linux, ghsa, glad, cwe, osv, go-vulndb, mariner)") "debian, debian-oval, ubuntu, amazon, oracle-oval, suse-cvrf, photon, arch-linux, ghsa, glad, cwe, osv, go-vulndb, mariner)")
years = flag.String("years", "", "update years (only redhat)") years = flag.String("years", "", "update years (only redhat)")
targetUri = flag.String("target-uri", "", "alternative repository URI (only glad)")
targetBranch = flag.String("target-branch", "", "alternative repository branch (only glad)")
) )
func main() { func main() {
@ -174,7 +176,7 @@ func run() error {
} }
commitMsg = "GitHub Security Advisory" commitMsg = "GitHub Security Advisory"
case "glad": case "glad":
gu := glad.NewUpdater() gu := glad.NewUpdater(*targetUri, *targetBranch)
if err := gu.Update(); err != nil { if err := gu.Update(); err != nil {
return xerrors.Errorf("GitLab Advisory Database update error: %w", err) return xerrors.Errorf("GitLab Advisory Database update error: %w", err)
} }