feat(trivy): Bump Trivy to v0.31.0 (#165 )

Fixes: https://github.com/aquasecurity/trivy-action/issues/164 Signed-off-by: Simar <simar@linux.com> Signed-off-by: Simar <simar@linux.com>
docs: correct format and add output on config scan with sarif (#159 )
2022-08-16 17:25:38 -07:00 · 2022-08-15 11:09:42 -07:00 · 2022-08-03 17:32:25 -07:00 · 2022-08-02 15:24:58 -07:00 · 2022-07-29 14:30:07 -07:00
14 changed files with 201 additions and 3426 deletions
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,7 +1,7 @@
 name: "build"
 on: [push, pull_request]
 env:
-  TRIVY_VERSION: 0.30.4
+  TRIVY_VERSION: 0.31.2
  BATS_LIB_PATH: '/usr/lib/'
 jobs:
  build:
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.test
 !test/data/*.test
 trivyignores
+.vscode/
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM ghcr.io/aquasecurity/trivy:0.30.4
+FROM ghcr.io/aquasecurity/trivy:0.31.2
 COPY entrypoint.sh /
 RUN apk --no-cache add bash curl
 RUN chmod +x /entrypoint.sh
--- a/4
+++ b/4
@@ -0,0 +1,4 @@
+.PHONY: test
+
+test:
+	BATS_LIB_PATH=/usr/local/lib/ bats -r .
--- a/README.md
+++ b/README.md
@@ -64,14 +64,14 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3

-    - name: Run Trivy vulnerability scanner in repo mode
-      uses: aquasecurity/trivy-action@add-support-for-trivy-config
+    - name: Run Trivy vulnerability scanner in fs mode
+      uses: aquasecurity/trivy-action@master
      with:
        scan-type: 'fs'
-        ignore-unfixed: true
-        trivy-config: ./trivy.yaml
+        scan-ref: '.'
+        trivy-config: trivy.yaml
 ```

 In this case `trivy.yaml` is a YAML configuration that is checked in as part of the repo. Detailed information is available on the Trivy website but an example is as follows:
@@ -81,7 +81,17 @@ exit-code: 1
 severity: CRITICAL
 ```

-It is possible to define all options in the `trivy.yaml` file. Specifying individual options via the action are left for backward compatibility purposes.
+It is possible to define all options in the `trivy.yaml` file. Specifying individual options via the action are left for backward compatibility purposes. Defining the following is required as they cannot be defined with the config file:
+- `scan-ref`: If using `fs, repo` scans.
+- `image-ref`: If using `image` scan.
+- `scan-type`: To define the scan type, e.g. `image`, `fs`, `repo`, etc.
+
+#### Order of prerference for options
+Trivy uses [Viper](https://github.com/spf13/viper) which has a defined precedence order for options. The order is as follows:
+- GitHub Action flag
+- Environment variable
+- Config file
+- Default

 ### Scanning a Tarball
 ```yaml
@@ -97,7 +107,7 @@ jobs:
    runs-on: ubuntu-20.04
    steps:
    - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3

    - name: Generate tarball from image
      run: |
@@ -123,10 +133,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Build an image from Dockerfile
        run: |
@@ -158,10 +168,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Build an image from Dockerfile
        run: |
@@ -197,10 +207,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner in repo mode
        uses: aquasecurity/trivy-action@master
@@ -231,10 +241,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner with rootfs command
        uses: aquasecurity/trivy-action@master
@@ -266,17 +276,18 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner in IaC mode
        uses: aquasecurity/trivy-action@master
        with:
          scan-type: 'config'
          hide-progress: false
-          format: 'table'
+          format: 'sarif'
+          output: 'trivy-results.sarif'
          exit-code: '1'
          ignore-unfixed: true
          severity: 'CRITICAL,HIGH'
@@ -335,10 +346,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner
        uses: aquasecurity/trivy-action@master
@@ -371,10 +382,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner
        uses: aquasecurity/trivy-action@master
@@ -407,10 +418,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner
        uses: aquasecurity/trivy-action@master
@@ -440,10 +451,10 @@ on:
 jobs:
  build:
    name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    steps:
      - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Run Trivy vulnerability scanner
        uses: aquasecurity/trivy-action@master
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -111,6 +111,7 @@ if [ $vulnType ] && [ "$scanType" != "config" ] && [ "$scanType" != "sbom" ];the
 fi
 if [ $securityChecks ];then
  ARGS="$ARGS --security-checks $securityChecks"
+  SARIF_ARGS="$SARIF_ARGS --security-checks $securityChecks"
 fi
 if [ $severity ];then
  ARGS="$ARGS --severity $severity"
@@ -141,6 +142,7 @@ if [ $trivyIgnores ];then
 fi
 if [ $timeout ];then
  ARGS="$ARGS --timeout $timeout"
+  SARIF_ARGS="$SARIF_ARGS --timeout $timeout"
 fi
 if [ $ignorePolicy ];then
  ARGS="$ARGS --ignore-policy $ignorePolicy"
@@ -164,12 +166,12 @@ fi
 trivyConfig=$(echo $trivyConfig | tr -d '\r')
 if [ $trivyConfig ]; then
   echo "Running Trivy with trivy.yaml config from: " $trivyConfig
-   trivy --config $trivyConfig ${scanType} $ARGS ${artifactRef}
+   trivy --config $trivyConfig ${scanType} ${artifactRef}
   returnCode=$?
 else
-   echo "Running trivy with options: ${ARGS}" "${artifactRef}"
+   echo "Running trivy with options: trivy ${scanType} ${ARGS}" "${artifactRef}"
   echo "Global options: " "${GLOBAL_ARGS}"
-   trivy $GLOBAL_ARGS ${scanType} $ARGS ${artifactRef}
+   trivy $GLOBAL_ARGS ${scanType} ${ARGS} ${artifactRef}
   returnCode=$?
 fi

@@ -181,9 +183,13 @@ if [[ "${format}" == "sarif" ]]; then
  trivy --quiet ${scanType} --format sarif --output ${output} $SARIF_ARGS ${artifactRef}
 fi

-if [[ "${format}" == "github" ]] && [[ "$(echo $githubPAT | xargs)" != "" ]]; then
-  echo "Uploading GitHub Dependency Snapshot"
-  curl -u "${githubPAT}" -H 'Content-Type: application/json' 'https://api.github.com/repos/'$GITHUB_REPOSITORY'/dependency-graph/snapshots' -d @./$(echo $output | xargs)
+if [[ "${format}" == "github" ]]; then
+  if [[ "$(echo $githubPAT | xargs)" != "" ]]; then
+    printf "\n Uploading GitHub Dependency Snapshot"
+    curl -u "${githubPAT}" -H 'Content-Type: application/json' 'https://api.github.com/repos/'$GITHUB_REPOSITORY'/dependency-graph/snapshots' -d @./$(echo $output | xargs)
+  else
+    printf "\n Failing GitHub Dependency Snapshot. Missing github-pat"
+  fi
 fi

 exit $returnCode
--- a/test/data/config-sarif.test
+++ b/test/data/config-sarif.test
@@ -37,7 +37,7 @@
              }
            }
          ],
-          "version": "0.30.4"
+          "version": "0.31.2"
        }
      },
      "results": [
--- a/test/data/image-sarif.test
+++ b/test/data/image-sarif.test
--- a/test/data/image-trivyignores.test
+++ b/test/data/image-trivyignores.test
@@ -8,8 +8,8 @@ Total: 19 (CRITICAL: 19)
 ├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
 │ curl        │ CVE-2018-14618 │ CRITICAL │ 7.61.0-r0         │ 7.61.1-r0     │ curl: NTLM password overflow via integer overflow            │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-14618                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ curl        │ CVE-2018-16839 │ CRITICAL │ 7.61.0-r0         │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2018-16839 │          │                   │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
 │             │                │          │                   │               │ in Curl_sasl_create_plain_message()                          │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16839                   │
 │             ├────────────────┤          │                   │               ├──────────────────────────────────────────────────────────────┤
@@ -20,8 +20,8 @@ Total: 19 (CRITICAL: 19)
 │             │ CVE-2018-16842 │          │                   │               │ curl: Heap-based buffer over-read in the curl tool warning   │
 │             │                │          │                   │               │ formatting                                                   │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16842                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ curl        │ CVE-2019-3822  │ CRITICAL │ 7.61.0-r0         │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2019-3822  │          │                   │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-3822                    │
 │             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
 │             │ CVE-2019-5481  │          │                   │ 7.61.1-r3     │ curl: double free due to subsequent call of realloc()        │
@@ -32,15 +32,15 @@ Total: 19 (CRITICAL: 19)
 ├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
 │ git         │ CVE-2018-17456 │          │ 2.15.2-r0         │ 2.15.3-r0     │ git: arbitrary code execution via .gitmodules                │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-17456                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ git         │ CVE-2019-1353  │ CRITICAL │ 2.15.2-r0         │ 2.15.4-r0     │ git: NTFS protections inactive when running Git in the       │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2019-1353  │          │                   │ 2.15.4-r0     │ git: NTFS protections inactive when running Git in the       │
 │             │                │          │                   │               │ Windows Subsystem for...                                     │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-1353                    │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ libbz2      │ CVE-2019-12900 │ CRITICAL │ 1.0.6-r6          │ 1.0.6-r7      │ bzip2: out-of-bounds write in function BZ2_decompress        │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ libbz2      │ CVE-2019-12900 │          │ 1.0.6-r6          │ 1.0.6-r7      │ bzip2: out-of-bounds write in function BZ2_decompress        │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-12900                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ libcurl     │ CVE-2018-16839 │ CRITICAL │ 7.61.1-r0         │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ libcurl     │ CVE-2018-16839 │          │ 7.61.1-r0         │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
 │             │                │          │                   │               │ in Curl_sasl_create_plain_message()                          │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16839                   │
 │             ├────────────────┤          │                   │               ├──────────────────────────────────────────────────────────────┤
@@ -51,8 +51,8 @@ Total: 19 (CRITICAL: 19)
 │             │ CVE-2018-16842 │          │                   │               │ curl: Heap-based buffer over-read in the curl tool warning   │
 │             │                │          │                   │               │ formatting                                                   │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16842                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ libcurl     │ CVE-2019-3822  │ CRITICAL │ 7.61.1-r0         │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2019-3822  │          │                   │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-3822                    │
 │             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
 │             │ CVE-2019-5481  │          │                   │ 7.61.1-r3     │ curl: double free due to subsequent call of realloc()        │
@@ -60,16 +60,16 @@ Total: 19 (CRITICAL: 19)
 │             ├────────────────┤          │                   │               ├──────────────────────────────────────────────────────────────┤
 │             │ CVE-2019-5482  │          │                   │               │ curl: heap buffer overflow in function tftp_receive_packet() │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-5482                    │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ musl        │ CVE-2019-14697 │ CRITICAL │ 1.1.18-r3         │ 1.1.18-r4     │ musl libc through 1.1.23 has an x87 floating-point stack     │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ musl        │ CVE-2019-14697 │          │ 1.1.18-r3         │ 1.1.18-r4     │ musl libc through 1.1.23 has an x87 floating-point stack     │
 │             │                │          │                   │               │ adjustment im ......                                         │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-14697                   │
 ├─────────────┤                │          │                   │               │                                                              │
 │ musl-utils  │                │          │                   │               │                                                              │
 │             │                │          │                   │               │                                                              │
 │             │                │          │                   │               │                                                              │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ sqlite-libs │ CVE-2019-8457  │ CRITICAL │ 3.21.0-r1         │ 3.25.3-r1     │ sqlite: heap out-of-bound read in function rtreenode()       │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ sqlite-libs │ CVE-2019-8457  │          │ 3.21.0-r1         │ 3.25.3-r1     │ sqlite: heap out-of-bound read in function rtreenode()       │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-8457                    │
 └─────────────┴────────────────┴──────────┴───────────────────┴───────────────┴──────────────────────────────────────────────────────────────┘

--- a/test/data/image.test
+++ b/test/data/image.test
@@ -8,8 +8,8 @@ Total: 19 (CRITICAL: 19)
 ├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
 │ curl        │ CVE-2018-14618 │ CRITICAL │ 7.61.0-r0         │ 7.61.1-r0     │ curl: NTLM password overflow via integer overflow            │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-14618                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ curl        │ CVE-2018-16839 │ CRITICAL │ 7.61.0-r0         │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2018-16839 │          │                   │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
 │             │                │          │                   │               │ in Curl_sasl_create_plain_message()                          │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16839                   │
 │             ├────────────────┤          │                   │               ├──────────────────────────────────────────────────────────────┤
@@ -20,8 +20,8 @@ Total: 19 (CRITICAL: 19)
 │             │ CVE-2018-16842 │          │                   │               │ curl: Heap-based buffer over-read in the curl tool warning   │
 │             │                │          │                   │               │ formatting                                                   │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16842                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ curl        │ CVE-2019-3822  │ CRITICAL │ 7.61.0-r0         │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2019-3822  │          │                   │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-3822                    │
 │             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
 │             │ CVE-2019-5481  │          │                   │ 7.61.1-r3     │ curl: double free due to subsequent call of realloc()        │
@@ -32,15 +32,15 @@ Total: 19 (CRITICAL: 19)
 ├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
 │ git         │ CVE-2018-17456 │          │ 2.15.2-r0         │ 2.15.3-r0     │ git: arbitrary code execution via .gitmodules                │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-17456                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ git         │ CVE-2019-1353  │ CRITICAL │ 2.15.2-r0         │ 2.15.4-r0     │ git: NTFS protections inactive when running Git in the       │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2019-1353  │          │                   │ 2.15.4-r0     │ git: NTFS protections inactive when running Git in the       │
 │             │                │          │                   │               │ Windows Subsystem for...                                     │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-1353                    │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ libbz2      │ CVE-2019-12900 │ CRITICAL │ 1.0.6-r6          │ 1.0.6-r7      │ bzip2: out-of-bounds write in function BZ2_decompress        │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ libbz2      │ CVE-2019-12900 │          │ 1.0.6-r6          │ 1.0.6-r7      │ bzip2: out-of-bounds write in function BZ2_decompress        │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-12900                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ libcurl     │ CVE-2018-16839 │ CRITICAL │ 7.61.1-r0         │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ libcurl     │ CVE-2018-16839 │          │ 7.61.1-r0         │ 7.61.1-r1     │ curl: Integer overflow leading to heap-based buffer overflow │
 │             │                │          │                   │               │ in Curl_sasl_create_plain_message()                          │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16839                   │
 │             ├────────────────┤          │                   │               ├──────────────────────────────────────────────────────────────┤
@@ -51,8 +51,8 @@ Total: 19 (CRITICAL: 19)
 │             │ CVE-2018-16842 │          │                   │               │ curl: Heap-based buffer over-read in the curl tool warning   │
 │             │                │          │                   │               │ formatting                                                   │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2018-16842                   │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ libcurl     │ CVE-2019-3822  │ CRITICAL │ 7.61.1-r0         │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
+│             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
+│             │ CVE-2019-3822  │          │                   │ 7.61.1-r2     │ curl: NTLMv2 type-3 header stack buffer overflow             │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-3822                    │
 │             ├────────────────┤          │                   ├───────────────┼──────────────────────────────────────────────────────────────┤
 │             │ CVE-2019-5481  │          │                   │ 7.61.1-r3     │ curl: double free due to subsequent call of realloc()        │
@@ -60,16 +60,16 @@ Total: 19 (CRITICAL: 19)
 │             ├────────────────┤          │                   │               ├──────────────────────────────────────────────────────────────┤
 │             │ CVE-2019-5482  │          │                   │               │ curl: heap buffer overflow in function tftp_receive_packet() │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-5482                    │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ musl        │ CVE-2019-14697 │ CRITICAL │ 1.1.18-r3         │ 1.1.18-r4     │ musl libc through 1.1.23 has an x87 floating-point stack     │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ musl        │ CVE-2019-14697 │          │ 1.1.18-r3         │ 1.1.18-r4     │ musl libc through 1.1.23 has an x87 floating-point stack     │
 │             │                │          │                   │               │ adjustment im ......                                         │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-14697                   │
 ├─────────────┤                │          │                   │               │                                                              │
 │ musl-utils  │                │          │                   │               │                                                              │
 │             │                │          │                   │               │                                                              │
 │             │                │          │                   │               │                                                              │
-├─────────────┼────────────────┼──────────┼───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
-│ sqlite-libs │ CVE-2019-8457  │ CRITICAL │ 3.21.0-r1         │ 3.25.3-r1     │ sqlite: heap out-of-bound read in function rtreenode()       │
+├─────────────┼────────────────┤          ├───────────────────┼───────────────┼──────────────────────────────────────────────────────────────┤
+│ sqlite-libs │ CVE-2019-8457  │          │ 3.21.0-r1         │ 3.25.3-r1     │ sqlite: heap out-of-bound read in function rtreenode()       │
 │             │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2019-8457                    │
 └─────────────┴────────────────┴──────────┴───────────────────┴───────────────┴──────────────────────────────────────────────────────────────┘

--- a/test/data/repo.test
+++ b/test/data/repo.test
@@ -68,7 +68,9 @@
              }
            ]
          },
-          "Match": "export GITHUB_PAT=****************************************"
+          "Match": "export GITHUB_PAT=****************************************",
+          "Deleted": false,
+          "Layer": {}
        }
      ]
    }
--- a/test/data/trivy.yaml
+++ b/test/data/trivy.yaml
@@ -1,2 +1,5 @@
 format: json
-severity: CRITICAL
+severity: CRITICAL
+vulnerability:
+  type: os
+output: yamlconfig.test
--- a/test/data/yamlconfig.test
+++ b/test/data/yamlconfig.test
@@ -1,29 +1,104 @@
 {
  "SchemaVersion": 2,
-  "ArtifactName": ".",
-  "ArtifactType": "filesystem",
+  "ArtifactName": "alpine:3.10",
+  "ArtifactType": "container_image",
  "Metadata": {
+    "OS": {
+      "Family": "alpine",
+      "Name": "3.10.9",
+      "EOSL": true
+    },
+    "ImageID": "sha256:e7b300aee9f9bf3433d32bc9305bfdd22183beb59d933b48d77ab56ba53a197a",
+    "DiffIDs": [
+      "sha256:9fb3aa2f8b8023a4bebbf92aa567caf88e38e969ada9f0ac12643b2847391635"
+    ],
+    "RepoTags": [
+      "alpine:3.10"
+    ],
+    "RepoDigests": [
+      "alpine@sha256:451eee8bedcb2f029756dc3e9d73bab0e7943c1ac55cff3a4861c52a0fdd3e98"
+    ],
    "ImageConfig": {
-      "architecture": "",
-      "created": "0001-01-01T00:00:00Z",
-      "os": "",
+      "architecture": "amd64",
+      "container": "fdb7e80e3339e8d0599282e606c907aa5881ee4c668a68136119e6dfac6ce3a4",
+      "created": "2021-04-14T19:20:05.338397761Z",
+      "docker_version": "19.03.12",
+      "history": [
+        {
+          "created": "2021-04-14T19:20:04.987219124Z",
+          "created_by": "/bin/sh -c #(nop) ADD file:c5377eaa926bf412dd8d4a08b0a1f2399cfd708743533b0aa03b53d14cb4bb4e in / "
+        },
+        {
+          "created": "2021-04-14T19:20:05.338397761Z",
+          "created_by": "/bin/sh -c #(nop)  CMD [\"/bin/sh\"]",
+          "empty_layer": true
+        }
+      ],
+      "os": "linux",
      "rootfs": {
-        "type": "",
-        "diff_ids": null
+        "type": "layers",
+        "diff_ids": [
+          "sha256:9fb3aa2f8b8023a4bebbf92aa567caf88e38e969ada9f0ac12643b2847391635"
+        ]
      },
-      "config": {}
+      "config": {
+        "Cmd": [
+          "/bin/sh"
+        ],
+        "Env": [
+          "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+        ],
+        "Image": "sha256:eb2080c455e94c22ae35b3aef9e078c492a00795412e026e4d6b41ef64bc7dd8"
+      }
    }
  },
  "Results": [
    {
-      "Target": "Dockerfile",
-      "Class": "config",
-      "Type": "dockerfile",
-      "MisconfSummary": {
-        "Successes": 6,
-        "Failures": 0,
-        "Exceptions": 0
-      }
+      "Target": "alpine:3.10 (alpine 3.10.9)",
+      "Class": "os-pkgs",
+      "Type": "alpine",
+      "Vulnerabilities": [
+        {
+          "VulnerabilityID": "CVE-2021-36159",
+          "PkgName": "apk-tools",
+          "InstalledVersion": "2.10.6-r0",
+          "FixedVersion": "2.10.7-r0",
+          "Layer": {
+            "Digest": "sha256:396c31837116ac290458afcb928f68b6cc1c7bdd6963fc72f52f365a2a89c1b5",
+            "DiffID": "sha256:9fb3aa2f8b8023a4bebbf92aa567caf88e38e969ada9f0ac12643b2847391635"
+          },
+          "SeveritySource": "nvd",
+          "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2021-36159",
+          "DataSource": {
+            "ID": "alpine",
+            "Name": "Alpine Secdb",
+            "URL": "https://secdb.alpinelinux.org/"
+          },
+          "Description": "libfetch before 2021-07-26, as used in apk-tools, xbps, and other products, mishandles numeric strings for the FTP and HTTP protocols. The FTP passive mode implementation allows an out-of-bounds read because strtol is used to parse the relevant numbers into address bytes. It does not check if the line ends prematurely. If it does, the for-loop condition checks for the '\\0' terminator one byte too late.",
+          "Severity": "CRITICAL",
+          "CweIDs": [
+            "CWE-125"
+          ],
+          "CVSS": {
+            "nvd": {
+              "V2Vector": "AV:N/AC:L/Au:N/C:P/I:N/A:P",
+              "V3Vector": "CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:N/A:H",
+              "V2Score": 6.4,
+              "V3Score": 9.1
+            }
+          },
+          "References": [
+            "https://github.com/freebsd/freebsd-src/commits/main/lib/libfetch",
+            "https://gitlab.alpinelinux.org/alpine/apk-tools/-/issues/10749",
+            "https://lists.apache.org/thread.html/r61db8e7dcb56dc000a5387a88f7a473bacec5ee01b9ff3f55308aacc@%3Cdev.kafka.apache.org%3E",
+            "https://lists.apache.org/thread.html/r61db8e7dcb56dc000a5387a88f7a473bacec5ee01b9ff3f55308aacc@%3Cusers.kafka.apache.org%3E",
+            "https://lists.apache.org/thread.html/rbf4ce74b0d1fa9810dec50ba3ace0caeea677af7c27a97111c06ccb7@%3Cdev.kafka.apache.org%3E",
+            "https://lists.apache.org/thread.html/rbf4ce74b0d1fa9810dec50ba3ace0caeea677af7c27a97111c06ccb7@%3Cusers.kafka.apache.org%3E"
+          ],
+          "PublishedDate": "2021-08-03T14:15:00Z",
+          "LastModifiedDate": "2021-10-18T12:19:00Z"
+        }
+      ]
    }
  ]
 }
--- a/test/test.bats
+++ b/test/test.bats
@@ -74,10 +74,10 @@ bats_load_library bats-file
  assert_output --partial '"package_url": "pkg:apk/ca-certificates@20171114-r0",' # TODO: Output contains time, need to mock
 }

-@test "trivy repo with trivy.yaml config" {
-  # trivy --config=./data/trivy.yaml fs --security-checks=config,secret --output=yamlconfig.test .
-  run ./entrypoint.sh "-a fs" "-j ." "-s config,secret" "-v ./test/data/trivy.yaml" "-h yamlconfig.test"
+@test "trivy image with trivy.yaml config" {
+  # trivy --config=./test/data/trivy.yaml image alpine:3.10
+  run ./entrypoint.sh "-v ./test/data/trivy.yaml" "-a image" "-i alpine:3.10"
  run diff yamlconfig.test ./test/data/yamlconfig.test
  echo "$output"
  assert_files_equal yamlconfig.test ./test/data/yamlconfig.test
-}
+}
Author	SHA1	Message	Date
simar7	1db49f5326	feat(trivy): Bump Trivy to v0.31.0 (#165 ) Fixes: https://github.com/aquasecurity/trivy-action/issues/164 Signed-off-by: Simar <simar@linux.com> Signed-off-by: Simar <simar@linux.com>	2022-08-16 17:25:38 -07:00
Engin Diri	12814ff8bc	docs: correct format and add output on config scan with sarif (#159 )	2022-08-15 11:09:42 -07:00
simar7	cb606dfdb0	fix(sarif): Add timeout and security-checks for sarif (#156 )	2022-08-03 17:32:25 -07:00
Carol Valencia	0d7cf2ddfb	chore: improve message output sbom with gh (#145 ) * fix: merge with master- entrypoint * chore: gitignore .vscode Co-authored-by: carolina valencia <krol3@users.noreply.github.com>	2022-08-02 15:24:58 -07:00
simar7	5144f05a8d	fix(config): Drop mixing of options with yaml config. (#148 ) Also adds some documentation explaining how the config and flags are used in conjunction with each other. Fixes: https://github.com/aquasecurity/trivy-action/issues/147 Signed-off-by: Simar <simar@linux.com>	2022-07-29 14:30:07 -07:00