From f2954a7cb0523f799f21c2cdcf0f91c35b5f700d Mon Sep 17 00:00:00 2001
From: masahiro331 <m_fujimura@r.recruit.co.jp>
Date: Fri, 10 May 2019 17:11:30 +0900
Subject: [PATCH] Add options

---
 cmd/remic/main.go   | 13 +++++++++++++
 pkg/remic/run.go    | 21 +++++++++++++++++----
 pkg/scanner/scan.go |  4 ++--
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/cmd/remic/main.go b/cmd/remic/main.go
index b6c2c96b5b20..f48398705aef 100644
--- a/cmd/remic/main.go
+++ b/cmd/remic/main.go
@@ -50,6 +50,19 @@ OPTIONS:
 			Name:  "output, o",
 			Usage: "output file name",
 		},
+		cli.IntFlag{
+			Name:  "exit-code",
+			Usage: "Exit code when vulnerabilities were found",
+			Value: 0,
+		},
+		cli.BoolFlag{
+			Name:  "skip-update",
+			Usage: "skip db update",
+		},
+		cli.BoolFlag{
+			Name:  "ignore-unfixed",
+			Usage: "display only fixed vulnerabilities",
+		},
 		cli.BoolFlag{
 			Name:  "debug, d",
 			Usage: "debug mode",
diff --git a/pkg/remic/run.go b/pkg/remic/run.go
index ea3eac0576c1..df4fcf442a15 100644
--- a/pkg/remic/run.go
+++ b/pkg/remic/run.go
@@ -27,7 +27,8 @@ func Run(c *cli.Context) (err error) {
 
 	args := c.Args()
 	if len(args) == 0 {
-		return xerrors.New(`remic" requires at least 1 argument.`)
+		log.Logger.Info(`remic" requires at least 1 argument.`)
+		cli.ShowAppHelpAndExit(c, 1)
 	}
 
 	o := c.String("output")
@@ -51,8 +52,10 @@ func Run(c *cli.Context) (err error) {
 		return err
 	}
 
-	if err = vulnsrc.Update(); err != nil {
-		return err
+	if !c.Bool("skip-update") {
+		if err = vulnsrc.Update(); err != nil {
+			return xerrors.Errorf("error in vulnerability DB update: %w", err)
+		}
 	}
 
 	fileName := args[0]
@@ -62,7 +65,8 @@ func Run(c *cli.Context) (err error) {
 	}
 	defer f.Close()
 
-	result, err := scanner.ScanFile(f, severities)
+	ignoreUnfixed := c.Bool("ignore-unfixed")
+	result, err := scanner.ScanFile(f, severities, ignoreUnfixed)
 	if err != nil {
 		return xerrors.Errorf("failed to scan a file: %w", err)
 	}
@@ -81,5 +85,14 @@ func Run(c *cli.Context) (err error) {
 		return xerrors.Errorf("failed to write results: %w", err)
 	}
 
+	exitCode := c.Int("exit-code")
+	if exitCode != 0 {
+		for _, result := range []report.Result{result} {
+			if len(result.Vulnerabilities) > 0 {
+				os.Exit(exitCode)
+			}
+		}
+	}
+
 	return nil
 }
diff --git a/pkg/scanner/scan.go b/pkg/scanner/scan.go
index 00de1c9c7f82..2191204513f3 100644
--- a/pkg/scanner/scan.go
+++ b/pkg/scanner/scan.go
@@ -95,14 +95,14 @@ func ScanImage(imageName, filePath string, severities []vulnerability.Severity,
 	return results, nil
 }
 
-func ScanFile(f *os.File, severities []vulnerability.Severity) (report.Result, error) {
+func ScanFile(f *os.File, severities []vulnerability.Severity, ignoreUnfixed bool) (report.Result, error) {
 	vulns, err := library.ScanFile(f)
 	if err != nil {
 		return report.Result{}, xerrors.Errorf("failed to scan libraries in file: %w", err)
 	}
 	result := report.Result{
 		FileName:        f.Name(),
-		Vulnerabilities: processVulnerabilties(vulns, severities, false),
+		Vulnerabilities: processVulnerabilties(vulns, severities, ignoreUnfixed),
 	}
 	return result, nil
 }