refactor: don't use global Config in private func (#1197)

* refactor: cve_client.go

* refactor: don't use global Config in private func

* remove import alias for config

* refactor: dbclient

* refactor: resultDir

* refactor: resultsDir

* refactor

* refactor: gost

* refactor: db client

* refactor: cveDB

* refactor: cvedb

* refactor: exploitDB

* refactor: remove detector/dbclient.go

* refactor: writer

* refactor: syslog writer

* refactor: ips

* refactor: ensureResultDir

* refactor: proxy

* fix(db): call CloseDB

* add integration test

* feat(report): sort array in json

* sort func for json diff

* add build-int to makefile

* add int-rds-redis to makefile

* fix: test case, makefile

* fix makefile

* show cve count after diff

* make diff

* diff -c

* sort exploits in json for diff

* sort metasploit, exploit

subcmds/configtest.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/google/subcommands"
 
-	c "github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/logging"
 	"github.com/future-architect/vuls/scanner"
 )
@@ -52,8 +52,8 @@ func (p *ConfigtestCmd) SetFlags(f *flag.FlagSet) {
 	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
 
 	defaultLogDir := logging.GetDefaultLogDir()
-	f.StringVar(&c.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
-	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
+	f.StringVar(&config.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
+	f.BoolVar(&config.Conf.Debug, "debug", false, "debug mode")
 
 	f.IntVar(&p.timeoutSec, "timeout", 5*60, "Timeout(Sec)")
 
@@ -61,16 +61,16 @@ func (p *ConfigtestCmd) SetFlags(f *flag.FlagSet) {
 		"Ask ssh privatekey password before scanning",
 	)
 
-	f.StringVar(&c.Conf.HTTPProxy, "http-proxy", "",
+	f.StringVar(&config.Conf.HTTPProxy, "http-proxy", "",
 		"http://proxy-url:port (default: empty)")
 
-	f.BoolVar(&c.Conf.Vvv, "vvv", false, "ssh -vvv")
+	f.BoolVar(&config.Conf.Vvv, "vvv", false, "ssh -vvv")
 }
 
 // Execute execute
 func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	logging.Log = logging.NewCustomLogger(c.Conf.Debug, c.Conf.Quiet, c.Conf.LogDir, "", "")
-	logging.Log.Infof("vuls-%s-%s", c.Version, c.Revision)
+	logging.Log = logging.NewCustomLogger(config.Conf.Debug, config.Conf.Quiet, config.Conf.LogDir, "", "")
+	logging.Log.Infof("vuls-%s-%s", config.Version, config.Revision)
 
 	if err := mkdirDotVuls(); err != nil {
 		logging.Log.Errorf("Failed to create $HOME/.vuls: %+v", err)
@@ -87,7 +87,7 @@ func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfa
 		}
 	}
 
-	err = c.Load(p.configPath, keyPass)
+	err = config.Load(p.configPath, keyPass)
 	if err != nil {
 		msg := []string{
 			fmt.Sprintf("Error loading %s", p.configPath),
@@ -103,10 +103,10 @@ func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfa
 		servernames = f.Args()
 	}
 
-	targets := make(map[string]c.ServerInfo)
+	targets := make(map[string]config.ServerInfo)
 	for _, arg := range servernames {
 		found := false
-		for servername, info := range c.Conf.Servers {
+		for servername, info := range config.Conf.Servers {
 			if servername == arg {
 				targets[servername] = info
 				found = true
@@ -120,14 +120,14 @@ func (p *ConfigtestCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interfa
 	}
 	if 0 < len(servernames) {
 		// if scan target servers are specified by args, set to the config
-		c.Conf.Servers = targets
+		config.Conf.Servers = targets
 	} else {
 		// if not specified by args, scan all servers in the config
-		targets = c.Conf.Servers
+		targets = config.Conf.Servers
 	}
 
 	logging.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnConfigtest() {
+	if !config.Conf.ValidateOnConfigtest() {
 		return subcommands.ExitUsageError
 	}
 

subcmds/history.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	c "github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/reporter"
 	"github.com/google/subcommands"
 )
@@ -35,17 +35,16 @@ func (*HistoryCmd) Usage() string {
 
 // SetFlags set flag
 func (p *HistoryCmd) SetFlags(f *flag.FlagSet) {
-	f.BoolVar(&c.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")
+	f.BoolVar(&config.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")
 
 	wd, _ := os.Getwd()
 	defaultResultsDir := filepath.Join(wd, "results")
-	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
+	f.StringVar(&config.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
 }
 
 // Execute execute
 func (p *HistoryCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-
-	dirs, err := reporter.ListValidJSONDirs()
+	dirs, err := reporter.ListValidJSONDirs(config.Conf.ResultsDir)
 	if err != nil {
 		return subcommands.ExitFailure
 	}

subcmds/report.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/aquasecurity/trivy/pkg/utils"
-	c "github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/detector"
 	"github.com/future-architect/vuls/logging"
 	"github.com/future-architect/vuls/models"
@@ -92,48 +92,48 @@ func (*ReportCmd) Usage() string {
 
 // SetFlags set flag
 func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
-	f.StringVar(&c.Conf.Lang, "lang", "en", "[en|ja]")
-	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
-	f.BoolVar(&c.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")
-	f.BoolVar(&c.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
-	f.BoolVar(&c.Conf.NoProgress, "no-progress", false, "Suppress progress bar")
+	f.StringVar(&config.Conf.Lang, "lang", "en", "[en|ja]")
+	f.BoolVar(&config.Conf.Debug, "debug", false, "debug mode")
+	f.BoolVar(&config.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")
+	f.BoolVar(&config.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
+	f.BoolVar(&config.Conf.NoProgress, "no-progress", false, "Suppress progress bar")
 
 	wd, _ := os.Getwd()
 	defaultConfPath := filepath.Join(wd, "config.toml")
 	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
 
 	defaultResultsDir := filepath.Join(wd, "results")
-	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
+	f.StringVar(&config.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
 
 	defaultLogDir := logging.GetDefaultLogDir()
-	f.StringVar(&c.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
+	f.StringVar(&config.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
 
-	f.BoolVar(&c.Conf.RefreshCve, "refresh-cve", false,
+	f.BoolVar(&config.Conf.RefreshCve, "refresh-cve", false,
 		"Refresh CVE information in JSON file under results dir")
 
-	f.Float64Var(&c.Conf.CvssScoreOver, "cvss-over", 0,
+	f.Float64Var(&config.Conf.CvssScoreOver, "cvss-over", 0,
 		"-cvss-over=6.5 means reporting CVSS Score 6.5 and over (default: 0 (means report all))")
 
-	f.BoolVar(&c.Conf.DiffMinus, "diff-minus", false,
+	f.BoolVar(&config.Conf.DiffMinus, "diff-minus", false,
 		"Minus Difference between previous result and current result")
 
-	f.BoolVar(&c.Conf.DiffPlus, "diff-plus", false,
+	f.BoolVar(&config.Conf.DiffPlus, "diff-plus", false,
 		"Plus Difference between previous result and current result")
 
-	f.BoolVar(&c.Conf.Diff, "diff", false,
+	f.BoolVar(&config.Conf.Diff, "diff", false,
 		"Plus & Minus Difference between previous result and current result")
 
-	f.BoolVar(&c.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
+	f.BoolVar(&config.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
 		"Don't report the unscored CVEs")
 
-	f.BoolVar(&c.Conf.IgnoreUnfixed, "ignore-unfixed", false,
+	f.BoolVar(&config.Conf.IgnoreUnfixed, "ignore-unfixed", false,
 		"Don't report the unfixed CVEs")
 
-	f.BoolVar(&c.Conf.IgnoreGitHubDismissed, "ignore-github-dismissed", false,
+	f.BoolVar(&config.Conf.IgnoreGitHubDismissed, "ignore-github-dismissed", false,
 		"Don't report the dismissed CVEs on GitHub Security Alerts")
 
 	f.StringVar(
-		&c.Conf.HTTPProxy, "http-proxy", "",
+		&config.Conf.HTTPProxy, "http-proxy", "",
 		"http://proxy-url:port (default: empty)")
 
 	f.BoolVar(&p.formatJSON, "format-json", false, "JSON format")
@@ -158,40 +158,40 @@ func (p *ReportCmd) SetFlags(f *flag.FlagSet) {
 		"Write report to Azure Storage blob (container/yyyyMMdd_HHmm/servername.json/txt)")
 
 	f.BoolVar(&p.gzip, "gzip", false, "gzip compression")
-	f.BoolVar(&c.Conf.Pipe, "pipe", false, "Use args passed via PIPE")
+	f.BoolVar(&config.Conf.Pipe, "pipe", false, "Use args passed via PIPE")
 
-	f.StringVar(&c.Conf.TrivyCacheDBDir, "trivy-cachedb-dir",
+	f.StringVar(&config.Conf.TrivyCacheDBDir, "trivy-cachedb-dir",
 		utils.DefaultCacheDir(), "/path/to/dir")
 }
 
 // Execute execute
 func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	logging.Log = logging.NewCustomLogger(c.Conf.Debug, c.Conf.Quiet, c.Conf.LogDir, "", "")
-	logging.Log.Infof("vuls-%s-%s", c.Version, c.Revision)
+	logging.Log = logging.NewCustomLogger(config.Conf.Debug, config.Conf.Quiet, config.Conf.LogDir, "", "")
+	logging.Log.Infof("vuls-%s-%s", config.Version, config.Revision)
 
-	if err := c.Load(p.configPath, ""); err != nil {
+	if err := config.Load(p.configPath, ""); err != nil {
 		logging.Log.Errorf("Error loading %s, %+v", p.configPath, err)
 		return subcommands.ExitUsageError
 	}
-	c.Conf.Slack.Enabled = p.toSlack
-	c.Conf.ChatWork.Enabled = p.toChatWork
-	c.Conf.Telegram.Enabled = p.toTelegram
-	c.Conf.EMail.Enabled = p.toEmail
-	c.Conf.Syslog.Enabled = p.toSyslog
-	c.Conf.AWS.Enabled = p.toS3
-	c.Conf.Azure.Enabled = p.toAzureBlob
-	c.Conf.HTTP.Enabled = p.toHTTP
+	config.Conf.Slack.Enabled = p.toSlack
+	config.Conf.ChatWork.Enabled = p.toChatWork
+	config.Conf.Telegram.Enabled = p.toTelegram
+	config.Conf.EMail.Enabled = p.toEmail
+	config.Conf.Syslog.Enabled = p.toSyslog
+	config.Conf.AWS.Enabled = p.toS3
+	config.Conf.Azure.Enabled = p.toAzureBlob
+	config.Conf.HTTP.Enabled = p.toHTTP
 
-	if c.Conf.Diff {
-		c.Conf.DiffPlus, c.Conf.DiffMinus = true, true
+	if config.Conf.Diff {
+		config.Conf.DiffPlus, config.Conf.DiffMinus = true, true
 	}
 
 	var dir string
 	var err error
-	if c.Conf.DiffPlus || c.Conf.DiffMinus {
-		dir, err = reporter.JSONDir([]string{})
+	if config.Conf.DiffPlus || config.Conf.DiffMinus {
+		dir, err = reporter.JSONDir(config.Conf.ResultsDir, []string{})
 	} else {
-		dir, err = reporter.JSONDir(f.Args())
+		dir, err = reporter.JSONDir(config.Conf.ResultsDir, f.Args())
 	}
 	if err != nil {
 		logging.Log.Errorf("Failed to read from JSON: %+v", err)
@@ -199,7 +199,7 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 	}
 
 	logging.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnReport() {
+	if !config.Conf.ValidateOnReport() {
 		return subcommands.ExitUsageError
 	}
 
@@ -233,28 +233,10 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 
 	for _, r := range res {
 		logging.Log.Debugf("%s: %s",
-			r.ServerInfo(), pp.Sprintf("%s", c.Conf.Servers[r.ServerName]))
+			r.ServerInfo(), pp.Sprintf("%s", config.Conf.Servers[r.ServerName]))
 	}
 
-	dbclient, err := detector.NewDBClient(
-		&c.Conf.CveDict,
-		&c.Conf.OvalDict,
-		&c.Conf.Gost,
-		&c.Conf.Exploit,
-		&c.Conf.Metasploit,
-		c.Conf.DebugSQL,
-	)
-	if err != nil {
-		logging.Log.Errorf("Failed to init DB Clients. err: %+v", err)
-		return subcommands.ExitFailure
-	}
-	defer func() {
-		for _, err := range dbclient.CloseDB() {
-			logging.Log.Errorf("Failed to CloseDB. err: %+v", err)
-		}
-	}()
-
-	if res, err = detector.Detect(*dbclient, res, dir); err != nil {
+	if res, err = detector.Detect(res, dir); err != nil {
 		logging.Log.Errorf("%+v", err)
 		return subcommands.ExitFailure
 	}
@@ -272,15 +254,17 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 	if p.toSlack {
 		reports = append(reports, reporter.SlackWriter{
 			FormatOneLineText: p.formatOneLineText,
+			Cnf:               config.Conf.Slack,
+			Proxy:             config.Conf.HTTPProxy,
 		})
 	}
 
 	if p.toChatWork {
-		reports = append(reports, reporter.ChatWorkWriter{})
+		reports = append(reports, reporter.ChatWorkWriter{Cnf: config.Conf.ChatWork, Proxy: config.Conf.HTTPProxy})
 	}
 
 	if p.toTelegram {
-		reports = append(reports, reporter.TelegramWriter{})
+		reports = append(reports, reporter.TelegramWriter{Cnf: config.Conf.Telegram})
 	}
 
 	if p.toEmail {
@@ -288,22 +272,23 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 			FormatOneEMail:    p.formatOneEMail,
 			FormatOneLineText: p.formatOneLineText,
 			FormatList:        p.formatList,
+			Cnf:               config.Conf.EMail,
 		})
 	}
 
 	if p.toSyslog {
-		reports = append(reports, reporter.SyslogWriter{})
+		reports = append(reports, reporter.SyslogWriter{Cnf: config.Conf.Syslog})
 	}
 
 	if p.toHTTP {
-		reports = append(reports, reporter.HTTPRequestWriter{})
+		reports = append(reports, reporter.HTTPRequestWriter{Proxy: config.Conf.HTTPProxy})
 	}
 
 	if p.toLocalFile {
 		reports = append(reports, reporter.LocalFileWriter{
 			CurrentDir:        dir,
-			DiffPlus:          c.Conf.DiffPlus,
-			DiffMinus:         c.Conf.DiffMinus,
+			DiffPlus:          config.Conf.DiffPlus,
+			DiffMinus:         config.Conf.DiffMinus,
 			FormatJSON:        p.formatJSON,
 			FormatCsv:         p.formatCsv,
 			FormatFullText:    p.formatFullText,
@@ -320,10 +305,10 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 			FormatOneLineText: p.formatOneLineText,
 			FormatList:        p.formatList,
 			Gzip:              p.gzip,
-			AWSConf:           c.Conf.AWS,
+			AWSConf:           config.Conf.AWS,
 		}
 		if err := w.Validate(); err != nil {
-			logging.Log.Errorf("Check if there is a bucket beforehand: %s, err: %+v", c.Conf.AWS.S3Bucket, err)
+			logging.Log.Errorf("Check if there is a bucket beforehand: %s, err: %+v", config.Conf.AWS.S3Bucket, err)
 			return subcommands.ExitUsageError
 		}
 		reports = append(reports, w)
@@ -336,10 +321,10 @@ func (p *ReportCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}
 			FormatOneLineText: p.formatOneLineText,
 			FormatList:        p.formatList,
 			Gzip:              p.gzip,
-			AzureConf:         c.Conf.Azure,
+			AzureConf:         config.Conf.Azure,
 		}
 		if err := w.Validate(); err != nil {
-			logging.Log.Errorf("Check if there is a container beforehand: %s, err: %+v", c.Conf.Azure.ContainerName, err)
+			logging.Log.Errorf("Check if there is a container beforehand: %s, err: %+v", config.Conf.Azure.ContainerName, err)
 			return subcommands.ExitUsageError
 		}
 		reports = append(reports, w)

subcmds/saas.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
-	c "github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/logging"
 	"github.com/future-architect/vuls/models"
 	"github.com/future-architect/vuls/reporter"
@@ -41,41 +41,41 @@ func (*SaaSCmd) Usage() string {
 
 // SetFlags set flag
 func (p *SaaSCmd) SetFlags(f *flag.FlagSet) {
-	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
-	f.BoolVar(&c.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
+	f.BoolVar(&config.Conf.Debug, "debug", false, "debug mode")
+	f.BoolVar(&config.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
 
 	wd, _ := os.Getwd()
 	defaultConfPath := filepath.Join(wd, "config.toml")
 	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
 
 	defaultResultsDir := filepath.Join(wd, "results")
-	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
+	f.StringVar(&config.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
 
 	defaultLogDir := logging.GetDefaultLogDir()
-	f.StringVar(&c.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
+	f.StringVar(&config.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
 
 	f.StringVar(
-		&c.Conf.HTTPProxy, "http-proxy", "",
+		&config.Conf.HTTPProxy, "http-proxy", "",
 		"http://proxy-url:port (default: empty)")
 }
 
 // Execute execute
 func (p *SaaSCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	logging.Log = logging.NewCustomLogger(c.Conf.Debug, c.Conf.Quiet, c.Conf.LogDir, "", "")
-	logging.Log.Infof("vuls-%s-%s", c.Version, c.Revision)
-	if err := c.Load(p.configPath, ""); err != nil {
+	logging.Log = logging.NewCustomLogger(config.Conf.Debug, config.Conf.Quiet, config.Conf.LogDir, "", "")
+	logging.Log.Infof("vuls-%s-%s", config.Version, config.Revision)
+	if err := config.Load(p.configPath, ""); err != nil {
 		logging.Log.Errorf("Error loading %s, %+v", p.configPath, err)
 		return subcommands.ExitUsageError
 	}
 
-	dir, err := reporter.JSONDir(f.Args())
+	dir, err := reporter.JSONDir(config.Conf.ResultsDir, f.Args())
 	if err != nil {
 		logging.Log.Errorf("Failed to read from JSON: %+v", err)
 		return subcommands.ExitFailure
 	}
 
 	logging.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnSaaS() {
+	if !config.Conf.ValidateOnSaaS() {
 		return subcommands.ExitUsageError
 	}
 
@@ -104,11 +104,11 @@ func (p *SaaSCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 
 	for _, r := range res {
 		logging.Log.Debugf("%s: %s",
-			r.ServerInfo(), pp.Sprintf("%s", c.Conf.Servers[r.ServerName]))
+			r.ServerInfo(), pp.Sprintf("%s", config.Conf.Servers[r.ServerName]))
 	}
 
 	// Ensure UUIDs of scan target servers in config.toml
-	if err := saas.EnsureUUIDs(c.Conf.Servers, p.configPath, res); err != nil {
+	if err := saas.EnsureUUIDs(config.Conf.Servers, p.configPath, res); err != nil {
 		logging.Log.Errorf("Failed to ensure UUIDs. err: %+v", err)
 		return subcommands.ExitFailure
 	}

subcmds/scan.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 
 	"github.com/asaskevich/govalidator"
-	c "github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/logging"
 	"github.com/future-architect/vuls/scanner"
 	"github.com/google/subcommands"
@@ -24,6 +24,7 @@ type ScanCmd struct {
 	timeoutSec     int
 	scanTimeoutSec int
 	cacheDBPath    string
+	detectIPS      bool
 }
 
 // Name return subcommand name
@@ -57,34 +58,34 @@ func (*ScanCmd) Usage() string {
 
 // SetFlags set flag
 func (p *ScanCmd) SetFlags(f *flag.FlagSet) {
-	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
-	f.BoolVar(&c.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
+	f.BoolVar(&config.Conf.Debug, "debug", false, "debug mode")
+	f.BoolVar(&config.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
 
 	wd, _ := os.Getwd()
 	defaultConfPath := filepath.Join(wd, "config.toml")
 	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
 
 	defaultResultsDir := filepath.Join(wd, "results")
-	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
+	f.StringVar(&config.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
 
 	defaultLogDir := logging.GetDefaultLogDir()
-	f.StringVar(&c.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
+	f.StringVar(&config.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
 
 	defaultCacheDBPath := filepath.Join(wd, "cache.db")
 	f.StringVar(&p.cacheDBPath, "cachedb-path", defaultCacheDBPath,
 		"/path/to/cache.db (local cache of changelog for Ubuntu/Debian)")
 
-	f.StringVar(&c.Conf.HTTPProxy, "http-proxy", "",
+	f.StringVar(&config.Conf.HTTPProxy, "http-proxy", "",
 		"http://proxy-url:port (default: empty)")
 
 	f.BoolVar(&p.askKeyPassword, "ask-key-password", false,
 		"Ask ssh privatekey password before scanning",
 	)
 
-	f.BoolVar(&c.Conf.Pipe, "pipe", false, "Use stdin via PIPE")
+	f.BoolVar(&config.Conf.Pipe, "pipe", false, "Use stdin via PIPE")
 
-	f.BoolVar(&c.Conf.DetectIPS, "ips", false, "retrieve IPS information")
-	f.BoolVar(&c.Conf.Vvv, "vvv", false, "ssh -vvv")
+	f.BoolVar(&p.detectIPS, "ips", false, "retrieve IPS information")
+	f.BoolVar(&config.Conf.Vvv, "vvv", false, "ssh -vvv")
 
 	f.IntVar(&p.timeoutSec, "timeout", 5*60,
 		"Number of seconds for processing other than scan",
@@ -97,8 +98,8 @@ func (p *ScanCmd) SetFlags(f *flag.FlagSet) {
 
 // Execute execute
 func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	logging.Log = logging.NewCustomLogger(c.Conf.Debug, c.Conf.Quiet, c.Conf.LogDir, "", "")
-	logging.Log.Infof("vuls-%s-%s", c.Version, c.Revision)
+	logging.Log = logging.NewCustomLogger(config.Conf.Debug, config.Conf.Quiet, config.Conf.LogDir, "", "")
+	logging.Log.Infof("vuls-%s-%s", config.Version, config.Revision)
 
 	if err := mkdirDotVuls(); err != nil {
 		logging.Log.Errorf("Failed to create $HOME/.vuls err: %+v", err)
@@ -123,7 +124,7 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		}
 	}
 
-	err = c.Load(p.configPath, keyPass)
+	err = config.Load(p.configPath, keyPass)
 	if err != nil {
 		msg := []string{
 			fmt.Sprintf("Error loading %s", p.configPath),
@@ -140,7 +141,7 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 	var servernames []string
 	if 0 < len(f.Args()) {
 		servernames = f.Args()
-	} else if c.Conf.Pipe {
+	} else if config.Conf.Pipe {
 		bytes, err := ioutil.ReadAll(os.Stdin)
 		if err != nil {
 			logging.Log.Errorf("Failed to read stdin. err: %+v", err)
@@ -152,10 +153,10 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 		}
 	}
 
-	targets := make(map[string]c.ServerInfo)
+	targets := make(map[string]config.ServerInfo)
 	for _, arg := range servernames {
 		found := false
-		for servername, info := range c.Conf.Servers {
+		for servername, info := range config.Conf.Servers {
 			if servername == arg {
 				targets[servername] = info
 				found = true
@@ -169,26 +170,28 @@ func (p *ScanCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{})
 	}
 	if 0 < len(servernames) {
 		// if scan target servers are specified by args, set to the config
-		c.Conf.Servers = targets
+		config.Conf.Servers = targets
 	} else {
 		// if not specified by args, scan all servers in the config
-		targets = c.Conf.Servers
+		targets = config.Conf.Servers
 	}
 	logging.Log.Debugf("%s", pp.Sprintf("%v", targets))
 
 	logging.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnScan() {
+	if !config.Conf.ValidateOnScan() {
 		return subcommands.ExitUsageError
 	}
 
 	s := scanner.Scanner{
+		ResultsDir:     config.Conf.ResultsDir,
 		TimeoutSec:     p.timeoutSec,
 		ScanTimeoutSec: p.scanTimeoutSec,
 		CacheDBPath:    p.cacheDBPath,
 		Targets:        targets,
-		Debug:          c.Conf.Debug,
-		Quiet:          c.Conf.Quiet,
-		LogDir:         c.Conf.LogDir,
+		Debug:          config.Conf.Debug,
+		Quiet:          config.Conf.Quiet,
+		LogDir:         config.Conf.LogDir,
+		DetectIPS:      p.detectIPS,
 	}
 
 	if err := s.Scan(); err != nil {

subcmds/server.go

@@ -10,10 +10,7 @@ import (
 	"os"
 	"path/filepath"
 
-	// "github.com/future-architect/vuls/Server"
-
-	c "github.com/future-architect/vuls/config"
-	"github.com/future-architect/vuls/detector"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/logging"
 	"github.com/future-architect/vuls/server"
 	"github.com/google/subcommands"
@@ -54,30 +51,30 @@ func (*ServerCmd) Usage() string {
 
 // SetFlags set flag
 func (p *ServerCmd) SetFlags(f *flag.FlagSet) {
-	f.StringVar(&c.Conf.Lang, "lang", "en", "[en|ja]")
-	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
-	f.BoolVar(&c.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")
+	f.StringVar(&config.Conf.Lang, "lang", "en", "[en|ja]")
+	f.BoolVar(&config.Conf.Debug, "debug", false, "debug mode")
+	f.BoolVar(&config.Conf.DebugSQL, "debug-sql", false, "SQL debug mode")
 
 	wd, _ := os.Getwd()
 	defaultConfPath := filepath.Join(wd, "config.toml")
 	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
 
 	defaultResultsDir := filepath.Join(wd, "results")
-	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
+	f.StringVar(&config.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
 
 	defaultLogDir := logging.GetDefaultLogDir()
-	f.StringVar(&c.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
+	f.StringVar(&config.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
 
-	f.Float64Var(&c.Conf.CvssScoreOver, "cvss-over", 0,
+	f.Float64Var(&config.Conf.CvssScoreOver, "cvss-over", 0,
 		"-cvss-over=6.5 means Servering CVSS Score 6.5 and over (default: 0 (means Server all))")
 
-	f.BoolVar(&c.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
+	f.BoolVar(&config.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
 		"Don't Server the unscored CVEs")
 
-	f.BoolVar(&c.Conf.IgnoreUnfixed, "ignore-unfixed", false,
+	f.BoolVar(&config.Conf.IgnoreUnfixed, "ignore-unfixed", false,
 		"Don't show the unfixed CVEs")
 
-	f.StringVar(&c.Conf.HTTPProxy, "http-proxy", "",
+	f.StringVar(&config.Conf.HTTPProxy, "http-proxy", "",
 		"http://proxy-url:port (default: empty)")
 
 	f.BoolVar(&p.toLocalFile, "to-localfile", false, "Write report to localfile")
@@ -87,38 +84,19 @@ func (p *ServerCmd) SetFlags(f *flag.FlagSet) {
 
 // Execute execute
 func (p *ServerCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	logging.Log = logging.NewCustomLogger(c.Conf.Debug, c.Conf.Quiet, c.Conf.LogDir, "", "")
-	logging.Log.Infof("vuls-%s-%s", c.Version, c.Revision)
-	if err := c.Load(p.configPath, ""); err != nil {
+	logging.Log = logging.NewCustomLogger(config.Conf.Debug, config.Conf.Quiet, config.Conf.LogDir, "", "")
+	logging.Log.Infof("vuls-%s-%s", config.Version, config.Revision)
+	if err := config.Load(p.configPath, ""); err != nil {
 		logging.Log.Errorf("Error loading %s. err: %+v", p.configPath, err)
 		return subcommands.ExitUsageError
 	}
 
 	logging.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnReport() {
+	if !config.Conf.ValidateOnReport() {
 		return subcommands.ExitUsageError
 	}
 
-	dbclient, err := detector.NewDBClient(
-		&c.Conf.CveDict,
-		&c.Conf.OvalDict,
-		&c.Conf.Gost,
-		&c.Conf.Exploit,
-		&c.Conf.Metasploit,
-		c.Conf.DebugSQL,
-	)
-	if err != nil {
-		logging.Log.Errorf("Failed to init DB Clients. err: %+v", err)
-		return subcommands.ExitFailure
-	}
-	defer func() {
-		for _, err := range dbclient.CloseDB() {
-			logging.Log.Errorf("Failed to CloseDB. err: %+v", err)
-		}
-	}()
-
 	http.Handle("/vuls", server.VulsHandler{
-		DBclient:    *dbclient,
 		ToLocalFile: p.toLocalFile,
 	})
 	http.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {

subcmds/tui.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/aquasecurity/trivy/pkg/utils"
-	c "github.com/future-architect/vuls/config"
+	"github.com/future-architect/vuls/config"
 	"github.com/future-architect/vuls/detector"
 	"github.com/future-architect/vuls/logging"
 	"github.com/future-architect/vuls/models"
@@ -56,70 +56,70 @@ func (*TuiCmd) Usage() string {
 // SetFlags set flag
 func (p *TuiCmd) SetFlags(f *flag.FlagSet) {
 	//  f.StringVar(&p.lang, "lang", "en", "[en|ja]")
-	f.BoolVar(&c.Conf.DebugSQL, "debug-sql", false, "debug SQL")
-	f.BoolVar(&c.Conf.Debug, "debug", false, "debug mode")
-	f.BoolVar(&c.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
-	f.BoolVar(&c.Conf.NoProgress, "no-progress", false, "Suppress progress bar")
+	f.BoolVar(&config.Conf.DebugSQL, "debug-sql", false, "debug SQL")
+	f.BoolVar(&config.Conf.Debug, "debug", false, "debug mode")
+	f.BoolVar(&config.Conf.Quiet, "quiet", false, "Quiet mode. No output on stdout")
+	f.BoolVar(&config.Conf.NoProgress, "no-progress", false, "Suppress progress bar")
 
 	defaultLogDir := logging.GetDefaultLogDir()
-	f.StringVar(&c.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
+	f.StringVar(&config.Conf.LogDir, "log-dir", defaultLogDir, "/path/to/log")
 
 	wd, _ := os.Getwd()
 	defaultResultsDir := filepath.Join(wd, "results")
-	f.StringVar(&c.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
+	f.StringVar(&config.Conf.ResultsDir, "results-dir", defaultResultsDir, "/path/to/results")
 
 	defaultConfPath := filepath.Join(wd, "config.toml")
 	f.StringVar(&p.configPath, "config", defaultConfPath, "/path/to/toml")
 
-	f.BoolVar(&c.Conf.RefreshCve, "refresh-cve", false,
+	f.BoolVar(&config.Conf.RefreshCve, "refresh-cve", false,
 		"Refresh CVE information in JSON file under results dir")
 
-	f.Float64Var(&c.Conf.CvssScoreOver, "cvss-over", 0,
+	f.Float64Var(&config.Conf.CvssScoreOver, "cvss-over", 0,
 		"-cvss-over=6.5 means reporting CVSS Score 6.5 and over (default: 0 (means report all))")
 
-	f.BoolVar(&c.Conf.Diff, "diff", false,
+	f.BoolVar(&config.Conf.Diff, "diff", false,
 		"Plus Difference between previous result and current result")
 
-	f.BoolVar(&c.Conf.DiffPlus, "diff-plus", false,
+	f.BoolVar(&config.Conf.DiffPlus, "diff-plus", false,
 		"Plus Difference between previous result and current result")
 
-	f.BoolVar(&c.Conf.DiffMinus, "diff-minus", false,
+	f.BoolVar(&config.Conf.DiffMinus, "diff-minus", false,
 		"Minus Difference between previous result and current result")
 
 	f.BoolVar(
-		&c.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
+		&config.Conf.IgnoreUnscoredCves, "ignore-unscored-cves", false,
 		"Don't report the unscored CVEs")
 
-	f.BoolVar(&c.Conf.IgnoreUnfixed, "ignore-unfixed", false,
+	f.BoolVar(&config.Conf.IgnoreUnfixed, "ignore-unfixed", false,
 		"Don't report the unfixed CVEs")
 
-	f.BoolVar(&c.Conf.Pipe, "pipe", false, "Use stdin via PIPE")
+	f.BoolVar(&config.Conf.Pipe, "pipe", false, "Use stdin via PIPE")
 
-	f.StringVar(&c.Conf.TrivyCacheDBDir, "trivy-cachedb-dir",
+	f.StringVar(&config.Conf.TrivyCacheDBDir, "trivy-cachedb-dir",
 		utils.DefaultCacheDir(), "/path/to/dir")
 }
 
 // Execute execute
 func (p *TuiCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) subcommands.ExitStatus {
-	logging.Log = logging.NewCustomLogger(c.Conf.Debug, c.Conf.Quiet, c.Conf.LogDir, "", "")
-	logging.Log.Infof("vuls-%s-%s", c.Version, c.Revision)
-	if err := c.Load(p.configPath, ""); err != nil {
+	logging.Log = logging.NewCustomLogger(config.Conf.Debug, config.Conf.Quiet, config.Conf.LogDir, "", "")
+	logging.Log.Infof("vuls-%s-%s", config.Version, config.Revision)
+	if err := config.Load(p.configPath, ""); err != nil {
 		logging.Log.Errorf("Error loading %s, err: %+v", p.configPath, err)
 		return subcommands.ExitUsageError
 	}
 
-	c.Conf.Lang = "en"
+	config.Conf.Lang = "en"
 
-	if c.Conf.Diff {
-		c.Conf.DiffPlus = true
-		c.Conf.DiffMinus = true
+	if config.Conf.Diff {
+		config.Conf.DiffPlus = true
+		config.Conf.DiffMinus = true
 	}
 	var dir string
 	var err error
-	if c.Conf.DiffPlus || c.Conf.DiffMinus {
-		dir, err = reporter.JSONDir([]string{})
+	if config.Conf.DiffPlus || config.Conf.DiffMinus {
+		dir, err = reporter.JSONDir(config.Conf.ResultsDir, []string{})
 	} else {
-		dir, err = reporter.JSONDir(f.Args())
+		dir, err = reporter.JSONDir(config.Conf.ResultsDir, f.Args())
 	}
 	if err != nil {
 		logging.Log.Errorf("Failed to read from JSON. err: %+v", err)
@@ -127,7 +127,7 @@ func (p *TuiCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
 	}
 
 	logging.Log.Info("Validating config...")
-	if !c.Conf.ValidateOnTui() {
+	if !config.Conf.ValidateOnReport() {
 		return subcommands.ExitUsageError
 	}
 
@@ -138,25 +138,7 @@ func (p *TuiCmd) Execute(_ context.Context, f *flag.FlagSet, _ ...interface{}) s
 	}
 	logging.Log.Infof("Loaded: %s", dir)
 
-	dbclient, err := detector.NewDBClient(
-		&c.Conf.CveDict,
-		&c.Conf.OvalDict,
-		&c.Conf.Gost,
-		&c.Conf.Exploit,
-		&c.Conf.Metasploit,
-		c.Conf.DebugSQL,
-	)
-	if err != nil {
-		logging.Log.Errorf("Failed to init DB Clients. err: %+v", err)
-		return subcommands.ExitFailure
-	}
-	defer func() {
-		for _, err := range dbclient.CloseDB() {
-			logging.Log.Errorf("Failed to CloseDB. err: %+v", err)
-		}
-	}()
-
-	if res, err = detector.Detect(*dbclient, res, dir); err != nil {
+	if res, err = detector.Detect(res, dir); err != nil {
 		logging.Log.Error(err)
 		return subcommands.ExitFailure
 	}