refactor(config): localize config used like a global variable (#1179)

* refactor(report): LocalFileWriter * refactor -format-json * refacotr: -format-one-email * refactor: -format-csv * refactor: -gzip * refactor: -format-full-text * refactor: -format-one-line-text * refactor: -format-list * refacotr: remove -to-* from config * refactor: IgnoreGitHubDismissed * refactor: GitHub * refactor: IgnoreUnsocred * refactor: diff * refacotr: lang * refacotr: cacheDBPath * refactor: Remove config references * refactor: ScanResults * refacotr: constant pkg * chore: comment * refactor: scanner * refactor: scanner * refactor: serverapi.go * refactor: serverapi * refactor: change pkg structure * refactor: serverapi.go * chore: remove emtpy file * fix(scan): remove -ssh-native-insecure option * fix(scan): remove the deprecated option `keypassword`
2021-02-25 05:54:17 +09:00
parent e3c27e1817
commit 03579126fd
91 changed files with 1759 additions and 1987 deletions
--- a/oval/alpine.go
+++ b/oval/alpine.go
@@ -4,6 +4,7 @@ package oval

 import (
 	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/constant"
 	"github.com/future-architect/vuls/models"
 	"github.com/future-architect/vuls/util"
 	"github.com/kotakanbe/goval-dictionary/db"
@@ -18,7 +19,7 @@ type Alpine struct {
 func NewAlpine() Alpine {
 	return Alpine{
 		Base{
-			family: config.Alpine,
+			family: constant.Alpine,
 		},
 	}
 }
--- a/oval/debian.go
+++ b/oval/debian.go
@@ -7,6 +7,7 @@ import (
 	"strings"

 	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/constant"
 	"github.com/future-architect/vuls/models"
 	"github.com/future-architect/vuls/util"
 	"github.com/kotakanbe/goval-dictionary/db"
@@ -40,7 +41,7 @@ func (o DebianBase) update(r *models.ScanResult, defPacks defPacks) {
 				defPacks.def.Debian.CveID)
 			cveContents = models.CveContents{}
 		}
-		if r.Family != config.Raspbian {
+		if r.Family != constant.Raspbian {
 			vinfo.Confidences.AppendIfMissing(models.OvalMatch)
 		} else {
 			if len(vinfo.Confidences) == 0 {
@@ -113,7 +114,7 @@ func NewDebian() Debian {
 	return Debian{
 		DebianBase{
 			Base{
-				family: config.Debian,
+				family: constant.Debian,
 			},
 		},
 	}
@@ -140,7 +141,7 @@ func (o Debian) FillWithOval(driver db.DB, r *models.ScanResult) (nCVEs int, err

 	var relatedDefs ovalResult
 	if config.Conf.OvalDict.IsFetchViaHTTP() {
-		if r.Family != config.Raspbian {
+		if r.Family != constant.Raspbian {
 			if relatedDefs, err = getDefsByPackNameViaHTTP(r); err != nil {
 				return 0, err
 			}
@@ -152,7 +153,7 @@ func (o Debian) FillWithOval(driver db.DB, r *models.ScanResult) (nCVEs int, err
 			}
 		}
 	} else {
-		if r.Family != config.Raspbian {
+		if r.Family != constant.Raspbian {
 			if relatedDefs, err = getDefsByPackNameFromOvalDB(driver, r); err != nil {
 				return 0, err
 			}
@@ -203,7 +204,7 @@ func NewUbuntu() Ubuntu {
 	return Ubuntu{
 		DebianBase{
 			Base{
-				family: config.Ubuntu,
+				family: constant.Ubuntu,
 			},
 		},
 	}
--- a/oval/redhat.go
+++ b/oval/redhat.go
@@ -8,6 +8,7 @@ import (
 	"strings"

 	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/constant"
 	"github.com/future-architect/vuls/models"
 	"github.com/future-architect/vuls/util"
 	"github.com/kotakanbe/goval-dictionary/db"
@@ -143,7 +144,7 @@ func (o RedHatBase) update(r *models.ScanResult, defPacks defPacks) (nCVEs int)

 func (o RedHatBase) convertToDistroAdvisory(def *ovalmodels.Definition) *models.DistroAdvisory {
 	advisoryID := def.Title
-	if (o.family == config.RedHat || o.family == config.CentOS) && len(advisoryID) > 0 {
+	if (o.family == constant.RedHat || o.family == constant.CentOS) && len(advisoryID) > 0 {
 		ss := strings.Fields(def.Title)
 		advisoryID = strings.TrimSuffix(ss[0], ":")
 	}
@@ -250,7 +251,7 @@ func NewRedhat() RedHat {
 	return RedHat{
 		RedHatBase{
 			Base{
-				family: config.RedHat,
+				family: constant.RedHat,
 			},
 		},
 	}
@@ -266,7 +267,7 @@ func NewCentOS() CentOS {
 	return CentOS{
 		RedHatBase{
 			Base{
-				family: config.CentOS,
+				family: constant.CentOS,
 			},
 		},
 	}
@@ -282,7 +283,7 @@ func NewOracle() Oracle {
 	return Oracle{
 		RedHatBase{
 			Base{
-				family: config.Oracle,
+				family: constant.Oracle,
 			},
 		},
 	}
@@ -299,7 +300,7 @@ func NewAmazon() Amazon {
 	return Amazon{
 		RedHatBase{
 			Base{
-				family: config.Amazon,
+				family: constant.Amazon,
 			},
 		},
 	}
--- a/oval/suse.go
+++ b/oval/suse.go
@@ -4,6 +4,7 @@ package oval

 import (
 	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/constant"
 	"github.com/future-architect/vuls/models"
 	"github.com/future-architect/vuls/util"
 	"github.com/kotakanbe/goval-dictionary/db"
@@ -20,7 +21,7 @@ func NewSUSE() SUSE {
 	// TODO implement other family
 	return SUSE{
 		Base{
-			family: config.SUSEEnterpriseServer,
+			family: constant.SUSEEnterpriseServer,
 		},
 	}
 }
--- a/oval/util.go
+++ b/oval/util.go
@@ -10,6 +10,7 @@ import (

 	"github.com/cenkalti/backoff"
 	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/constant"
 	"github.com/future-architect/vuls/models"
 	"github.com/future-architect/vuls/util"
 	apkver "github.com/knqyf263/go-apk-version"
@@ -300,7 +301,7 @@ func isOvalDefAffected(def ovalmodels.Definition, req request, family string, ru

 		if running.Release != "" {
 			switch family {
-			case config.RedHat, config.CentOS:
+			case constant.RedHat, constant.CentOS:
 				// For kernel related packages, ignore OVAL information with different major versions
 				if _, ok := kernelRelatedPackNames[ovalPack.Name]; ok {
 					if util.Major(ovalPack.Version) != util.Major(running.Release) {
@@ -329,12 +330,12 @@ func isOvalDefAffected(def ovalmodels.Definition, req request, family string, ru

 			// If the version of installed is less than in OVAL
 			switch family {
-			case config.RedHat,
-				config.Amazon,
-				config.SUSEEnterpriseServer,
-				config.Debian,
-				config.Ubuntu,
-				config.Raspbian:
+			case constant.RedHat,
+				constant.Amazon,
+				constant.SUSEEnterpriseServer,
+				constant.Debian,
+				constant.Ubuntu,
+				constant.Raspbian:
 				// Use fixed state in OVAL for these distros.
 				return true, false, ovalPack.Version
 			}
@@ -365,9 +366,9 @@ func isOvalDefAffected(def ovalmodels.Definition, req request, family string, ru

 func lessThan(family, newVer string, packInOVAL ovalmodels.Package) (bool, error) {
 	switch family {
-	case config.Debian,
-		config.Ubuntu,
-		config.Raspbian:
+	case constant.Debian,
+		constant.Ubuntu,
+		constant.Raspbian:
 		vera, err := debver.NewVersion(newVer)
 		if err != nil {
 			return false, err
@@ -378,7 +379,7 @@ func lessThan(family, newVer string, packInOVAL ovalmodels.Package) (bool, error
 		}
 		return vera.LessThan(verb), nil

-	case config.Alpine:
+	case constant.Alpine:
 		vera, err := apkver.NewVersion(newVer)
 		if err != nil {
 			return false, err
@@ -389,15 +390,15 @@ func lessThan(family, newVer string, packInOVAL ovalmodels.Package) (bool, error
 		}
 		return vera.LessThan(verb), nil

-	case config.Oracle,
-		config.SUSEEnterpriseServer,
-		config.Amazon:
+	case constant.Oracle,
+		constant.SUSEEnterpriseServer,
+		constant.Amazon:
 		vera := rpmver.NewVersion(newVer)
 		verb := rpmver.NewVersion(packInOVAL.Version)
 		return vera.LessThan(verb), nil

-	case config.RedHat,
-		config.CentOS:
+	case constant.RedHat,
+		constant.CentOS:
 		vera := rpmver.NewVersion(centOSVersionToRHEL(newVer))
 		verb := rpmver.NewVersion(centOSVersionToRHEL(packInOVAL.Version))
 		return vera.LessThan(verb), nil
--- a/oval/util_test.go
+++ b/oval/util_test.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"testing"

-	"github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/constant"
 	"github.com/future-architect/vuls/models"
 	ovalmodels "github.com/kotakanbe/goval-dictionary/models"
 )
@@ -1030,7 +1030,7 @@ func TestIsOvalDefAffected(t *testing.T) {
 		// For kernel related packages, ignore OVAL with different major versions
 		{
 			in: in{
-				family: config.CentOS,
+				family: constant.CentOS,
 				def: ovalmodels.Definition{
 					AffectedPacks: []ovalmodels.Package{
 						{
@@ -1054,7 +1054,7 @@ func TestIsOvalDefAffected(t *testing.T) {
 		},
 		{
 			in: in{
-				family: config.CentOS,
+				family: constant.CentOS,
 				def: ovalmodels.Definition{
 					AffectedPacks: []ovalmodels.Package{
 						{
@@ -1080,7 +1080,7 @@ func TestIsOvalDefAffected(t *testing.T) {
 		// dnf module
 		{
 			in: in{
-				family: config.RedHat,
+				family: constant.RedHat,
 				def: ovalmodels.Definition{
 					AffectedPacks: []ovalmodels.Package{
 						{
@@ -1106,7 +1106,7 @@ func TestIsOvalDefAffected(t *testing.T) {
 		// dnf module 2
 		{
 			in: in{
-				family: config.RedHat,
+				family: constant.RedHat,
 				def: ovalmodels.Definition{
 					AffectedPacks: []ovalmodels.Package{
 						{
@@ -1131,7 +1131,7 @@ func TestIsOvalDefAffected(t *testing.T) {
 		// dnf module 3
 		{
 			in: in{
-				family: config.RedHat,
+				family: constant.RedHat,
 				def: ovalmodels.Definition{
 					AffectedPacks: []ovalmodels.Package{
 						{