feat(config): Auto-upgrade Windows config.toml from v1 to v2 (#1726)

* add: README.md

* add: commands(discover,add-server,add-cpe)

* add: implements(discover,add-server,add-cpe)

* fix: changed os.Exit(1) in main.go to return an error

* fix: lint error

* delete: trivy-to-vuls stdIn

* fix: Incomprehesible error logs

* fix: according to review

* add: function converts old config to latest one

* delete: add-server

* fix: lint error

* fix

* fix: remote scan error in Windows

* fix: lint error

* fix

* fix: lint error

* fix: lint error

* add: scanner/scanner.go test normalizeHomeDirForWindows()

* fix

* fix

* fix

* fix: remove pointless assignment

* fix

---------

Co-authored-by: 和田皓翔 <wadahiroka@192.168.0.4>
Co-authored-by: 和田皓翔 <wadahiroka@192.168.0.10>
Co-authored-by: 和田皓翔 <wadahiroka@192.168.0.6>
This commit is contained in:
hiroka-wada
2023-09-21 16:48:35 +09:00
committed by GitHub
parent 80b48fcbaa
commit f6509a5376
7 changed files with 204 additions and 2 deletions

View File

@@ -4,6 +4,7 @@ import (
"fmt"
"net"
"regexp"
"runtime"
"strings"
"github.com/BurntSushi/toml"
@@ -12,6 +13,7 @@ import (
"golang.org/x/xerrors"
"github.com/future-architect/vuls/constant"
"github.com/future-architect/vuls/logging"
)
// TOMLLoader loads config
@@ -21,7 +23,15 @@ type TOMLLoader struct {
// Load load the configuration TOML file specified by path arg.
func (c TOMLLoader) Load(pathToToml string) error {
// util.Log.Infof("Loading config: %s", pathToToml)
if _, err := toml.DecodeFile(pathToToml, &Conf); err != nil {
if _, err := toml.DecodeFile(pathToToml, &ConfV1); err != nil {
return err
}
if ConfV1.Version != "v2" && runtime.GOOS == "windows" {
logging.Log.Infof("An outdated version of config.toml was detected. Converting to newer version...")
if err := convertToLatestConfig(pathToToml); err != nil {
return xerrors.Errorf("Failed to convert to latest config. err: %w", err)
}
} else if _, err := toml.DecodeFile(pathToToml, &Conf); err != nil {
return err
}