gitea-mirror/trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2025-12-21 14:50:53 -08:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Fix output to use templates when in client server mode. (#469)

Browse Source 
Signed-off-by: Simarpreet Singh <simar@linux.com>
This commit is contained in:
Simarpreet Singh
2020-04-22 13:38:48 -07:00
committed by GitHub
parent 17b84f6c09
commit ad0bb7ce23
4 changed files with 264 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
integration/client_server_test.go
View File

@@ -18,18 +18,21 @@ import (
"github.com/stretchr/testify/require"
)
type args struct {
Format string
TemplatePath string
Version string
IgnoreUnfixed bool
Severity []string
IgnoreIDs []string
Input string
ClientToken string
ClientTokenHeader string
ServerToken string
ServerTokenHeader string
}
func TestClientServer(t *testing.T) {
type args struct {
Version string
IgnoreUnfixed bool
Severity []string
IgnoreIDs []string
Input string
ClientToken string
ClientTokenHeader string
ServerToken string
ServerTokenHeader string
}
cases := []struct {
name string
testArgs args
@@ -85,6 +88,16 @@ func TestClientServer(t *testing.T) {
},
golden: "testdata/alpine-310-ignore-cveids.json.golden",
},
{
name: "alpine 3.10 integration with gitlab template",
testArgs: args{
Format: "template",
TemplatePath: "@../contrib/gitlab.tpl",
Version: "dev",
Input: "testdata/fixtures/alpine-310.tar.gz",
},
golden: "testdata/alpine-310.gitlab.golden",
},
{
name: "alpine 3.9 integration",
testArgs: args{
@@ -345,8 +358,7 @@ func TestClientServer(t *testing.T) {
app := internal.NewApp(c.testArgs.Version)
app.Writer = ioutil.Discard
osArgs, outputFile, cleanup := setupClient(t, c.testArgs.IgnoreUnfixed, c.testArgs.Severity,
c.testArgs.IgnoreIDs, addr, c.testArgs.ClientToken, c.testArgs.ClientTokenHeader, c.testArgs.Input, cacheDir, c.golden)
osArgs, outputFile, cleanup := setupClient(t, c.testArgs, addr, cacheDir, c.golden)
defer cleanup()
// Run Trivy client
@@ -379,35 +391,43 @@ func setupServer(addr, token, tokenHeader, cacheDir string) []string {
return osArgs
}
func setupClient(t *testing.T, ignoreUnfixed bool, severity, ignoreIDs []string,
addr, token, tokenHeader, input, cacheDir, golden string) ([]string, string, func()) {
func setupClient(t *testing.T, c args, addr string, cacheDir string, golden string) ([]string, string, func()) {
t.Helper()
osArgs := []string{"trivy", "client", "--cache-dir", cacheDir,
"--format", "json", "--remote", "http://" + addr}
if ignoreUnfixed {
osArgs := []string{"trivy", "client", "--cache-dir", cacheDir, "--remote", "http://" + addr}
if c.Format != "" {
osArgs = append(osArgs, "--format", c.Format)
if c.TemplatePath != "" {
osArgs = append(osArgs, "--template", c.TemplatePath)
}
} else {
osArgs = append(osArgs, "--format", "json")
}
if c.IgnoreUnfixed {
osArgs = append(osArgs, "--ignore-unfixed")
}
if len(severity) != 0 {
if len(c.Severity) != 0 {
osArgs = append(osArgs,
[]string{"--severity", strings.Join(severity, ",")}...,
[]string{"--severity", strings.Join(c.Severity, ",")}...,
)
}
var err error
var ignoreTmpDir string
if len(ignoreIDs) != 0 {
if len(c.IgnoreIDs) != 0 {
ignoreTmpDir, err = ioutil.TempDir("", "ignore")
require.NoError(t, err, "failed to create a temp dir")
trivyIgnore := filepath.Join(ignoreTmpDir, ".trivyignore")
err = ioutil.WriteFile(trivyIgnore, []byte(strings.Join(ignoreIDs, "\n")), 0444)
err = ioutil.WriteFile(trivyIgnore, []byte(strings.Join(c.IgnoreIDs, "\n")), 0444)
require.NoError(t, err, "failed to write .trivyignore")
osArgs = append(osArgs, []string{"--ignorefile", trivyIgnore}...)
}
if token != "" {
osArgs = append(osArgs, []string{"--token", token, "--token-header", tokenHeader}...)
if c.ClientToken != "" {
osArgs = append(osArgs, []string{"--token", c.ClientToken, "--token-header", c.ClientTokenHeader}...)
}
if input != "" {
osArgs = append(osArgs, []string{"--input", input}...)
if c.Input != "" {
osArgs = append(osArgs, []string{"--input", c.Input}...)
}
// Setup the output file