fix(lang): fix dependency graph in client server mode (#2336)

Co-authored-by: Teppei Fukuda <knqyf263@gmail.com>

.github/CODEOWNERS

@@ -0,0 +1,9 @@
+# Global
+*   @knqyf263
+
+# Helm chart
+helm/trivy/ @krol3
+
+# Kubernetes scanning
+pkg/k8s/                @josedonizetti @chen-keinan
+docs/docs/kubernetes/   @josedonizetti @chen-keinan

.github/workflows/release.yaml

@@ -21,16 +21,16 @@ jobs:
         run: |
           sudo apt-get -y update
           sudo apt-get -y install rpm reprepro createrepo distro-info
-      - uses: sigstore/cosign-installer@51f8e5c6fce54e46006ae97d73b2b6315f518752
+      - uses: sigstore/cosign-installer@536b37ec5d5b543420bdfd9b744c5965bd4d8730
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Show available Docker Buildx platforms
         run: echo ${{ steps.buildx.outputs.platforms }}
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Checkout code
@@ -38,25 +38,25 @@ jobs:
         with:
           fetch-depth: 0
       - name: Cache Go modules
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3.0.2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
       - name: Login to docker.io registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USER }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Login to ghcr.io registry
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ env.GH_USER }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Login to ECR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: public.ecr.aws
           username: ${{ secrets.ECR_ACCESS_KEY_ID }}
@@ -67,10 +67,10 @@ jobs:
           args: mod -licenses -json -output bom.json
           version: ^v1
       - name: Release
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v3
         with:
           version: v1.4.1
-          args: release --rm-dist
+          args: release --rm-dist --timeout 60m
         env:
           GITHUB_TOKEN: ${{ secrets.ORG_REPO_TOKEN }}
       - name: Checkout trivy-repo

.github/workflows/scan.yaml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Trivy vulnerability scanner and create GitHub issues
-        uses: knqyf263/trivy-issue-action@v0.0.3
+        uses: knqyf263/trivy-issue-action@v0.0.4
         with:
           assignee: knqyf263
           severity: CRITICAL

.github/workflows/semantic-pr.yaml

@@ -40,6 +40,7 @@ jobs:
             repo
             sbom
             server
+            k8s
 
             alpine
             redhat

.github/workflows/stale-issues.yaml

@@ -7,7 +7,7 @@ jobs:
     timeout-minutes: 1
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v4
+    - uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been labeled with inactivity.'

.github/workflows/test.yaml

@@ -11,6 +11,7 @@ on:
   pull_request:
 env:
   GO_VERSION: "1.18"
+  TINYGO_VERSION: "0.23.0"
 jobs:
   test:
     name: Test
@@ -19,15 +20,28 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 
+      - name: go mod tidy
+        run: |
+          go mod tidy
+          if [ -n "$(git status --porcelain)" ]; then
+            exit 1
+          fi
+
       - name: Lint
-        uses: golangci/golangci-lint-action@v3.1.0
+        uses: golangci/golangci-lint-action@v3.2.0
         with:
           version: v1.45
           args: --deadline=30m
+          skip-cache: true # https://github.com/golangci/golangci-lint-action/issues/244#issuecomment-1052197778
+
+      - name: Install TinyGo
+        run: |
+          wget https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo_${TINYGO_VERSION}_amd64.deb
+          sudo dpkg -i tinygo_${TINYGO_VERSION}_amd64.deb
 
       - name: Run unit tests
         run: make test
@@ -37,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ env.GO_VERSION }}
       id: go
@@ -48,6 +62,28 @@ jobs:
     - name: Run integration tests
       run: make test-integration
 
+  module-test:
+    name: Module Integration Test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+        id: go
+
+      - name: Install TinyGo
+        run: |
+          wget https://github.com/tinygo-org/tinygo/releases/download/v${TINYGO_VERSION}/tinygo_${TINYGO_VERSION}_amd64.deb
+          sudo dpkg -i tinygo_${TINYGO_VERSION}_amd64.deb
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Run module integration tests
+        run: |
+          make test-module-integration
+
   build-test:
     name: Build Test
     runs-on: ubuntu-latest
@@ -55,11 +91,11 @@ jobs:
       DOCKER_CLI_EXPERIMENTAL: "enabled"
     steps:
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v1
+      uses: docker/setup-qemu-action@v2
 
     - name: Set up Docker Buildx
       id: buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v2
 
     - name: Show available Docker Buildx platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
@@ -68,15 +104,15 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
         go-version: ${{ env.GO_VERSION }}
 
     - name: Run GoReleaser
-      uses: goreleaser/goreleaser-action@v2
+      uses: goreleaser/goreleaser-action@v3
       with:
         version: v1.4.1
-        args: release --snapshot --rm-dist --skip-publish
+        args: release --snapshot --rm-dist --skip-publish --timeout 60m
 
   build-documents:
     name: Documentation Test

.gitignore

@@ -30,3 +30,6 @@ integration/testdata/fixtures/images
 
 # goreleaser output
 dist
+
+# WebAssembly
+*.wasm

.golangci.yaml

@@ -49,6 +49,7 @@ run:
     - ".*._mock.go$"
     - ".*._test.go$"
     - "integration/*"
+    - "examples/*"
 
 issues:
   exclude-rules:

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 RUN apk --no-cache add ca-certificates git
 COPY trivy /usr/local/bin/trivy
 COPY contrib/*.tpl contrib/

Dockerfile.protoc

@@ -1,4 +1,4 @@
-FROM golang:1.18.0
+FROM golang:1.18.2
 
 # Install protoc (cf. http://google.github.io/proto-lens/installing-protoc.html)
 ENV PROTOC_ZIP=protoc-3.19.4-linux-x86_64.zip

Makefile

@@ -1,21 +1,42 @@
 VERSION := $(shell git describe --tags)
-LDFLAGS=-ldflags "-s -w -X=main.version=$(VERSION)"
+LDFLAGS := -ldflags "-s -w -X=main.version=$(VERSION)"
 
-GOPATH=$(shell go env GOPATH)
-GOBIN=$(GOPATH)/bin
-GOSRC=$(GOPATH)/src
+GOPATH := $(shell go env GOPATH)
+GOBIN := $(GOPATH)/bin
+GOSRC := $(GOPATH)/src
+
+TEST_MODULE_DIR := pkg/module/testdata
+TEST_MODULE_SRCS := $(wildcard $(TEST_MODULE_DIR)/*/*.go)
+TEST_MODULES := $(patsubst %.go,%.wasm,$(TEST_MODULE_SRCS))
+
+EXAMPLE_MODULE_DIR := examples/module
+EXAMPLE_MODULE_SRCS := $(wildcard $(EXAMPLE_MODULE_DIR)/*/*.go)
+EXAMPLE_MODULES := $(patsubst %.go,%.wasm,$(EXAMPLE_MODULE_SRCS))
 
 MKDOCS_IMAGE := aquasec/mkdocs-material:dev
 MKDOCS_PORT := 8000
 
 u := $(if $(update),-u)
 
+# Tools
 $(GOBIN)/wire:
-	GO111MODULE=off go get github.com/google/wire/cmd/wire
+	go install github.com/google/wire/cmd/wire@v0.5.0
+
+$(GOBIN)/crane:
+	go install github.com/google/go-containerregistry/cmd/crane@v0.9.0
+
+$(GOBIN)/golangci-lint:
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.45.2
+
+$(GOBIN)/labeler:
+	go install github.com/knqyf263/labeler@latest
+
+$(GOBIN)/easyjson:
+	go install github.com/mailru/easyjson/...@v0.7.7
 
 .PHONY: wire
 wire: $(GOBIN)/wire
-	wire gen ./pkg/...
+	wire gen ./pkg/commands/... ./pkg/rpc/...
 
 .PHONY: mock
 mock: $(GOBIN)/mockery
@@ -26,20 +47,36 @@ deps:
 	go get ${u} -d
 	go mod tidy
 
-$(GOBIN)/golangci-lint:
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(GOBIN) v1.41.1
+.PHONY: generate-test-modules
+generate-test-modules: $(TEST_MODULES)
 
+# Compile WASM modules for unit and integration tests
+%.wasm:%.go
+	@if !(type "tinygo" > /dev/null 2>&1); then \
+		echo "Need to install TinyGo. Follow https://tinygo.org/getting-started/install/"; \
+		exit 1; \
+	fi
+	go generate $<
+
+# Run unit tests
 .PHONY: test
-test:
+test: $(TEST_MODULES)
 	go test -v -short -coverprofile=coverage.txt -covermode=atomic ./...
 
-integration/testdata/fixtures/images/*.tar.gz:
-	git clone https://github.com/aquasecurity/trivy-test-images.git integration/testdata/fixtures/images
+integration/testdata/fixtures/images/*.tar.gz: $(GOBIN)/crane
+	mkdir -p integration/testdata/fixtures/images/
+	integration/scripts/download-images.sh
 
+# Run integration tests
 .PHONY: test-integration
 test-integration: integration/testdata/fixtures/images/*.tar.gz
 	go test -v -tags=integration ./integration/...
 
+# Run WASM integration tests
+.PHONY: test-module-integration
+test-module-integration: integration/testdata/fixtures/images/*.tar.gz $(EXAMPLE_MODULES)
+	go test -v -tags=module_integration ./integration/...
+
 .PHONY: lint
 lint: $(GOBIN)/golangci-lint
 	$(GOBIN)/golangci-lint run --timeout 5m
@@ -70,15 +107,18 @@ install:
 clean:
 	rm -rf integration/testdata/fixtures/images
 
-$(GOBIN)/labeler:
-	go install github.com/knqyf263/labeler@latest
-
+# Create labels on GitHub
 .PHONY: label
 label: $(GOBIN)/labeler
 	labeler apply misc/triage/labels.yaml -r aquasecurity/trivy -l 5
 
+# Run MkDocs development server to preview the documentation page
 .PHONY: mkdocs-serve
-## Runs MkDocs development server to preview the documentation page
 mkdocs-serve:
 	docker build -t $(MKDOCS_IMAGE) -f docs/build/Dockerfile docs/build
 	docker run --name mkdocs-serve --rm -v $(PWD):/docs -p $(MKDOCS_PORT):8000 $(MKDOCS_IMAGE)
+
+# Generate JSON marshaler/unmarshaler for TinyGo/WebAssembly as TinyGo doesn't support encoding/json.
+.PHONY: easyjson
+easyjson: $(GOBIN)/easyjson
+	easyjson pkg/module/serialize/types.go

README.md

@@ -1,14 +1,5 @@
-<p align="center">
-  <img src="docs/imgs/logo.png" width="200">
-</p>
-
-<p align="center">
-  <a href="https://aquasecurity.github.io/trivy/">Documentation</a> 
-</p>
-
-<p align="center">
-Scanner for vulnerabilities in container images, file systems, and Git repositories, as well as for configuration issues
-</p>
+<div align="center">
+<img src="docs/imgs/logo.png" width="200">
 
 [![GitHub Release][release-img]][release]
 [![Test][test-img]][test]
@@ -17,77 +8,60 @@ Scanner for vulnerabilities in container images, file systems, and Git repositor
 [![GitHub All Releases][github-all-releases-img]][release]
 ![Docker Pulls][docker-pulls]
 
+[📖 Documentation][docs]
+</div>
 
-# Abstract
-`Trivy` (`tri` pronounced like **tri**gger, `vy` pronounced like en**vy**) is a simple and comprehensive scanner for vulnerabilities in container images, file systems, and Git repositories, as well as for configuration issues.
-`Trivy` detects vulnerabilities of OS packages (Alpine, RHEL, CentOS, etc.) and language-specific packages (Bundler, Composer, npm, yarn, etc.).
-In addition, `Trivy` scans Infrastructure as Code (IaC) files such as Terraform, Dockerfile and Kubernetes, to detect potential configuration issues that expose your deployments to the risk of attack.
-`Trivy` also scans hardcoded secrets like passwords, API keys and tokens.
-`Trivy` is easy to use. Just install the binary and you're ready to scan.
+Trivy (`tri` pronounced like **tri**gger, `vy` pronounced like en**vy**) is a comprehensive security scanner. It is reliable, fast, extremely easy to use, and it works wherever you need it.
 
-<figure style="text-aligh: center">
-  <img src="docs/imgs/overview.png" width="800" alt="Trivy Overview">
-</figure>
+Trivy has different *scanners* that look for different security issues, and different *targets* where it can find those issues.
 
-### Demo: Vulnerability Detection (Container Image)
-<figure style="text-aligh: center">
-  <img src="docs/imgs/vuln-demo.gif" width="1000" alt="Vulnerability Detection">
-</figure>
+Targets:
+- Container Image
+- Filesystem
+- Git repository (remote)
+- Kubernetes cluster or resource
 
-### Demo: Misconfiguration Detection (IaC Files)
-<figure style="text-aligh: center">
-  <img src="docs/imgs/misconf-demo.gif" width="1000" alt="Misconfiguration Detection">
-</figure>
+Scanners:
+- OS packages and software dependencies in use (SBOM)
+- Known vulnerabilities (CVEs)
+- IaC misconfigurations
+- Sensitive information and secrets
 
-### Demo: Secret Detection
-<figure style="text-aligh: center">
-  <img src="docs/imgs/secret-demo.gif" width="1000">
-</figure>
+Much more scanners and targets are coming up. Missing something? Let us know!
 
+Read more in the [Trivy Documentation][docs]
 
-# Quick Start
-## Scan Image for Vulnerabilities and Secrets
-Simply specify an image name (and a tag).
+## Quick Start
 
-```
-$ trivy image [YOUR_IMAGE_NAME]
+### Get Trivy
+
+Get Trivy by your favorite installation method. See [installation] section in the documentation for details. For example:
+
+- `apt-get install trivy`
+- `yum install trivy`
+- `brew install aquasecurity/trivy/trivy`
+- `docker run aquasec/trivy`
+- Download binary from https://github.com/aquasecurity/trivy/releases/latest/
+
+### General usage
+
+```bash
+trivy <target> [--security-checks <scanner1,scanner2>] TARGET_NAME
 ```
 
-For example:
+Examples:
 
-```
+```bash
 $ trivy image python:3.4-alpine
 ```
 
 <details>
 <summary>Result</summary>
 
-```
-2019-05-16T01:20:43.180+0900    INFO    Updating vulnerability database...
-2019-05-16T01:20:53.029+0900    INFO    Detecting Alpine vulnerabilities...
+https://user-images.githubusercontent.com/1161307/171013513-95f18734-233d-45d3-aaf5-d6aec687db0e.mov
 
-python:3.4-alpine3.9 (alpine 3.9.2)
-===================================
-Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
-
-+---------+------------------+----------+-------------------+---------------+--------------------------------+
-| LIBRARY | VULNERABILITY ID | SEVERITY | INSTALLED VERSION | FIXED VERSION |             TITLE              |
-+---------+------------------+----------+-------------------+---------------+--------------------------------+
-| openssl | CVE-2019-1543    | MEDIUM   | 1.1.1a-r1         | 1.1.1b-r1     | openssl: ChaCha20-Poly1305     |
-|         |                  |          |                   |               | with long nonces               |
-+---------+------------------+----------+-------------------+---------------+--------------------------------+
-```
 </details>
 
-## Scan Filesystem for Vulnerabilities, Secrets and Misconfigurations
-Simply specify a directory to scan.
-
-```bash
-$ trivy fs --security-checks vuln,secret,config [YOUR_PROJECT_DIR]
-```
-
-For example:
-
 ```bash
 $ trivy fs --security-checks vuln,secret,config myproject/
 ```
@@ -95,116 +69,50 @@ $ trivy fs --security-checks vuln,secret,config myproject/
 <details>
 <summary>Result</summary>
 
-```bash
-2021-07-09T12:03:27.564+0300    INFO    Number of language-specific files: 1
-2021-07-09T12:03:27.564+0300    INFO    Detecting pipenv vulnerabilities...
-2021-07-09T12:03:27.566+0300    INFO    Detected config files: 1
+https://user-images.githubusercontent.com/1161307/171013917-b1f37810-f434-465c-b01a-22de036bd9b3.mov
 
-Pipfile.lock (pipenv)
-=====================
-Total: 1 (HIGH: 1, CRITICAL: 0)
-
-+----------+------------------+----------+-------------------+---------------+---------------------------------------+
-| LIBRARY  | VULNERABILITY ID | SEVERITY | INSTALLED VERSION | FIXED VERSION |                 TITLE                 |
-+----------+------------------+----------+-------------------+---------------+---------------------------------------+
-| httplib2 | CVE-2021-21240   | HIGH     | 0.12.1            | 0.19.0        | python-httplib2: Regular              |
-|          |                  |          |                   |               | expression denial of                  |
-|          |                  |          |                   |               | service via malicious header          |
-|          |                  |          |                   |               | -->avd.aquasec.com/nvd/cve-2021-21240 |
-+----------+------------------+----------+-------------------+---------------+---------------------------------------+
-
-Dockerfile (dockerfile)
-=======================
-Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-|                           |            |                      |          | Dockerfile should not be 'root'          |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-```
 </details>
 
-## Scan Directory for Misconfigurations
-
-Simply specify a directory containing IaC files such as Terraform and Dockerfile.
-
-```
-$ trivy config [YOUR_IAC_DIR]
-```
-
-For example:
-
-```
-$ ls build/
-Dockerfile
-$ trivy config ./build
+```bash
+$ trivy k8s mycluster
 ```
 
 <details>
 <summary>Result</summary>
 
-```
-2021-07-09T10:06:29.188+0300    INFO    Need to update the built-in policies
-2021-07-09T10:06:29.188+0300    INFO    Downloading the built-in policies...
-2021-07-09T10:06:30.520+0300    INFO    Detected config files: 1
-
-Dockerfile (dockerfile)
-=======================
-Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-|                           |            |                      |          | Dockerfile should not be 'root'          |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-```
+![k8s summary](docs/imgs/trivy-k8s.png)
 
 </details>
 
+Find out more in the [Trivy Documentation][docs] - [Getting Started][getting-started]
 
-# Features
+
+## Highlights
 
 - Comprehensive vulnerability detection
   - OS packages (Alpine Linux, Red Hat Universal Base Image, Red Hat Enterprise Linux, CentOS, AlmaLinux, Rocky Linux, CBL-Mariner, Oracle Linux, Debian, Ubuntu, Amazon Linux, openSUSE Leap, SUSE Enterprise Linux, Photon OS and Distroless)
   - **Language-specific packages** (Bundler, Composer, Pipenv, Poetry, npm, yarn, Cargo, NuGet, Maven, and Go)
-- Misconfiguration detection (IaC scanning) 
-  - A wide variety of built-in policies are provided **out of the box**
-    - Kubernetes, Docker, Terraform, and more coming soon
-  - Support custom policies
-- Secret detection
-  - A wide variety of built-in rules are provided **out of the box**
-  - Support custom rules
-  - Scan container images at high speed
-- Simple
-  - Specify only an image name, a path to config files, or an artifact name
-- Fast
-  - The first scan will finish within 10 seconds (depending on your network). Consequent scans will finish in single seconds.
-- Easy installation
-  - `apt-get install`, `yum install` and `brew install` are possible.
-  - **No pre-requisites** such as installation of DB, libraries, etc.
-- High accuracy
-  - **Especially [Alpine Linux][alpine] and RHEL/CentOS**
-  - Other OSes are also high
-- DevSecOps
-  - **Suitable for CI** such as GitHub Actions, Jenkins, GitLab CI, etc.
-- Support multiple targets
-  - container image, local filesystem and remote git repository
+  - High accuracy, especially [Alpine Linux][alpine] and RHEL/CentOS
 - Supply chain security (SBOM support)
   - Support CycloneDX
-
-# Integrations
-- [GitHub Actions][action]
-- [Visual Studio Code][vscode]
-
-# Documentation
-The official documentation, which provides detailed installation, configuration, and quick start guides, is available at https://aquasecurity.github.io/trivy/.
+  - Support SPDX
+- Misconfiguration detection (IaC scanning) 
+  - Wide variety of security checks are provided **out of the box**
+  - Kubernetes, Docker, Terraform, and more
+  - User-defined policies using [OPA Rego][rego]
+- Secret detection
+  - A wide variety of built-in rules are provided **out of the box**
+  - User-defined patterns
+  - Efficient scanning of container images
+- Simple
+  - Available in apt, yum, brew, dockerhub
+  - **No pre-requisites** such as a database, system libraries, or eny environmental requirements. The binary runs anywhere.
+  - The first scan will finish within 10 seconds (depending on your network). Consequent scans will finish instantaneously.
+- Fits your workflow
+  - **Great for CI** such as GitHub Actions, Jenkins, GitLab CI, etc.
+  - Available as extension for IDEs such as vscode, jetbrains, vim
+  - Available as extension for Docker Desktop, Rancher Desktop
+  - See [integrations] section in the documentation.
 
 ---
 
@@ -223,10 +131,14 @@ Contact us about any matter by opening a GitHub Discussion [here][discussions]
 [license]: https://github.com/aquasecurity/trivy/blob/main/LICENSE
 [license-img]: https://img.shields.io/badge/License-Apache%202.0-blue.svg
 
-[alpine]: https://ariadne.space/2021/06/08/the-vulnerability-remediation-lifecycle-of-alpine-containers/
-[action]: https://github.com/aquasecurity/trivy-action
-[vscode]: https://github.com/aquasecurity/trivy-vscode-extension
 
+[getting-started]: https://aquasecurity.github.io/trivy/latest/getting-started/installation/
+[docs]: https://aquasecurity.github.io/trivy
+[integrations]:https://aquasecurity.github.io/trivy/latest/docs/integrations/
+[installation]:https://aquasecurity.github.io/trivy/latest/docs/getting-started/installation/
+[releases]: https://github.com/aquasecurity/trivy/releases
+[alpine]: https://ariadne.space/2021/06/08/the-vulnerability-remediation-lifecycle-of-alpine-containers/
+[rego]: https://www.openpolicyagent.org/docs/latest/#rego
 [aquasec]: https://aquasec.com
 [oss]: https://www.aquasec.com/products/open-source-projects/
 [discussions]: https://github.com/aquasecurity/trivy/discussions

contrib/asff.tpl

@@ -66,7 +66,57 @@
             ],
             "RecordState": "ACTIVE"
         }
-       {{- end -}}
+        {{- end -}}
+        {{- range .Misconfigurations -}}
+            {{- if $t_first -}}{{- $t_first = false -}}{{- else -}},{{- end -}}
+            {{- $severity := .Severity -}}
+            {{- if eq $severity "UNKNOWN" -}}
+                {{- $severity = "INFORMATIONAL" -}}
+            {{- end -}}
+            {{- $description := .Description -}}
+            {{- if gt (len $description ) 512 -}}
+                {{- $description = (substr 0 512 $description) | printf "%v .." -}}
+            {{- end}}
+        {
+            "SchemaVersion": "2018-10-08",
+            "Id": "{{ $target }}/{{ .ID }}",
+            "ProductArn": "arn:aws:securityhub:{{ env "AWS_REGION" }}::product/aquasecurity/aquasecurity",
+            "GeneratorId": "Trivy/{{ .ID }}",
+            "AwsAccountId": "{{ env "AWS_ACCOUNT_ID" }}",
+            "Types": [ "Software and Configuration Checks" ],
+            "CreatedAt": "{{ now | date "2006-01-02T15:04:05.999999999Z07:00" }}",
+            "UpdatedAt": "{{ now | date "2006-01-02T15:04:05.999999999Z07:00" }}",
+            "Severity": {
+                "Label": "{{ $severity }}"
+            },
+            "Title": "Trivy found a misconfiguration in {{ $target }}: {{ .Title }}",
+            "Description": {{ escapeString $description | printf "%q" }},
+            "Remediation": {
+                "Recommendation": {
+                    "Text": "{{ .Resolution }}",
+                    "Url": "{{ .PrimaryURL }}"
+                }
+            },
+            "ProductFields": { "Product Name": "Trivy" },
+            "Resources": [
+                {
+                    "Type": "Other",
+                    "Id": "{{ $target }}",
+                    "Partition": "aws",
+                    "Region": "{{ env "AWS_REGION" }}",
+                    "Details": {
+                        "Other": {
+                            "Message": "{{ .Message }}",
+                            "Filename": "{{ $target }}",
+                            "StartLine": "{{ .CauseMetadata.StartLine }}",
+                            "EndLine": "{{ .CauseMetadata.EndLine }}"
+                        }
+                    }
+                }
+            ],
+            "RecordState": "ACTIVE"
+        }
+        {{- end -}}
       {{- end }}
     ]
 }

contrib/gitlab-codequality.tpl

@@ -62,7 +62,7 @@
       "location": {
         "path": "{{ $target }}",
         "lines": {
-          "begin": {{ .IacMetadata.StartLine }}
+          "begin": {{ .CauseMetadata.StartLine }}
         }
       }
     }

docs/docs/advanced/air-gap.md

@@ -53,54 +53,7 @@ $ trivy image --skip-update --offline-scan alpine:3.12
 
 ## Air-Gapped Environment for misconfigurations
 
-### Download misconfiguration policies
-At first, you need to download misconfiguration policies for use in air-gapped environments.
-Please follow [oras installation instruction][oras].
-
-Download `bundle.tar.gz`:
-
-```
-$ oras pull ghcr.io/aquasecurity/appshield:latest -a
-```
-
-### Transfer misconfiguration policies into the air-gapped environment
-The way of transfer depends on the environment.
-
-```
-$ rsync -av -e ssh /path/to/bundle.tar.gz [user]@[host]:dst
-```
-
-### Put the misconfiguration policies in Trivy's cache directory
-You have to know where to put the misconfiguration policies file. The following command shows the default cache directory.
-
-```
-$ ssh user@host
-$ trivy -h | grep cache
-   --cache-dir value  cache directory (default: "/home/myuser/.cache/trivy") [$TRIVY_CACHE_DIR]
-```
-
-Put the misconfiguration policies file in the cache directory + `/policy/content`.
-
-```
-$ mkdir -p /home/myuser/.cache/trivy/policy/content
-$ cd /home/myuser/.cache/trivy/policy/content
-$ mv /path/to/bundle.tar.gz .
-```
-
-Then, decompress it.
-`bundle.tar.gz ` file includes two folders: `docker`, `kubernetes` and file: `.manifest`.
-
-```
-$ tar xvf bundle.tar.gz 
-x ./docker/
-...
-x ./kubernetes/
-...
-x ./.manifest
-$ rm bundle.tar.gz
-```
-
-In an air-gapped environment it is your responsibility to update policies on a regular basis, so that the scanner can detect recently-identified misconfigurations. 
+No special measures are required to detect misconfigurations in an air-gapped environment.
 
 ### Run Trivy with --skip-policy-update option
 In an air-gapped environment, specify `--skip-policy-update` so that Trivy doesn't attempt to download the latest misconfiguration policies.

docs/docs/advanced/container/containerd.md

@@ -0,0 +1,22 @@
+# containerd
+
+!!! warning "EXPERIMENTAL"
+    This feature might change without preserving backwards compatibility.
+
+Scan your image in [containerd][containerd] running locally.
+
+```bash
+$ nerdctl images
+REPOSITORY        TAG       IMAGE ID        CREATED         PLATFORM       SIZE         BLOB SIZE
+aquasec/nginx    latest    2bcabc23b454    3 hours ago     linux/amd64    149.1 MiB    54.1 MiB
+$ trivy image aquasec/nginx
+```
+
+If your containerd socket is not the default path (`//run/containerd/containerd.sock`), you can override it via `CONTAINERD_ADDRESS`.
+
+```bash
+$ export CONTAINERD_ADDRESS=/run/k3s/containerd/containerd.sock
+$ trivy image aquasec/nginx
+```
+
+[containerd]: https://containerd.io/

docs/docs/advanced/modules.md

@@ -0,0 +1,358 @@
+# Modules
+
+!!! warning "EXPERIMENTAL"
+    This feature might change without preserving backwards compatibility.
+
+Trivy provides a module feature to allow others to extend the Trivy CLI without the need to change the Trivy code base.
+It changes the behavior during scanning by WebAssembly.
+
+## Overview
+Trivy modules are add-on tools that integrate seamlessly with Trivy.
+They provide a way to extend the core feature set of Trivy, but without updating the Trivy binary.
+
+- They can be added and removed from a Trivy installation without impacting the core Trivy tool.
+- They can be written in any programming language supporting WebAssembly.
+  - It supports only [TinyGo][tinygo] at the moment.
+
+You can write your own detection logic.
+
+- Evaluate complex vulnerability conditions like [Spring4Shell][spring4shell]
+- Detect a shell script communicating with malicious domains
+- Detect malicious python install script (setup.py)
+- Even detect misconfigurations in WordPress setting
+- etc.
+
+Then, you can update the scan result however you want.
+
+- Change a severity
+- Remove a vulnerability
+- Add a new vulnerability
+- etc.
+
+Modules should be distributed in OCI registries like GitHub Container Registry.
+
+!!! warning
+    WebAssembly doesn't allow file access and network access by default.
+    Modules can read required files only, but cannot overwrite them.
+    WebAssembly is sandboxed and secure by design, but Trivy modules available in public are not audited for security.
+    You should install and run third-party modules at your own risk even though 
+
+Under the hood Trivy leverages [wazero][wazero] to run WebAssembly modules without CGO.
+
+## Installing a Module
+A module can be installed using the `trivy module install` command.
+This command takes an url. It will download the module and install it in the module cache.
+
+Trivy adheres to the XDG specification, so the location depends on whether XDG_DATA_HOME is set.
+Trivy will now search XDG_DATA_HOME for the location of the Trivy modules cache.
+The preference order is as follows:
+
+- XDG_DATA_HOME if set and .trivy/plugins exists within the XDG_DATA_HOME dir
+- $HOME/.trivy/plugins
+
+For example, to download the WebAssembly module, you can execute the following command:
+
+```bash
+$ trivy module install ghcr.io/aquasecurity/trivy-module-spring4shell
+```
+
+## Using Modules
+Once the module is installed, Trivy will load all available modules in the cache on the start of the next Trivy execution.
+The modules may inject custom logic into scanning and change the result.
+You can run Trivy as usual and modules are loaded automatically.
+
+You will see the log messages about WASM modules.
+
+```shell
+$ trivy image ghcr.io/aquasecurity/trivy-test-images:spring4shell-jre8
+2022-06-12T12:57:13.210+0300    INFO    Loading ghcr.io/aquasecurity/trivy-module-spring4shell/spring4shell.wasm...
+2022-06-12T12:57:13.596+0300    INFO    Registering WASM module: spring4shell@v1
+...
+2022-06-12T12:57:14.865+0300    INFO    Module spring4shell: Java Version: 8, Tomcat Version: 8.5.77
+2022-06-12T12:57:14.865+0300    INFO    Module spring4shell: change CVE-2022-22965 severity from CRITICAL to LOW
+
+Java (jar)
+
+Total: 9 (UNKNOWN: 1, LOW: 3, MEDIUM: 2, HIGH: 3, CRITICAL: 0)
+
+┌──────────────────────────────────────────────────────────────┬─────────────────────┬──────────┬───────────────────┬────────────────────────┬────────────────────────────────────────────────────────────┐
+│                           Library                            │    Vulnerability    │ Severity │ Installed Version │     Fixed Version      │                           Title                            │
+├──────────────────────────────────────────────────────────────┼─────────────────────┼──────────┼───────────────────┼────────────────────────┼────────────────────────────────────────────────────────────┤
+│ org.springframework.boot:spring-boot (helloworld.war)        │ CVE-2022-22965      │ LOW      │ 2.6.3             │ 2.5.12, 2.6.6          │ spring-framework: RCE via Data Binding on JDK 9+           │
+│                                                              │                     │          │                   │                        │ https://avd.aquasec.com/nvd/cve-2022-22965                 │
+├──────────────────────────────────────────────────────────────┼─────────────────────┼──────────┼───────────────────┼────────────────────────┼────────────────────────────────────────────────────────────┤
+...(snip)...
+```
+
+In the above example, the Spring4Shell module changed the severity from CRITICAL to LOW because the application doesn't satisfy one of conditions.
+
+## Uninstalling Modules
+Specify a module repository with `trivy module uninstall` command.
+
+```bash
+$ trivy module uninstall ghcr.io/aquasecurity/trivy-module-spring4shell
+```
+
+## Building Modules
+It supports TinyGo only at the moment.
+
+### TinyGo
+Trivy provides Go SDK including three interfaces.
+Your own module needs to implement either or both `Analyzer` and `PostScanner` in addition to `Module`.
+
+```go
+type Module interface {
+    Version() int
+    Name() string
+}
+
+type Analyzer interface {
+    RequiredFiles() []string
+    Analyze(filePath string) (*serialize.AnalysisResult, error)
+}
+
+type PostScanner interface {
+    PostScanSpec() serialize.PostScanSpec
+    PostScan(serialize.Results) (serialize.Results, error)
+}
+```
+
+In the following tutorial, it creates a WordPress module that detects a WordPress version and a critical vulnerability accordingly.
+
+!!! tips
+    You can use logging functions such as `Debug` and `Info` for debugging.
+    See [examples](#examples) for the detail.
+
+#### Initialize your module
+Replace the repository name with yours.
+
+```
+$ go mod init github.com/aquasecurity/trivy-module-wordpress
+```
+
+#### Module interface
+`Version()` returns your module version and should be incremented after updates.
+`Name()` returns your module name.
+
+```go
+package main
+
+const (
+    version = 1
+    name = "wordpress-module"
+)
+
+type WordpressModule struct{
+	// Cannot define fields as modules can't keep state.
+}
+
+func (WordpressModule) Version() int {
+    return version
+}
+
+func (WordpressModule) Name() string {
+    return name
+}
+```
+
+!!! info
+    A struct cannot have any fields. Each method invocation is performed in different states.
+
+#### Analyzer interface
+If you implement the `Analyzer` interface, `Analyze` method is called when the file path is matched to file patterns returned by `RequiredFiles()`.
+A file pattern must be a regular expression. The syntax detail is [here][regexp].
+
+`Analyze` takes the matched file path, then the file can be opened by `os.Open()`.
+
+```go
+const typeWPVersion = "wordpress-version"
+
+func (WordpressModule) RequiredFiles() []string {
+    return []string{
+        `wp-includes\/version.php`,
+    }
+}
+
+func (WordpressModule) Analyze(filePath string) (*serialize.AnalysisResult, error) {
+    f, err := os.Open(filePath) // e.g. filePath: /usr/src/wordpress/wp-includes/version.php
+    if err != nil {
+        return nil, err
+    }
+    defer f.Close()
+
+    var wpVersion string
+    scanner := bufio.NewScanner(f)
+    for scanner.Scan() {
+        line := scanner.Text()
+        if !strings.HasPrefix(line, "$wp_version=") {
+            continue
+        }
+
+        ss := strings.Split(line, "=")
+        if len(ss) != 2 {
+            return nil, fmt.Errorf("invalid wordpress version: %s", line)
+        }
+
+        // NOTE: it is an example; you actually need to handle comments, etc
+        ss[1] = strings.TrimSpace(ss[1])
+        wpVersion = strings.Trim(ss[1], `";`)
+    }
+
+    if err = scanner.Err(); err != nil {
+        return nil, err
+    }
+	
+    return &serialize.AnalysisResult{
+        CustomResources: []serialize.CustomResource{
+            {
+                Type:     typeWPVersion,
+                FilePath: filePath,
+                Data:     wpVersion,
+            },
+        },
+    }, nil
+}
+```
+
+!!! tips
+    Trivy caches analysis results according to the module version.
+    We'd recommend cleaning the cache or changing the module version every time you update `Analyzer`.
+
+
+#### PostScanner interface
+`PostScan` is called after scanning and takes the scan result as an argument from Trivy.
+In post scanning, your module can perform one of three actions:
+
+- Insert
+    - Add a new security finding
+    - e.g. Add a new vulnerability and misconfiguration
+- Update
+    - Update the detected vulnerability and misconfiguration
+    - e.g. Change a severity
+- Delete
+    - Delete the detected vulnerability and misconfiguration
+    - e.g. Remove Spring4Shell because it is not actually affected.
+ 
+`PostScanSpec()` returns which action the module does.
+If it is `Update` or `Delete`, it also needs to return IDs such as CVE-ID and misconfiguration ID, which your module wants to update or delete.
+
+`serialize.Results` contains the filtered results matching IDs you specified.
+Also, it includes `CustomResources` with the values your `Analyze` returns, so you can modify the scan result according to the custom resources.
+
+```go
+func (WordpressModule) PostScanSpec() serialize.PostScanSpec {
+    return serialize.PostScanSpec{
+        Action: api.ActionInsert, // Add new vulnerabilities
+    }
+}
+
+func (WordpressModule) PostScan(results serialize.Results) (serialize.Results, error) {
+    // e.g. results
+    // [
+    //   {
+    //     "Target": "",
+    //     "Class": "custom",
+    //     "CustomResources": [
+    //       {
+    //         "Type": "wordpress-version",
+    //         "FilePath": "/usr/src/wordpress/wp-includes/version.php",
+    //         "Layer": {
+    //           "DiffID": "sha256:057649e61046e02c975b84557c03c6cca095b8c9accd3bd20eb4e432f7aec887"
+    //         },
+    //         "Data": "5.7.1"
+    //       }
+    //     ]
+    //   }
+    // ]   
+    var wpVersion int
+    for _, result := range results {
+        if result.Class != types.ClassCustom {
+            continue
+        }
+		
+        for _, c := range result.CustomResources {
+            if c.Type != typeWPVersion {
+                continue
+            }
+            wpVersion = c.Data.(string)
+            wasm.Info(fmt.Sprintf("WordPress Version: %s", wpVersion))
+
+            ...snip...
+			
+            if affectedVersion.Check(ver) {
+                vulnerable = true
+            }
+            break
+        }
+    }
+
+    if vulnerable {
+        // Add CVE-2020-36326
+        results = append(results, serialize.Result{
+            Target: wpPath,
+            Class:  types.ClassLangPkg,
+			Type:   "wordpress",
+            Vulnerabilities: []types.DetectedVulnerability {
+                {
+                    VulnerabilityID:  "CVE-2020-36326",
+                    PkgName:          "wordpress",
+                    InstalledVersion: wpVersion,
+                    FixedVersion:     "5.7.2",
+                    Vulnerability: dbTypes.Vulnerability{
+                        Title:    "PHPMailer 6.1.8 through 6.4.0 allows object injection through Phar Deserialization via addAttachment with a UNC pathname.",
+                        Severity: "CRITICAL",
+                    },
+                },
+            },
+        })
+    }
+    return results, nil
+}
+```
+
+The new vulnerability will be added to the scan results.
+This example shows how the module inserts a new finding.
+If you are interested in `Update`, you can see an example of [Spring4Shell][trivy-module-spring4shell].
+
+In the `Delete` action, `PostScan` needs to return results you want to delete.
+If `PostScan` returns an empty, Trivy will not delete anything.
+
+#### Build
+Follow [the install guide][tinygo-installation] and install TinyGo.
+
+```bash
+$ tinygo build -o wordpress.wasm -scheduler=none -target=wasi --no-debug wordpress.go
+```
+
+Put the built binary to the module directory that is under the home directory by default.
+
+```bash
+$ mkdir -p ~/.trivy/modules
+$ cp spring4shell.wasm ~/.trivy/modules
+```
+
+## Distribute Your Module
+You can distribute your own module in OCI registries. Please follow [the oras installation instruction][oras].
+
+```bash
+oras push ghcr.io/aquasecurity/trivy-module-wordpress:latest wordpress.wasm:application/vnd.module.wasm.content.layer.v1+wasm
+Uploading 3daa3dac086b wordpress.wasm
+Pushed ghcr.io/aquasecurity/trivy-module-wordpress:latest
+Digest: sha256:6416d0199d66ce52ced19f01d75454b22692ff3aa7737e45f7a189880840424f
+```
+
+## Examples
+- [Spring4Shell][trivy-module-spring4shell]
+- [WordPress][trivy-module-wordpress]
+
+[regexp]: https://github.com/google/re2/wiki/Syntax
+
+[tinygo]: https://tinygo.org/
+[spring4shell]: https://blog.aquasec.com/zero-day-rce-vulnerability-spring4shell
+[wazero]: https://github.com/tetratelabs/wazero
+
+[trivy-module-spring4shell]: https://github.com/aquasecurity/trivy/tree/main/examples/module/spring4shell
+[trivy-module-wordpress]: https://github.com/aquasecurity/trivy-module-wordpress
+
+[tinygo-installation]: https://tinygo.org/getting-started/install/
+[oras]: https://oras.land/cli/

docs/docs/index.md

@@ -5,17 +5,22 @@ Trivy detects two types of security issues:
 - [Vulnerabilities][vuln]
 - [Misconfigurations][misconf]
 
-Trivy can scan three different artifacts:
+Trivy can scan four different artifacts:
 
 - [Container Images][container]
 - [Filesystem][filesystem] and [Rootfs][rootfs]
 - [Git Repositories][repo]
+- [Kubernetes][kubernetes]
 
 Trivy can be run in two different modes:
 
 - [Standalone][standalone]
 - [Client/Server][client-server]
 
+Trivy can be run as a Kubernetes Operator:
+
+- [Kubernetes Operator][kubernetesoperator]
+
 It is designed to be used in CI. Before pushing to a container registry or deploying your application, you can scan your local container image and other artifacts easily.
 See [Integrations][integrations] for details.
 
@@ -56,17 +61,20 @@ See [Integrations][integrations] for details.
     - local filesystem and rootfs
     - remote git repository
 - [SBOM][sbom] (Software Bill of Materials) support
-    - CycloneDX 
+    - CycloneDX
+    - SPDX
 
 Please see [LICENSE][license] for Trivy licensing information.
 
 [installation]: ../getting-started/installation.md
 [vuln]: ../docs/vulnerability/scanning/index.md
-[misconf]: ../docs/misconfiguration/index.md
+[misconf]: ../docs/misconfiguration/scanning.md
+[kubernetesoperator]: ../docs/kubernetes/operator/index.md
 [container]: ../docs/vulnerability/scanning/image.md
 [rootfs]: ../docs/vulnerability/scanning/rootfs.md
 [filesystem]: ../docs/vulnerability/scanning/filesystem.md
 [repo]: ../docs/vulnerability/scanning/git-repository.md
+[kubernetes]: ../docs/kubernetes/cli/scanning.md
 
 [standalone]: ../docs/references/modes/standalone.md
 [client-server]: ../docs/references/modes/client-server.md

docs/docs/integrations/gitlab-ci.md

@@ -1,10 +1,17 @@
 # GitLab CI
 
-If you're a GitLab Ultimate customer, GitLab 14.0 and above include out-of-the-box integration with Trivy. To enable it for your project, simply add the container scanning template to your `.gitlab-ci.yml` file. For more details, please refer to [GitLab's documentation](https://docs.gitlab.com/ee/user/application_security/container_scanning/).
+GitLab 15.0 includes [free](https://gitlab.com/groups/gitlab-org/-/epics/2233) integration with Trivy.
 
-If you're using an earlier version of GitLab, you can still use the new integration by copying the [contents of the 14.0 template](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml) to your configuration.
+To [configure container scanning with Trivy in GitLab](https://docs.gitlab.com/ee/user/application_security/container_scanning/#configuration), simply include the CI template in your `.gitlab-ci.yml` file:
 
-Alternatively, you can always use the example configurations below.
+```yaml
+include:
+  - template: Security/Container-Scanning.gitlab-ci.yml
+```
+
+If you're a GitLab 14.x Ultimate customer, you can use the same configuration above.
+
+Alternatively, you can always use the example configurations below. Note that the examples use [`contrib/gitlab.tpl`](https://github.com/aquasecurity/trivy/blob/main/contrib/gitlab.tpl), which does not work with GitLab 15.0 and above (for details, see [issue 1598](https://github.com/aquasecurity/trivy/issues/1598)).
 
 ```yaml
 stages:

docs/docs/kubernetes/cli/scanning.md

@@ -0,0 +1,220 @@
+# Kubernetes
+
+!!! warning "EXPERIMENTAL"
+    This feature might change without preserving backwards compatibility.
+
+The Trivy K8s CLI allows you to scan your Kubernetes cluster for Vulnerabilities, Secrets and Misconfigurations. You can either run the CLI locally or integrate it into your CI/CD pipeline. The difference to the Trivy CLI is that the Trivy K8s CLI allows you to scan running workloads directly within your cluster.
+
+If you are looking for continuous cluster audit scanning, have a look at the [Trivy K8s operator.](../operator/getting-started.md)
+
+Trivy uses your local kubectl configuration to access the API server to list artifacts.
+
+## CLI Commands
+
+Scan a full cluster and generate a simple summary report:
+
+```
+$ trivy k8s --report=summary cluster
+```
+
+![k8s Summary Report](../../../imgs/trivy-k8s.png)
+
+The summary report is the default. To get all of the detail the output contains, use `--report all`.
+
+Filter by severity:
+
+```
+$ trivy k8s --severity=CRITICAL --report=all cluster
+```
+
+Filter by security check (Vulnerabilties, Secrets or Misconfigurations):
+
+```
+$ trivy k8s --security-checks=secret --report=summary cluster
+# or
+$ trivy k8s --security-checks=config --report=summary cluster
+```
+
+Scan a specific namespace:
+
+```
+$ trivy k8s -n kube-system --report=summary all
+```
+
+Scan a specific resource and get all the output:
+
+```
+$ trivy k8s deployment appname
+```
+
+If you want to pass in flags before scanning specific workloads, you will have to do it before the resource name.
+For example, scanning a deployment in the app namespace of your Kubernetes cluster for critical vulnerabilities would be done through the following command:
+
+```
+$ trivy k8s -n app --severity=CRITICAL deployment/appname
+```
+This is specific to all Trivy CLI commands.
+
+The supported formats are `table`, which is the default, and `json`.
+To get a JSON output on a full cluster scan:
+
+```
+$ trivy k8s --format json -o results.json cluster
+```
+
+<details>
+<summary>Result</summary>
+
+```json
+{
+  "ClusterName": "minikube",
+  "Vulnerabilities": [
+    {
+      "Namespace": "default",
+      "Kind": "Deployment",
+      "Name": "app",
+      "Results": [
+        {
+          "Target": "ubuntu:latest (ubuntu 22.04)",
+          "Class": "os-pkgs",
+          "Type": "ubuntu",
+          "Vulnerabilities": [
+            {
+              "VulnerabilityID": "CVE-2016-2781",
+              "PkgName": "coreutils",
+              "InstalledVersion": "8.32-4.1ubuntu1",
+              "Layer": {
+                "Digest": "sha256:125a6e411906fe6b0aaa50fc9d600bf6ff9bb11a8651727ce1ed482dc271c24c",
+                "DiffID": "sha256:e59fc94956120a6c7629f085027578e6357b48061d45714107e79f04a81a6f0c"
+              },
+              "SeveritySource": "ubuntu",
+              "PrimaryURL": "https://avd.aquasec.com/nvd/cve-2016-2781",
+              "DataSource": {
+                "ID": "ubuntu",
+                "Name": "Ubuntu CVE Tracker",
+                "URL": "https://git.launchpad.net/ubuntu-cve-tracker"
+              },
+              "Title": "coreutils: Non-privileged session can escape to the parent session in chroot",
+              "Description": "chroot in GNU coreutils, when used with --userspec, allows local users to escape to the parent session via a crafted TIOCSTI ioctl call, which pushes characters to the terminal's input buffer.",
+              "Severity": "LOW",
+              "CweIDs": [
+                "CWE-20"
+              ],
+              "VendorSeverity": {
+                "cbl-mariner": 2,
+                "nvd": 2,
+                "redhat": 2,
+                "ubuntu": 1
+              },
+              "CVSS": {
+                "nvd": {
+                  "V2Vector": "AV:L/AC:L/Au:N/C:N/I:P/A:N",
+                  "V3Vector": "CVSS:3.0/AV:L/AC:L/PR:L/UI:N/S:C/C:N/I:H/A:N",
+                  "V2Score": 2.1,
+                  "V3Score": 6.5
+                },
+                "redhat": {
+                  "V2Vector": "AV:L/AC:H/Au:N/C:C/I:C/A:C",
+                  "V3Vector": "CVSS:3.0/AV:L/AC:L/PR:N/UI:R/S:C/C:H/I:H/A:H",
+                  "V2Score": 6.2,
+                  "V3Score": 8.6
+                }
+              },
+              "References": [
+                "http://seclists.org/oss-sec/2016/q1/452",
+                "http://www.openwall.com/lists/oss-security/2016/02/28/2",
+                "http://www.openwall.com/lists/oss-security/2016/02/28/3",
+                "https://access.redhat.com/security/cve/CVE-2016-2781",
+                "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2781",
+                "https://lists.apache.org/thread.html/rf9fa47ab66495c78bb4120b0754dd9531ca2ff0430f6685ac9b07772@%3Cdev.mina.apache.org%3E",
+                "https://lore.kernel.org/patchwork/patch/793178/",
+                "https://nvd.nist.gov/vuln/detail/CVE-2016-2781"
+              ],
+              "PublishedDate": "2017-02-07T15:59:00Z",
+              "LastModifiedDate": "2021-02-25T17:15:00Z"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "Misconfigurations": [
+    {
+      "Namespace": "default",
+      "Kind": "Deployment",
+      "Name": "app",
+      "Results": [
+        {
+          "Target": "Deployment/app",
+          "Class": "config",
+          "Type": "kubernetes",
+          "MisconfSummary": {
+            "Successes": 20,
+            "Failures": 19,
+            "Exceptions": 0
+          },
+          "Misconfigurations": [
+            {
+              "Type": "Kubernetes Security Check",
+              "ID": "KSV001",
+              "Title": "Process can elevate its own privileges",
+              "Description": "A program inside the container can elevate its own privileges and run as root, which might give the program control over the container and node.",
+              "Message": "Container 'app' of Deployment 'app' should set 'securityContext.allowPrivilegeEscalation' to false",
+              "Namespace": "builtin.kubernetes.KSV001",
+              "Query": "data.builtin.kubernetes.KSV001.deny",
+              "Resolution": "Set 'set containers[].securityContext.allowPrivilegeEscalation' to 'false'.",
+              "Severity": "MEDIUM",
+              "PrimaryURL": "https://avd.aquasec.com/misconfig/ksv001",
+              "References": [
+                "https://kubernetes.io/docs/concepts/security/pod-security-standards/#restricted",
+                "https://avd.aquasec.com/misconfig/ksv001"
+              ],
+              "Status": "FAIL",
+              "Layer": {},
+              "IacMetadata": {
+                "Provider": "Kubernetes",
+                "Service": "general",
+                "StartLine": 121,
+                "EndLine": 133
+              }
+            },
+            {
+              "Type": "Kubernetes Security Check",
+              "ID": "KSV003",
+              "Title": "Default capabilities not dropped",
+              "Description": "The container should drop all default capabilities and add only those that are needed for its execution.",
+              "Message": "Container 'app' of Deployment 'app' should add 'ALL' to 'securityContext.capabilities.drop'",
+              "Namespace": "builtin.kubernetes.KSV003",
+              "Query": "data.builtin.kubernetes.KSV003.deny",
+              "Resolution": "Add 'ALL' to containers[].securityContext.capabilities.drop.",
+              "Severity": "LOW",
+              "PrimaryURL": "https://avd.aquasec.com/misconfig/ksv003",
+              "References": [
+                "https://kubesec.io/basics/containers-securitycontext-capabilities-drop-index-all/",
+                "https://avd.aquasec.com/misconfig/ksv003"
+              ],
+              "Status": "FAIL",
+              "Layer": {},
+              "IacMetadata": {
+                "Provider": "Kubernetes",
+                "Service": "general",
+                "StartLine": 121,
+                "EndLine": 133
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Namespace": "default",
+      "Kind": "ConfigMap",
+      "Name": "kube-root-ca.crt"
+    }
+  ]
+}
+
+```
+
+</details>
+

docs/docs/kubernetes/operator/configuration-auditing/built-in-policies.md

@@ -0,0 +1,107 @@
+# Built-in Configuration Audit Policies
+
+The following sections list built-in configuration audit policies installed with trivy-operator. They are stored in the
+`trivy-operator-policies-config` ConfigMap created in the installation namespace (e.g. `trivy-system`). You can modify
+them or add a new policy. For example, follow the [Writing Custom Configuration Audit Policies] tutorial to add a custom
+policy that checks for recommended Kubernetes labels on any resource kind.
+
+## General
+
+| NAME                                       | DESCRIPTION                                                                                                                                                                                                         | KINDS    |
+|--------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| [CPU not limited]                          | Enforcing CPU limits prevents DoS via resource exhaustion.                                                                                                                                                          | Workload |
+| [CPU requests not specified]               | When containers have resource requests specified, the scheduler can make better decisions about which nodes to place pods on, and how to deal with resource contention.                                             | Workload |
+| [SYS_ADMIN capability added]               | SYS_ADMIN gives the processes running inside the container privileges that are equivalent to root.                                                                                                                  | Workload |
+| [Default capabilities not dropped]         | The container should drop all default capabilities and add only those that are needed for its execution.                                                                                                            | Workload |
+| [Root file system is not read-only]        | An immutable root file system prevents applications from writing to their local disk. This can limit intrusions, as attackers will not be able to tamper with the file system or write foreign executables to disk. | Workload |
+| [Memory not limited]                       | Enforcing memory limits prevents DoS via resource exhaustion.                                                                                                                                                       | Workload |
+| [Memory requests not specified]            | When containers have memory requests specified, the scheduler can make better decisions about which nodes to place pods on, and how to deal with resource contention.                                               | Workload |
+| [hostPath volume mounted with docker.sock] | Mounting docker.sock from the host can give the container full root access to the host.                                                                                                                             | Workload |
+| [Runs with low group ID]                   | Force the container to run with group ID > 10000 to avoid conflicts with the host’s user table.                                                                                                                     | Workload |
+| [Runs with low user ID]                    | Force the container to run with user ID > 10000 to avoid conflicts with the host’s user table.                                                                                                                      | Workload |
+| [Tiller Is Deployed]                       | Check if Helm Tiller component is deployed.                                                                                                                                                                         | Workload |
+| [Image tag ':latest' used]                 | It is best to avoid using the ':latest' image tag when deploying containers in production. Doing so makes it hard to track which version of the image is running, and hard to roll back the version.                | Workload |
+
+## Advanced
+
+| NAME                                                           | DESCRIPTION                                                                                                                              | KINDS         |
+|----------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------|---------------|
+| [Unused capabilities should be dropped (drop any)]             | Security best practices require containers to run with minimal required capabilities.                                                    | Workload      |
+| [hostAliases is set]                                           | Managing /etc/hosts aliases can prevent the container engine from modifying the file after a pod’s containers have already been started. | Workload      |
+| [User Pods should not be placed in kube-system namespace]      | ensure that User pods are not placed in kube-system namespace                                                                            | Workload      |
+| [Protecting Pod service account tokens]                        | ensure that Pod specifications disable the secret token being mounted by setting automountServiceAccountToken: false                     | Workload      |
+| [Selector usage in network policies]                           | ensure that network policies selectors are applied to pods or namespaces to restricted ingress and egress traffic within the pod network | NetworkPolicy |
+| [limit range usage]                                            | ensure limit range policy has configure in order to limit resource usage for namespaces or nodes                                         | LimitRange    |
+| [resource quota usage]                                         | ensure resource quota policy has configure in order to limit aggregate resource usage within namespace                                   | ResourceQuota |
+| [All container images must start with the *.azurecr.io domain] | Containers should only use images from trusted registries.                                                                               | Workload      |
+| [All container images must start with a GCR domain]            | Containers should only use images from trusted GCR registries.                                                                           | Workload      |
+
+## Pod Security Standard
+
+### Baseline
+
+| NAME                               | DESCRIPTION                                                                                                                                                                                                                                                                              | KINDS    |
+|------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| [Access to host IPC namespace]     | Sharing the host’s IPC namespace allows container processes to communicate with processes on the host.                                                                                                                                                                                   | Workload |
+| [Access to host network]           | Sharing the host’s network namespace permits processes in the pod to communicate with processes bound to the host’s loopback adapter.                                                                                                                                                    | Workload |
+| [Access to host PID]               | Sharing the host’s PID namespace allows visibility on host processes, potentially leaking information such as environment variables and configuration.                                                                                                                                   | Workload |
+| [Privileged container]             | Privileged containers share namespaces with the host system and do not offer any security. They should be used exclusively for system containers that require high privileges.                                                                                                           | Workload |
+| [Non-default capabilities added]   | Adding NET_RAW or capabilities beyond the default set must be disallowed.                                                                                                                                                                                                                | Workload |
+| [hostPath volumes mounted]         | HostPath volumes must be forbidden.                                                                                                                                                                                                                                                      | Workload |
+| [Access to host ports]             | HostPorts should be disallowed, or at minimum restricted to a known list.                                                                                                                                                                                                                | Workload |
+| [Default AppArmor profile not set] | A program inside the container can bypass AppArmor protection policies.                                                                                                                                                                                                                  | Workload |
+| [SELinux custom options set]       | Setting a custom SELinux user or role option should be forbidden.                                                                                                                                                                                                                        | Workload |
+| [Non-default /proc masks set]      | The default /proc masks are set up to reduce attack surface, and should be required.                                                                                                                                                                                                     | Workload |
+| [Unsafe sysctl options set]        | Sysctls can disable security mechanisms or affect all containers on a host, and should be disallowed except for an allowed 'safe' subset. A sysctl is considered safe if it is namespaced in the container or the Pod, and it is isolated from other Pods or processes on the same Node. | Workload |
+
+### Restricted
+
+| NAME                                      | DESCRIPTION                                                                                                                                      | KINDS    |
+|-------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|----------|
+| [Non-ephemeral volume types used]         | In addition to restricting HostPath volumes, usage of non-ephemeral volume types should be limited to those defined through PersistentVolumes.   | Workload |
+| [Process can elevate its own privileges]  | A program inside the container can elevate its own privileges and run as root, which might give the program control over the container and node. | Workload |
+| [Runs as root user]                       | 'runAsNonRoot' forces the running image to run as a non-root user to ensure least privileges.                                                    | Workload |
+| [A root primary or supplementary GID set] | Containers should be forbidden from running with a root primary or supplementary GID.                                                            | Workload |
+| [Default Seccomp profile not set]         | The RuntimeDefault seccomp profile must be required, or allow specific additional profiles.                                                      | Workload |
+
+
+[CPU not limited]: https://avd.aquasec.com/misconfig/kubernetes/ksv011/
+[CPU requests not specified]: https://avd.aquasec.com/misconfig/kubernetes/ksv015/
+[SYS_ADMIN capability added]: https://avd.aquasec.com/misconfig/kubernetes/ksv005/
+[Default capabilities not dropped]: https://avd.aquasec.com/misconfig/kubernetes/ksv003/
+[Root file system is not read-only]: https://avd.aquasec.com/misconfig/kubernetes/ksv014/
+[Memory not limited]: https://avd.aquasec.com/misconfig/kubernetes/ksv018/
+[Memory requests not specified]: https://avd.aquasec.com/misconfig/kubernetes/ksv016/
+[hostPath volume mounted with docker.sock]: https://avd.aquasec.com/misconfig/kubernetes/ksv006/
+[Runs with low group ID]: https://avd.aquasec.com/misconfig/kubernetes/ksv021/
+[Runs with low user ID]: https://avd.aquasec.com/misconfig/kubernetes/ksv020/
+[Tiller Is Deployed]: https://avd.aquasec.com/misconfig/kubernetes/ksv102/
+[Image tag ':latest' used]: https://avd.aquasec.com/misconfig/kubernetes/ksv013/
+
+[Unused capabilities should be dropped (drop any)]: https://avd.aquasec.com/misconfig/kubernetes/ksv004/
+[hostAliases is set]: https://avd.aquasec.com/misconfig/kubernetes/ksv007/
+[User Pods should not be placed in kube-system namespace]: https://avd.aquasec.com/misconfig/kubernetes/ksv037/
+[Protecting Pod service account tokens]: https://avd.aquasec.com/misconfig/kubernetes/ksv036/
+[Selector usage in network policies]: https://avd.aquasec.com/misconfig/kubernetes/ksv038/
+[limit range usage]: https://avd.aquasec.com/misconfig/kubernetes/ksv039/
+[resource quota usage]: https://avd.aquasec.com/misconfig/kubernetes/ksv040/
+[All container images must start with the *.azurecr.io domain]: https://avd.aquasec.com/misconfig/kubernetes/ksv032/
+[All container images must start with a GCR domain]: https://avd.aquasec.com/misconfig/kubernetes/ksv033/
+
+[Access to host IPC namespace]: https://avd.aquasec.com/misconfig/kubernetes/ksv008/
+[Access to host network]: https://avd.aquasec.com/misconfig/kubernetes/ksv009/
+[Access to host PID]: https://avd.aquasec.com/misconfig/kubernetes/ksv010/
+[Privileged container]: https://avd.aquasec.com/misconfig/kubernetes/ksv017/
+[Non-default capabilities added]: https://avd.aquasec.com/misconfig/kubernetes/ksv022/
+[hostPath volumes mounted]: https://avd.aquasec.com/misconfig/kubernetes/ksv023/
+[Access to host ports]: https://avd.aquasec.com/misconfig/kubernetes/ksv024/
+[Default AppArmor profile not set]: https://avd.aquasec.com/misconfig/kubernetes/ksv002/
+[SELinux custom options set]: https://avd.aquasec.com/misconfig/kubernetes/ksv025/
+[Non-default /proc masks set]: https://avd.aquasec.com/misconfig/kubernetes/ksv027/
+[Unsafe sysctl options set]: https://avd.aquasec.com/misconfig/kubernetes/ksv026/
+
+[Non-ephemeral volume types used]: https://avd.aquasec.com/misconfig/kubernetes/ksv028/
+[Process can elevate its own privileges]: https://avd.aquasec.com/misconfig/kubernetes/ksv001/
+[Runs as root user]: https://avd.aquasec.com/misconfig/kubernetes/ksv012/
+[A root primary or supplementary GID set]: https://avd.aquasec.com/misconfig/kubernetes/ksv029/
+[Default Seccomp profile not set]: https://avd.aquasec.com/misconfig/kubernetes/ksv030/

docs/docs/kubernetes/operator/configuration-auditing/index.md

@@ -0,0 +1,18 @@
+# Configuration Auditing
+
+As your organization deploys containerized workloads in Kubernetes environments, you will be faced with many
+configuration choices related to images, containers, control plane, and data plane. Setting these configurations
+improperly creates a high-impact security and compliance risk. DevOps, and platform owners need the ability to
+continuously assess build artifacts, workloads, and infrastructure against configuration hardening standards to
+remediate any violations.
+
+trivy-operator configuration audit capabilities are purpose-built for Kubernetes environments. In particular, trivy
+Operator continuously checks images, workloads, and Kubernetes infrastructure components against common configurations
+security standards and generates detailed assessment reports, which are then stored in the default Kubernetes database.
+
+Kubernetes applications and other core configuration objects, such as Ingress, NetworkPolicy and ResourceQuota resources, are evaluated against [Built-in Policies]. 
+Additionally, application and infrastructure owners can integrate these reports into incident response workflows for
+active remediation.
+
+[Built-in Policies]: ./built-in-policies.md
+

docs/docs/kubernetes/operator/configuration.md

@@ -0,0 +1,100 @@
+# Configuration
+
+You can configure Trivy-Operator to control it's behavior and adapt it to your needs. Aspects of the operator machinery are configured using environment variables on the operator Pod, while aspects of the scanning behavior are controlled by ConfigMaps and Secrets.
+
+# Operator Configuration
+
+| NAME| DEFAULT| DESCRIPTION|
+|---|---|---|
+| `OPERATOR_NAMESPACE`| N/A| See [Install modes](#install-modes)|
+| `OPERATOR_TARGET_NAMESPACES`| N/A| See [Install modes](#install-modes)|
+| `OPERATOR_EXCLUDE_NAMESPACES`| N/A| A comma separated list of namespaces (or glob patterns) to be excluded from scanning in all namespaces [Install mode](#install-modes).|
+| `OPERATOR_SERVICE_ACCOUNT`| `trivy-operator`| The name of the service account assigned to the operator's pod|
+| `OPERATOR_LOG_DEV_MODE`| `false`| The flag to use (or not use) development mode (more human-readable output, extra stack traces and logging information, etc).|
+| `OPERATOR_SCAN_JOB_TIMEOUT`| `5m`| The length of time to wait before giving up on a scan job|
+| `OPERATOR_CONCURRENT_SCAN_JOBS_LIMIT`| `10`| The maximum number of scan jobs create by the operator|
+| `OPERATOR_SCAN_JOB_RETRY_AFTER`| `30s`| The duration to wait before retrying a failed scan job|
+| `OPERATOR_BATCH_DELETE_LIMIT`| `10`| The maximum number of config audit reports deleted by the operator when the plugin's config has changed.|
+| `OPERATOR_BATCH_DELETE_DELAY`| `10s`| The duration to wait before deleting another batch of config audit reports.|
+| `OPERATOR_METRICS_BIND_ADDRESS`| `:8080`| The TCP address to bind to for serving [Prometheus][prometheus] metrics. It can be set to `0` to disable the metrics serving.|
+| `OPERATOR_HEALTH_PROBE_BIND_ADDRESS`| `:9090`| The TCP address to bind to for serving health probes, i.e. `/healthz/` and `/readyz/` endpoints.|
+| `OPERATOR_VULNERABILITY_SCANNER_ENABLED`| `true`| The flag to enable vulnerability scanner|
+| `OPERATOR_CONFIG_AUDIT_SCANNER_ENABLED`| `false`| The flag to enable configuration audit scanner|
+| `OPERATOR_CONFIG_AUDIT_SCANNER_SCAN_ONLY_CURRENT_REVISIONS`| `false`| The flag to enable config audit scanner to only scan the current revision of a deployment|
+| `OPERATOR_CONFIG_AUDIT_SCANNER_BUILTIN`| `true`| The flag to enable built-in configuration audit scanner|
+| `OPERATOR_VULNERABILITY_SCANNER_SCAN_ONLY_CURRENT_REVISIONS`| `false`| The flag to enable vulnerability scanner to only scan the current revision of a deployment|
+| `OPERATOR_VULNERABILITY_SCANNER_REPORT_TTL`| `""`| The flag to set how long a vulnerability report should exist. When a old report is deleted a new one will be created by the controller. It can be set to `""` to disabled the TTL for vulnerability scanner. |
+| `OPERATOR_LEADER_ELECTION_ENABLED`| `false`| The flag to enable operator replica leader election|
+| `OPERATOR_LEADER_ELECTION_ID`| `trivy-operator-lock`| The name of the resource lock for leader election|
+
+The values of the `OPERATOR_NAMESPACE` and `OPERATOR_TARGET_NAMESPACES` determine the install mode, which in turn determines the multitenancy support of the operator.
+
+| MODE| OPERATOR_NAMESPACE | OPERATOR_TARGET_NAMESPACES | DESCRIPTION|
+|---|---|---|---|
+| OwnNamespace| `operators`| `operators`| The operator can be configured to watch events in the namespace it is deployed in.                             |
+| SingleNamespace| `operators`| `foo`| The operator can be configured to watch for events in a single namespace that the operator is not deployed in. |
+| MultiNamespace| `operators`| `foo,bar,baz`| The operator can be configured to watch for events in more than one namespace.                                 |
+| AllNamespaces| `operators`| (blank string)| The operator can be configured to watch for events in all namespaces.|
+
+## Example - configure namespaces to scan
+
+To change the target namespace from all namespaces to the `default` namespace edit the `trivy-operator` Deployment and change the value of the `OPERATOR_TARGET_NAMESPACES` environment variable from the blank string (`""`) to the `default` value.
+
+# Scanning configuration
+
+| CONFIGMAP KEY| DEFAULT| DESCRIPTION|
+|---|---|---|
+| `vulnerabilityReports.scanner`| `Trivy`| The name of the plugin that generates vulnerability reports. Either `Trivy` or `Aqua`.|
+| `vulnerabilityReports.scanJobsInSameNamespace` | `"false"`| Whether to run vulnerability scan jobs in same namespace of workload. Set `"true"` to enable.|
+| `scanJob.tolerations`| N/A| JSON representation of the [tolerations] to be applied to the scanner pods so that they can run on nodes with matching taints. Example: `'[{"key":"key1", "operator":"Equal", "value":"value1", "effect":"NoSchedule"}]'`|
+| `scanJob.annotations`| N/A| One-line comma-separated representation of the annotations which the user wants the scanner pods to be annotated with. Example: `foo=bar,env=stage` will annotate the scanner pods with the annotations `foo: bar` and `env: stage` |
+| `scanJob.templateLabel`| N/A| One-line comma-separated representation of the template labels which the user wants the scanner pods to be labeled with. Example: `foo=bar,env=stage` will labeled the scanner pods with the labels `foo: bar` and `env: stage`|
+
+## Example - patch ConfigMap
+
+By default Trivy displays vulnerabilities with all severity levels (`UNKNOWN`, `LOW`, `MEDIUM`, `HIGH`, `CRITICAL`). To display only `HIGH` and `CRITICAL` vulnerabilities by patching the `trivy.severity` value in the `trivy-operator-trivy-config` ConfigMap:
+
+```bash
+kubectl patch cm trivy-operator-trivy-config -n trivy-operator \
+  --type merge \
+  -p "$(cat <<EOF
+{
+  "data": {
+    "trivy.severity": "HIGH,CRITICAL"
+  }
+}
+EOF
+)"
+```
+
+## Example - patch Secret
+
+To set the GitHub token used by Trivy scanner add the `trivy.githubToken` value to the `trivy-operator-trivy-config` Secret:
+
+```bash
+kubectl patch secret trivy-operator-trivy-config -n trivy-operator \
+  --type merge \
+  -p "$(cat <<EOF
+{
+  "data": {
+    "trivy.githubToken": "$(echo -n <your token> | base64)"
+  }
+}
+EOF
+)"
+```
+
+## Example - delete a key
+
+The following `kubectl patch` command deletes the `trivy.httpProxy` key:
+
+```bash
+kubectl patch cm trivy-operator-trivy-config -n trivy-operator \
+  --type json \
+  -p '[{"op": "remove", "path": "/data/trivy.httpProxy"}]'
+```
+
+[tolerations]: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration
+
+
+[prometheus]: https://github.com/prometheus

docs/docs/kubernetes/operator/getting-started.md

@@ -0,0 +1,195 @@
+# Getting Started
+
+## Before you Begin
+
+You need to have a Kubernetes cluster, and the kubectl command-line tool must be configured to communicate with your
+cluster. If you do not already have a cluster, you can create one by installing [minikube], [kind] or [microk8s], or you can use the following [Kubernetes playground].
+
+You also need the Trivy-Operator to be installed in the `trivy-system` namespace, e.g. with
+[kubectl](./installation/kubectl.md) or [Helm](./installation/helm.md). Let's also assume that the operator is
+configured to discover built-in Kubernetes resources in all namespaces, except `kube-system` and `trivy-system`.
+
+## Workloads Scanning
+
+Let's create the `nginx` Deployment that we know is vulnerable:
+
+```
+kubectl create deployment nginx --image nginx:1.16
+```
+
+When the `nginx` Deployment is created, the operator immediately detects its current revision (aka active ReplicaSet)
+and scans the `nginx:1.16` image for vulnerabilities. It also audits the ReplicaSet's specification for common pitfalls
+such as running the `nginx` container as root.
+
+If everything goes fine, the operator saves scan reports as VulnerabilityReport and ConfigAuditReport resources in the
+`default` namespace. Reports are named after the scanned ReplicaSet. For image vulnerability scans, the operator creates
+a VulnerabilityReport for each different container. In this example there is just one container image called `nginx`:
+
+```
+kubectl get vulnerabilityreports -o wide
+```
+<details>
+<summary>Result</summary>
+
+```
+NAME                                REPOSITORY      TAG    SCANNER   AGE   CRITICAL   HIGH   MEDIUM   LOW   UNKNOWN
+replicaset-nginx-78449c65d4-nginx   library/nginx   1.16   Trivy     85s   33         62     49       114   1
+```
+</details>
+
+```
+kubectl get configauditreports -o wide
+```
+<details>
+<summary>Result</summary>
+
+```
+NAME                          SCANNER     AGE    CRITICAL  HIGH   MEDIUM   LOW
+replicaset-nginx-78449c65d4   Trivy-Operator   2m7s   0         0      6        7
+```
+</details>
+
+Notice that scan reports generated by the operator are controlled by Kubernetes workloads. In our example,
+VulnerabilityReport and ConfigAuditReport resources are controlled by the active ReplicaSet of the `nginx` Deployment:
+
+```console
+kubectl tree deploy nginx
+```
+
+<details>
+<summary>Result</summary>
+
+```
+NAMESPACE  NAME                                                       READY  REASON  AGE
+default    Deployment/nginx                                           -              7h2m
+default    └─ReplicaSet/nginx-78449c65d4                              -              7h2m
+default      ├─ConfigAuditReport/replicaset-nginx-78449c65d4          -              2m31s
+default      ├─Pod/nginx-78449c65d4-5wvdx                             True           7h2m
+default      └─VulnerabilityReport/replicaset-nginx-78449c65d4-nginx  -              2m7s
+```
+</details>
+
+!!! note
+    The [tree] command is a kubectl plugin to browse Kubernetes object hierarchies as a tree.
+
+Moving forward, let's update the container image of the `nginx` Deployment from `nginx:1.16` to `nginx:1.17`. This will
+trigger a rolling update of the Deployment and eventually create another ReplicaSet.
+
+```
+kubectl set image deployment nginx nginx=nginx:1.17
+```
+
+Even this time the operator will pick up changes and rescan our Deployment with updated configuration:
+
+```
+kubectl tree deploy nginx
+```
+
+<details>
+<summary>Result</summary>
+
+```
+NAMESPACE  NAME                                                       READY  REASON  AGE
+default    Deployment/nginx                                           -              7h5m
+default    ├─ReplicaSet/nginx-5fbc65fff                               -              2m36s
+default    │ ├─ConfigAuditReport/replicaset-nginx-5fbc65fff           -              2m36s
+default    │ ├─Pod/nginx-5fbc65fff-j7zl2                              True           2m36s
+default    │ └─VulnerabilityReport/replicaset-nginx-5fbc65fff-nginx   -              2m22s
+default    └─ReplicaSet/nginx-78449c65d4                              -              7h5m
+default      ├─ConfigAuditReport/replicaset-nginx-78449c65d4          -              5m46s
+default      └─VulnerabilityReport/replicaset-nginx-78449c65d4-nginx  -              5m22s
+```
+</details>
+
+By following this guide you could realize that the operator knows how to attach VulnerabilityReport and
+ConfigAuditReport resources to build-in Kubernetes objects. What's more, in this approach where a custom resource
+inherits a life cycle of the built-in resource we could leverage Kubernetes garbage collection. For example, when the
+previous ReplicaSet named `nginx-78449c65d4` is deleted the VulnerabilityReport named `replicaset-nginx-78449c65d4-nginx`
+as well as the ConfigAuditReport named `replicaset-nginx-78449c65d46` are automatically garbage collected.
+
+!!! tip
+    If you only want the latest ReplicaSet in your Deployment to be scanned for vulnerabilities, you can set the value
+    of the `OPERATOR_VULNERABILITY_SCANNER_SCAN_ONLY_CURRENT_REVISIONS` environment variable to `true` in the operator's
+    deployment descriptor. This is useful to identify vulnerabilities that impact only the running workloads.
+
+!!! tip
+    If you only want the latest ReplicaSet in your Deployment to be scanned for config audit, you can set the value
+    of the `OPERATOR_CONFIG_AUDIT_SCANNER_SCAN_ONLY_CURRENT_REVISIONS` environment variable to `true` in the operator's
+    deployment descriptor. This is useful to identify config issues that impact only the running workloads.
+
+!!! tip
+    You can get and describe `vulnerabilityreports` and `configauditreports` as built-in Kubernetes objects:
+    ```
+    kubectl get vulnerabilityreport replicaset-nginx-5fbc65fff-nginx -o json
+    kubectl describe configauditreport replicaset-nginx-5fbc65fff
+    ```
+
+Notice that scaling up the `nginx` Deployment will not schedule new scans because all replica Pods refer to the same Pod
+template defined by the `nginx-5fbc65fff` ReplicaSet.
+
+```
+kubectl scale deploy nginx --replicas 3
+```
+
+```
+kubectl tree deploy nginx
+```
+
+<details>
+<summary>Result</summary>
+
+```
+NAMESPACE  NAME                                                       READY  REASON  AGE
+default    Deployment/nginx                                           -              7h6m
+default    ├─ReplicaSet/nginx-5fbc65fff                               -              4m7s
+default    │ ├─ConfigAuditReport/replicaset-nginx-5fbc65fff           -              4m7s
+default    │ ├─Pod/nginx-5fbc65fff-458n7                              True           8s
+default    │ ├─Pod/nginx-5fbc65fff-fk847                              True           8s
+default    │ ├─Pod/nginx-5fbc65fff-j7zl2                              True           4m7s
+default    │ └─VulnerabilityReport/replicaset-nginx-5fbc65fff-nginx   -              3m53s
+default    └─ReplicaSet/nginx-78449c65d4                              -              7h6m
+default      ├─ConfigAuditReport/replicaset-nginx-78449c65d4          -              7m17s
+default      └─VulnerabilityReport/replicaset-nginx-78449c65d4-nginx  -              6m53s
+```
+</details>
+
+Finally, when you delete the `nginx` Deployment, orphaned security reports will be deleted in the background by the
+Kubernetes garbage collection controller.
+
+```
+kubectl delete deploy nginx
+```
+
+```console
+kubectl get vuln,configaudit
+```
+
+<details>
+<summary>Result</summary>
+
+```
+No resources found in default namespace.
+```
+</details>
+
+!!! Tip
+    Use `vuln` and `configaudit` as short names for `vulnerabilityreports` and `configauditreports` resources.
+
+!!! Note
+    You can define the validity period for VulnerabilityReports by setting the duration as the value of the
+    `OPERATOR_VULNERABILITY_SCANNER_REPORT_TTL` environment variable. For example, setting the value to `24h`
+    would delete reports after 24 hours. When a VulnerabilityReport gets deleted Trivy-Operator will automatically
+
+
+
+## What's Next?
+
+- Find out how the operator scans workloads that use container images from [Private Registries].
+- By default, the operator uses Trivy as [Vulnerability Scanner] and Polaris as [Configuration Checker], but you can
+  choose other tools that are integrated with Trivy-Operator or even implement you own plugin.
+
+[minikube]: https://minikube.sigs.k8s.io/docs/
+[kind]: https://kind.sigs.k8s.io/docs/
+[microk8s]: https://microk8s.io/
+[Kubernetes playground]: http://labs.play-with-k8s.com/
+[tree]: https://github.com/ahmetb/kubectl-tree

docs/docs/kubernetes/operator/images/trivy-operator-icon-white.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22"><path d="M19.90856,11.37359l-.94046,1.16318.04433.42088a.66075.66075,0,0,1,.00653.25385l-.00778.04071a.66193.66193,0,0,1-.08906.21314c-.01313.01986-.027.03932-.0384.0537l-4.57928,5.69351a.70189.70189,0,0,1-.53066.25266l-7.34439-.00171a.70458.70458,0,0,1-.52974-.25154L1.32209,13.51754a.64957.64957,0,0,1-.096-.16658.71032.71032,0,0,1-.02863-.08952.66205.66205,0,0,1-.00515-.30511l1.6348-7.10077a.66883.66883,0,0,1,.1355-.274.65915.65915,0,0,1,.22568-.17666L9.80881,2.24386a.69063.69063,0,0,1,.29475-.0667l.00515.0002.03424.00112a.68668.68668,0,0,1,.25649.06544l6.61569,3.161a.66765.66765,0,0,1,.21678.165.675.675,0,0,1,.14909.29139l.60521,2.64815,1.1606-.20569-.61853-2.70614a1.85372,1.85372,0,0,0-1.00544-1.25474l-6.616-3.16113a1.84812,1.84812,0,0,0-.67883-.17726l-.03061-.00218c-.02692-.00125-.05416-.00152-.05851-.00152L10.10146,1a1.87317,1.87317,0,0,0-.80022.18175l-6.62038,3.161a1.83083,1.83083,0,0,0-.62572.48916,1.84956,1.84956,0,0,0-.37523.75964L.04518,12.69226a1.84474,1.84474,0,0,0,.00956.8516,1.88289,1.88289,0,0,0,.07772.24244,1.826,1.826,0,0,0,.27219.46878L4.98281,19.9503a1.8815,1.8815,0,0,0,1.4473.6903l7.34394.00172a1.87874,1.87874,0,0,0,1.4475-.69182l4.58278-5.698c.03609-.04578.07026-.093.10252-.14243a1.82018,1.82018,0,0,0,.25207-.59695c.00805-.03517.01484-.07079.021-.10773a1.8273,1.8273,0,0,0-.02032-.71135Z" style="fill:#fff"/><polygon points="9.436 4.863 9.332 11.183 12.92 10.115 9.436 4.863" style="fill:#fff"/><polygon points="7.913 11.605 8.265 11.5 8.617 11.395 8.629 11.392 8.74 4.605 8.753 3.838 8.384 4.915 8.015 5.994 5.964 11.986 6.684 11.971 7.913 11.605" style="fill:#fff"/><polygon points="5.738 13.279 5.888 12.956 6.014 12.685 5.723 12.691 5.352 12.699 5.06 12.705 1.918 12.771 4.498 15.952 5.588 13.603 5.738 13.279" style="fill:#fff"/><polygon points="14.026 10.516 13.675 10.621 13.324 10.725 9.32 11.917 8.969 12.021 8.617 12.126 8.604 12.13 8.252 12.235 7.9 12.339 7.593 12.431 7.894 12.688 8.238 12.982 8.583 13.277 8.598 13.289 8.943 13.584 9.288 13.879 9.61 14.154 9.896 14.398 10.183 14.643 14.064 17.958 22 8.143 14.026 10.516" style="fill:#fff"/><polygon points="9.273 14.787 9.229 14.749 8.943 14.505 8.928 14.492 8.583 14.197 8.567 14.183 8.222 13.889 7.877 13.594 7.362 13.154 7.086 12.919 6.81 12.683 6.794 12.669 6.641 12.998 6.488 13.328 6.468 13.371 6.318 13.694 6.168 14.017 4.989 16.557 4.989 16.558 4.99 16.558 4.992 16.559 5.341 16.638 5.691 16.716 12.164 18.175 12.895 18.339 13.625 18.504 9.516 14.994 9.273 14.787" style="fill:#fff"/></svg>

docs/docs/kubernetes/operator/index.md

@@ -0,0 +1,15 @@
+# Trivy Operator 
+
+Trivy has a native [Kubernetes Operator](operator) which continuously scans your Kubernetes cluster for security issues, and generates security reports as Kubernetes [Custom Resources](crd). It does it by watching Kubernetes for state changes and automatically triggering scans in response to changes, for example initiating a vulnerability scan when a new Pod is created.
+
+> Trivy Operator is based on existing Aqua OSS project - [Starboard], and shares some of the design, principles and code with it. Existing content that relates to Starboard Operator might also be relevant for Trivy Operator. To learn more about the transition from Starboard from Trivy, see the [announcement discussion](starboard-announcement).
+
+<figure>
+  <img src="./images/operator/trivy-operator-workloads.png" />
+  <figcaption>Workload reconcilers discover K8s controllers, manage scan jobs, and create VulnerabilityReport and ConfigAuditReport objects.</figcaption>
+</figure>
+
+[operator]: https://kubernetes.io/docs/concepts/extend-kubernetes/operator/
+[crd]: https://kubernetes.io/docs/concepts/extend-kubernetes/api-extension/custom-resources/
+[Starboard]: https://github.com/aquasecurity/starboard
+[starboard-announcement]: https://github.com/aquasecurity/starboard/discussions/1173

docs/docs/kubernetes/operator/installation/helm.md

@@ -0,0 +1,90 @@
+# Helm
+
+[Helm], which is a popular package manager for Kubernetes, allows installing applications from parameterized
+YAML manifests called Helm [charts].
+
+The Helm chart is available on GitHub in [https://github.com/aquasecurity/trivy-operator](https://github.com/aquasecurity/trivy-operator) under `/deploy/helm` and is also hosted in a Chart repository for your convenience under [https://aquasecurity.github.io/helm-charts/](https://aquasecurity.github.io/helm-charts/).
+
+## Example - Chart repository
+
+This will install the operator in the `trivy-system` namespace and configure it to scan all namespaces, except `kube-system` and `trivy-system`:
+
+```bash
+helm repo add aqua https://aquasecurity.github.io/helm-charts/
+helm repo update
+helm install trivy-operator aqua/trivy-operator \
+   --namespace trivy-system \
+   --create-namespace \
+   --set="trivy.ignoreUnfixed=true" \
+   --version {{ var.operator_version }}
+```
+
+## Example - Download the chart
+
+This will install the operator in the `trivy-system` namespace and configure it to scan all namespaces, except `kube-system` and `trivy-system`:
+
+```bash
+git clone --depth 1 --branch {{ var.operator_version }} https://github.com/aquasecurity/trivy-operator.git
+cd trivy-operator
+helm install trivy-operator ./deploy/helm \
+--namespace trivy-system \
+--create-namespace \
+--set="trivy.ignoreUnfixed=true"
+```
+
+## Post install sanity check
+
+Check that the `trivy-operator` Helm release is created in the `trivy-system` namespace, and it has status `deployed`:
+
+```console
+$ helm list -n trivy-system
+NAME              	NAMESPACE         	REVISION	UPDATED                             	STATUS  	CHART                   	APP VERSION
+trivy-operator	trivy-system	1       	2021-01-27 20:09:53.158961 +0100 CET	deployed	trivy-operator-{{ var.operator_version }}	{{  var.operator_version[1:] }}
+```
+
+To confirm that the operator is running, check that the `trivy-operator` Deployment in the `trivy-system`
+namespace is available and all its containers are ready:
+
+```console
+$ kubectl get deployment -n trivy-system
+NAME                 READY   UP-TO-DATE   AVAILABLE   AGE
+trivy-operator   1/1     1            1           11m
+```
+
+If for some reason it's not ready yet, check the logs of the Deployment for errors:
+
+```
+kubectl logs deployment/trivy-operator -n trivy-system
+```
+
+## Advanced Configuration
+
+The Helm chart supports all available [installation modes](./../configuration.md#install-modes) of Trivy Operator. 
+
+Please refer to the chart's [values] file for configuration options.
+
+## Uninstall
+
+You can uninstall the operator with the following command:
+
+```
+helm uninstall trivy-operator -n trivy-system
+```
+
+You have to manually delete custom resource definitions created by the `helm install` command:
+
+!!! danger
+    Deleting custom resource definitions will also delete all security reports generated by the operator.
+
+    ```
+    kubectl delete crd vulnerabilityreports.aquasecurity.github.io
+    kubectl delete crd clustervulnerabilityreports.aquasecurity.github.io
+    kubectl delete crd configauditreports.aquasecurity.github.io
+    kubectl delete crd clusterconfigauditreports.aquasecurity.github.io
+    kubectl delete crd clustercompliancereports.aquasecurity.github.io
+    kubectl delete crd clustercompliancedetailreports.aquasecurity.github.io
+    ```
+
+[Helm]: https://helm.sh/
+[charts]: https://helm.sh/docs/topics/charts/
+[values]: https://raw.githubusercontent.com/aquasecurity/trivy-operator/{{  var.operator_version }}/deploy/helm/values.yaml

docs/docs/kubernetes/operator/installation/kubectl.md

@@ -0,0 +1,45 @@
+# kubectl
+
+Kubernetes Yaml deployment files are available on GitHub in [https://github.com/aquasecurity/trivy-operator](https://github.com/aquasecurity/trivy-operator) under `/deploy/static`.
+
+## Example - Deploy from GitHub
+
+This will install the operator in the `trivy-system` namespace and configure it to scan all namespaces, except `kube-system` and `trivy-system`:
+
+```bash
+kubectl apply -f https://raw.githubusercontent.com/aquasecurity/trivy-operator/{{ var.operator_version }}/deploy/static/trivy-operator.yaml
+```
+
+To confirm that the operator is running, check that the `trivy-operator` Deployment in the `trivy-system`
+namespace is available and all its containers are ready:
+
+```bash
+$ kubectl get deployment -n trivy-system
+NAME                 READY   UP-TO-DATE   AVAILABLE   AGE
+trivy-operator   1/1     1            1           11m
+```
+
+If for some reason it's not ready yet, check the logs of the `trivy-operator` Deployment for errors:
+
+```bash
+kubectl logs deployment/trivy-operator -n trivy-system
+```
+
+## Advanced Configuration
+
+You can configure Trivy-Operator to control it's behavior and adapt it to your needs. Aspects of the operator machinery are configured using environment variables on the operator Pod, while aspects of the scanning behavior are controlled by ConfigMaps and Secrets.
+To learn more, please refer to the [Configuration](config) documentation.
+
+## Uninstall
+
+!!! danger
+    Uninstalling the operator and deleting custom resource definitions will also delete all generated security reports.
+
+You can uninstall the operator with the following command:
+
+```
+kubectl delete -f https://raw.githubusercontent.com/aquasecurity/trivy-operator/{{  var.operator_version }}/deploy/static/trivy-operator.yaml
+```
+
+[Settings]: ./../../settings.md
+[Helm]: ./helm.md

docs/docs/kubernetes/operator/installation/upgrade.md

@@ -0,0 +1,10 @@
+# Upgrade
+
+We recommend that you upgrade Trivy Operator often to stay up to date with the latest fixes and enhancements.
+
+However, at this stage we do not provide automated upgrades. Therefore, uninstall the previous version of the operator
+before you install the latest release.
+
+!!! warning
+    Consult release notes and changelog to revisit and migrate configuration settings which may not be compatible
+    between different versions.

docs/docs/kubernetes/operator/troubleshooting.md

@@ -0,0 +1,106 @@
+# Troubleshooting the Trivy Operator
+
+The Trivy Operator installs several Kubernetes resources into your Kubernetes cluster.
+
+Here are the common steps to check whether the operator is running correctly and to troubleshoot common issues.
+
+So in addition to this section, you might want to check [issues](https://github.com/aquasecurity/trivy/issues), [discussion forum](https://github.com/aquasecurity/trivy/discussions), or [Slack](https://slack.aquasec.com) to see if someone from the community had similar problems before.
+
+Also note that Trivy Operator is based on existing Aqua OSS project - [Starboard], and shares some of the design, principles and code with it. Existing content that relates to Starboard Operator might also be relevant for Trivy Operator, and Starboard's [issues](https://github.com/aquasecurity/starboard/issues), [discussion forum](https://github.com/aquasecurity/starboard/discussions), or [Slack](https://slack.aquasec.com) might also be interesting to check.  
+In some cases you might want to refer to [Starboard's Design documents](https://aquasecurity.github.io/starboard/latest/design/)
+
+## Installation
+
+Make sure that the latest version of the Trivy Operator is installed. For this, have a look at the installation [options.](./installation/helm.md)
+
+For instance, if your are using the Helm deployment, you need to check the Helm Chart version deployed to your cluster. You can check the Helm Chart version with the following command:
+```
+helm list -n trivy-operator
+```
+
+## Operator Pod Not Running
+
+The Trivy Operator will run a pod inside your cluster. If you have followed the installation guide, you will have installed the Operator to the `trivy-system`.
+
+Make sure that the pod is in the `Running` status:
+```
+kubectl get pods -n trivy-system
+```
+
+This is how it will look if it is running okay:
+
+```
+NAMESPACE            NAME                                         READY   STATUS    RESTARTS      AGE
+trivy-operator     trivy-operator-6c9bd97d58-hsz4g          1/1     Running   5 (19m ago)   30h
+```
+
+If the pod is in `Failed`, `Pending`, or `Unknown` check the events and the logs of the pod.
+
+First, check the events, since they might be more descriptive of the problem. However, if the events do not give a clear reason why the pod cannot spin up, then you want to check the logs, which provide more detail.
+
+```
+kubectl describe pod <POD-NAME> -n trivy-system
+```
+
+To check the logs, use the following command:
+```
+kubectl logs deployment/trivy-operator -n trivy-system
+```
+
+If your pod is not running, try to look for errors as they can give an indication on the problem.
+
+If there are too many logs messages, try deleting the Trivy pod and observe its behavior upon restarting. A new pod should spin up automatically after deleting the failed pod.
+
+## ImagePullBackOff or ErrImagePull
+
+Check the status of the Trivy Operator pod running inside of your Kubernetes cluster. If the Status is ImagePullBackOff or ErrImagePull, it means that the Operator either
+
+* tries to access the wrong image
+* cannot pull the image from the registry
+
+Make sure that you are providing the right resources upon installing the Trivy Operator.
+
+## CrashLoopBackOff
+
+If your pod is in `CrashLoopBackOff`, it is likely the case that the pod cannot be scheduled on the Kubernetes node that it is trying to schedule on.
+In this case, you want to investigate further whether there is an issue with the node. It could for instance be the case that the node does not have sufficient resources.
+
+## Reconcilation Error
+
+It could happen that the pod appears to be running normally but does not reconcile the resources inside of your Kubernetes cluster.
+
+Check the logs for reconcilation errors:
+```
+kubectl logs deployment/trivy-operator -n trivy-system
+```
+
+If this is the case, the Trivy Operator likely does not have the right configurations to access your resource. 
+
+## Operator does not Create VulnerabilityReports
+
+VulnerabilityReports are owned and controlled by the immediate Kubernetes workload. Every VulnerabilityReport of a pod is thus, linked to a [ReplicaSet.](./index.md) In case the Trivy Operator does not create a VulnerabilityReport for your workloads, it could be that it is not monitoring the namespace that your workloads are running on.
+
+An easy way to check this is by looking for the `ClusterRoleBinding` for the Trivy Operator:
+
+```
+kubectl get ClusterRoleBinding | grep "trivy-operator"
+```
+
+Alternatively, you could use the `kubectl-who-can` [plugin by Aqua](https://github.com/aquasecurity/kubectl-who-can):
+
+```console
+$ kubectl who-can list vulnerabilityreports
+No subjects found with permissions to list vulnerabilityreports assigned through RoleBindings
+
+CLUSTERROLEBINDING                           SUBJECT                         TYPE            SA-NAMESPACE
+cluster-admin                                system:masters                  Group
+trivy-operator                           trivy-operator              ServiceAccount  trivy-system
+system:controller:generic-garbage-collector  generic-garbage-collector       ServiceAccount  kube-system
+system:controller:namespace-controller       namespace-controller            ServiceAccount  kube-system
+system:controller:resourcequota-controller   resourcequota-controller        ServiceAccount  kube-system
+system:kube-controller-manager               system:kube-controller-manager  User
+```
+
+If the `ClusterRoleBinding` does not exist, Trivy currently cannot monitor any namespace outside of the `trivy-system` namespace. 
+
+For instance, if you are using the [Helm Chart](./installation/helm.md), you want to make sure to set the `targetNamespace` to the namespace that you want the Operator to monitor.

docs/docs/kubernetes/operator/vulnerability-scanning/configuration.md

@@ -0,0 +1,109 @@
+# Vulnerability Scanning Configuration
+
+## Standalone
+
+The default configuration settings enable Trivy `vulnerabilityReports.scanner` in [`Standalone`][trivy-standalone]
+`trivy.mode`. Even though it doesn't require any additional setup, it's the least efficient method. Each Pod created
+by a scan Job has the init container that downloads the Trivy vulnerabilities database from the GitHub releases page
+and stores it in the local file system of the [emptyDir volume]. This volume is then shared with containers that perform
+the actual scanning. Finally, the Pod is deleted along with the emptyDir volume.
+
+![](./../images/design/trivy-standalone.png)
+
+The number of containers defined by a scan Job equals the number of containers defined by the scanned Kubernetes
+workload, so the cache in this mode is useful only if the workload defines multiple containers.
+
+Beyond that, frequent downloads from GitHub might lead to a [rate limiting] problem. The limits are imposed by GitHub on
+all anonymous requests originating from a given IP. To mitigate such problems you can add the `trivy.githubToken` key to
+the `trivy-operator` secret.
+
+```bash
+
+kubectl patch secret trivy-operator-trivy-config -n trivy-operator \
+  --type merge \
+  -p "$(cat <<EOF
+{
+  "data": {
+    "trivy.githubToken": "$(echo -n <GITHUB_TOKEN> | base64)"
+  }
+}
+EOF
+)"
+```
+
+## ClientServer
+
+You can connect Trivy to an external Trivy server by changing the default `trivy.mode` from
+[`Standalone`][trivy-standalone] to [`ClientServer`][trivy-clientserver] and specifying `trivy.serverURL`.
+
+```bash
+kubectl patch cm trivy-operator-trivy-config -n trivy-operator \
+  --type merge \
+  -p "$(cat <<EOF
+{
+  "data": {
+    "trivy.mode":      "ClientServer",
+    "trivy.serverURL": "<TRIVY_SERVER_URL>"
+  }
+}
+EOF
+)"
+```
+
+The Trivy server could be your own deployment, or it could be an external service. See [Trivy server][trivy-clientserver] documentation for more information.
+
+If the server requires access token and/or custom HTTP authentication headers, you may add `trivy.serverToken` and `trivy.serverCustomHeaders` properties to the Trivy Operator secret.
+
+```bash
+kubectl patch secret trivy-operator-trivy-config -n trivy-operator \
+  --type merge \
+  -p "$(cat <<EOF
+{
+  "data": {
+    "trivy.serverToken":         "$(echo -n <SERVER_TOKEN> | base64)",
+    "trivy.serverCustomHeaders": "$(echo -n x-api-token:<X_API_TOKEN> | base64)"
+  }
+}
+EOF
+)"
+```
+
+![](./../images/design/trivy-clientserver.png)
+
+## Settings
+
+| CONFIGMAP KEY| DEFAULT| DESCRIPTION|
+|---|---|---|
+| `trivy.imageRef`| `docker.io/aquasec/trivy:0.25.2`| Trivy image reference|
+| `trivy.dbRepository`| `ghcr.io/aquasecurity/trivy-db`| External OCI Registry to download the vulnerability database|
+| `trivy.mode`| `Standalone`| Trivy client mode. Either `Standalone` or `ClientServer`. Depending on the active mode other settings might be applicable or required.                              |
+| `trivy.severity`| `UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL` | A comma separated list of severity levels reported by Trivy|
+| `trivy.ignoreUnfixed`| N/A| Whether to show only fixed vulnerabilities in vulnerabilities reported by Trivy. Set to `"true"` to enable it.|
+| `trivy.skipFiles`| N/A| A comma separated list of file paths for Trivy to skip traversal.|
+| `trivy.skipDirs`| N/A| A comma separated list of directories for Trivy to skip traversal.|
+| `trivy.ignoreFile`| N/A| It specifies the `.trivyignore` file which contains a list of vulnerability IDs to be ignored from vulnerabilities reported by Trivy.|
+| `trivy.timeout`| `5m0s`| The duration to wait for scan completion|
+| `trivy.serverURL`| N/A| The endpoint URL of the Trivy server. Required in `ClientServer` mode.|
+| `trivy.serverTokenHeader`| `Trivy-Token`| The name of the HTTP header to send the authentication token to Trivy server. Only application in `ClientServer` mode when `trivy.serverToken` is specified.|
+| `trivy.serverInsecure`| N/A| The Flag to enable insecure connection to the Trivy server.|
+| `trivy.insecureRegistry.<id>`| N/A| The registry to which insecure connections are allowed. There can be multiple registries with different registry `<id>`.|
+| `trivy.nonSslRegistry.<id>`| N/A| A registry without SSL. There can be multiple registries with different registry `<id>`.|
+| `trivy.registry.mirror.<registry>` | N/A| Mirror for the registry `<registry>`, e.g. `trivy.registry.mirror.index.docker.io: mirror.io` would use `mirror.io` to get images originated from `index.docker.io` |
+| `trivy.httpProxy`| N/A| The HTTP proxy used by Trivy to download the vulnerabilities database from GitHub.|
+| `trivy.httpsProxy`| N/A| The HTTPS proxy used by Trivy to download the vulnerabilities database from GitHub.|
+| `trivy.noProxy`| N/A| A comma separated list of IPs and domain names that are not subject to proxy settings.|
+| `trivy.resources.requests.cpu`| `100m`| The minimum amount of CPU required to run Trivy scanner pod.|
+| `trivy.resources.requests.memory`| `100M`| The minimum amount of memory required to run Trivy scanner pod.|
+| `trivy.resources.limits.cpu`| `500m`| The maximum amount of CPU allowed to run Trivy scanner pod.|
+| `trivy.resources.limits.memory`| `500M`| The maximum amount of memory allowed to run Trivy scanner pod.|
+
+| SECRET KEY| DESCRIPTION|
+|---|---|
+| `trivy.githubToken`| The GitHub access token used by Trivy to download the vulnerabilities database from GitHub. Only applicable in `Standalone` mode. |
+| `trivy.serverToken`| The token to authenticate Trivy client with Trivy server. Only applicable in `ClientServer` mode.|
+| `trivy.serverCustomHeaders`| A comma separated list of custom HTTP headers sent by Trivy client to Trivy server. Only applicable in `ClientServer` mode.|
+
+[trivy-standalone]: https://aquasecurity.github.io/trivy/latest/modes/standalone/
+[emptyDir volume]: https://kubernetes.io/docs/concepts/storage/volumes/#emptydir
+[rate limiting]: https://docs.github.com/en/free-pro-team@latest/rest/overview/resources-in-the-rest-api#rate-limiting
+[trivy-clientserver]: https://aquasecurity.github.io/trivy/latest/advanced/modes/client-server/

docs/docs/kubernetes/operator/vulnerability-scanning/faq.md

@@ -0,0 +1,29 @@
+# Frequently Asked Questions
+
+## Why do you duplicate instances of VulnerabilityReports for the same image digest?
+
+Docker image reference is not a first class citizen in Kubernetes. It's a
+property of the container definition. Trivy-operator relies on label selectors to
+associate VulnerabilityReports with corresponding Kubernetes workloads, not
+particular image references. For example, we can get all reports for the
+wordpress Deployment with the following command:
+
+```text
+kubectl get vulnerabilityreports \
+  -l trivy-operator.resource.kind=Deployment \
+  -l trivy-operator.resource.name=wordpress
+```
+
+Beyond that, for each instance of the VulnerabilityReports we set the owner
+reference pointing to the corresponding pods controller. By doing that we can
+manage orphaned VulnerabilityReports and leverage Kubernetes garbage collection.
+For example, if the `wordpress` Deployment is deleted, all related
+VulnerabilityReports are automatically garbage collected.
+
+## Why do you create an instance of the VulnerabilityReport for each container?
+The idea is to partition VulnerabilityReports generated for a particular
+Kubernetes workload by containers is to mitigate the risk of exceeding the etcd
+request payload limit. By default, the payload of each Kubernetes object stored
+etcd is subject to 1.5 MiB.
+
+

docs/docs/kubernetes/operator/vulnerability-scanning/index.md

@@ -0,0 +1,20 @@
+# Vulnerability Scanners
+
+Vulnerability scanning is an important way to identify and remediate security gaps in Kubernetes workloads. The
+process involves scanning container images to check all software on them and report any vulnerabilities found.
+
+Trivy Operator automatically discovers and scans all images that are being used in a Kubernetes cluster, including
+images of application pods and system pods. Scan reports are saved as [VulnerabilityReport] resources, which are owned
+by a Kubernetes controller.
+
+For example, when Trivy scans a Deployment, the corresponding VulnerabilityReport instance is attached to its
+current revision. In other words, the VulnerabilityReport inherits the life cycle of the Kubernetes controller. This
+also implies that when a Deployment is rolling updated, it will get scanned automatically, and a new instance of the
+VulnerabilityReport will be created and attached to the new revision. On the other hand, if the previous revision is
+deleted, the corresponding VulnerabilityReport will be deleted automatically by the Kubernetes garbage collector.
+
+Trivy may scan Kubernetes workloads that run images from [Private Registries] and certain [Managed Registries].
+
+[Trivy]: ./trivy.md
+[Private Registries]: ./managed-registries.md
+[Managed Registries]: ./managed-registries.md

docs/docs/kubernetes/operator/vulnerability-scanning/managed-registries.md

@@ -0,0 +1,77 @@
+## Amazon Elastic Container Registry (ECR)
+
+You must create an IAM OIDC identity provider for your cluster:
+
+```
+eksctl utils associate-iam-oidc-provider \
+  --cluster <cluster_name> \
+  --approve
+```
+
+Override the existing `trivy-operator` service account and
+attach the IAM policy to grant it permission to pull images from the ECR:
+
+```
+eksctl create iamserviceaccount \
+  --name trivy-operator \
+  --namespace trivy-operator \
+  --cluster <cluster_name> \
+  --attach-policy-arn arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly \
+  --approve \
+  --override-existing-serviceaccounts
+```
+
+## Azure Container Registry (ACR)
+
+Before you can start, you need to install `aad-pod-identity` inside your cluster, see installation instructions:
+https://azure.github.io/aad-pod-identity/docs/getting-started/installation/
+
+Create a managed identity and assign the permission to the ACR.
+```sh
+export IDENTITY_NAME=trivy-operator-identity
+export AZURE_RESOURCE_GROUP=<my_resource_group>
+export AZURE_LOCATION=westeurope
+export ACR_NAME=<my_azure_container_registry>
+
+az identity create --name ${IDENTITY_NAME} --resource-group ${AZURE_RESOURCE_GROUP} --location ${AZURE_LOCATION}
+
+export IDENTITY_ID=(az identity show --name ${IDENTITY_NAME} --resource-group ${AZURE_RESOURCE_GROUP} --query id -o tsv)
+export IDENTITY_CLIENT_ID=$(az identity show --name ${IDENTITY_NAME} --resource-group ${AZURE_RESOURCE_GROUP} --query clientId -o tsv)
+export ACR_ID=$(az acr show --name ${ACR_NAME} --query id -o tsv)
+
+az role assignment create --assignee ${IDENTITY_CLIENT_ID} --role 'AcrPull' --scope ${ACR_ID}
+```
+
+create an `AzureIdentity` and `AzureIdentityBinding` resource inside your kubernetes cluster:
+```yaml
+apiVersion: aadpodidentity.k8s.io/v1
+kind: AzureIdentity
+metadata:
+  name: trivy-identity
+  namespace: trivy-operator
+spec:
+  clientID: ${IDENTITY_ID}
+  resourceID: ${IDENTITY_CLIENT_ID}
+  type: 0
+```
+
+```yaml
+ apiVersion: aadpodidentity.k8s.io/v1
+ kind: AzureIdentityBinding
+ metadata:
+   name: trivy-id-binding
+   namespace: trivy-operator
+ spec:
+   azureIdentity: trivy-operator-identity
+   selector: trivy-operator-label
+```
+
+add `scanJob.podTemplateLabels` to the Trivy Operator config map, the value must match the `AzureIdentityBinding` selector.
+
+```sh
+kubectl -n trivy-operator edit cm trivy-operator
+# Insert scanJob.podTemplateLabels: aadpodidbinding=trivy-operator-label in data block
+
+# validate
+trivy-operator config --get scanJob.podTemplateLabels
+```

docs/docs/misconfiguration/comparison/cfsec.md

@@ -3,20 +3,19 @@
 Trivy uses cfsec internally to scan both JSON and YAML configuration files, but Trivy doesn't support some features provided by cfsec.
 This section describes the differences between Trivy and cfsec.
 
-| Feature                     | Trivy                                   | cfsec                |
-| --------------------------- | --------------------------------------- | -------------------- |
-| Built-in Policies           | :material-check:                        | :material-check:     |
-| Custom Policies             | Rego[^1]                                | :material-close:     |
-| Policy Metadata[^2]         | :material-check:                        | :material-check:     |
-| Show Successes              | :material-check:                        | :material-check:     |
-| Disable Policies            | :material-check:                        | :material-check:     |
-| Show Issue Lines            | :material-close:                        | :material-check:     |
-| View Statistics             | :material-close:                        | :material-check:     |
-| Filtering by Severity       | :material-check:                        | :material-close:     |
-| Supported Formats           | Dockerfile, JSON, YAML, Terraform, etc. | CloudFormation JSON and YAML       |
+| Feature               | Trivy                                                  | cfsec                        |
+|-----------------------|--------------------------------------------------------|------------------------------|
+| Built-in Policies     | :material-check:                                       | :material-check:             |
+| Custom Policies       | :material-check:                                       | :material-close:             |
+| Policy Metadata[^1]   | :material-check:                                       | :material-check:             |
+| Show Successes        | :material-check:                                       | :material-check:             |
+| Disable Policies      | :material-check:                                       | :material-check:             |
+| Show Issue Lines      | :material-check:                                       | :material-check:             |
+| View Statistics       | :material-close:                                       | :material-check:             |
+| Filtering by Severity | :material-check:                                       | :material-close:             |
+| Supported Formats     | Dockerfile, JSON, YAML, Terraform, CloudFormation etc. | CloudFormation JSON and YAML |
 
-[^1]: CloudFormation files are not supported
-[^2]: To enrich the results such as ID, Title, Description, Severity, etc.
+[^1]: To enrich the results such as ID, Title, Description, Severity, etc.
 
 cfsec is designed for CloudFormation.
 People who use only want to scan their CloudFormation templates should use cfsec.

docs/docs/misconfiguration/comparison/tfsec.md

@@ -3,21 +3,20 @@
 Trivy uses tfsec internally to scan Terraform HCL files, but Trivy doesn't support some features provided by tfsec.
 This section describes the differences between Trivy and tfsec.
 
-| Feature                     | Trivy                                   | tfsec                |
-| --------------------------- | --------------------------------------- | -------------------- |
-| Built-in Policies           | :material-check:                        | :material-check:     |
-| Custom Policies             | Rego[^1]                                | JSON and YAML        |
-| Policy Metadata[^2]         | :material-check:                        | :material-check:     |
-| Show Successes              | :material-check:                        | :material-check:     |
-| Disable Policies            | :material-check:                        | :material-check:     |
-| Show Issue Lines            | :material-close:                        | :material-check:     |
-| Support .tfvars             | :material-close:                        | :material-check:     |
-| View Statistics             | :material-close:                        | :material-check:     |
-| Filtering by Severity       | :material-check:                        | :material-close:     |
-| Supported Formats           | Dockerfile, JSON, YAML, Terraform, etc. | Terraform            |
+| Feature               | Trivy                                                  | tfsec                |
+|-----------------------|--------------------------------------------------------|----------------------|
+| Built-in Policies     | :material-check:                                       | :material-check:     |
+| Custom Policies       | Rego                                                   | Rego, JSON, and YAML |
+| Policy Metadata[^1]   | :material-check:                                       | :material-check:     |
+| Show Successes        | :material-check:                                       | :material-check:     |
+| Disable Policies      | :material-check:                                       | :material-check:     |
+| Show Issue Lines      | :material-check:                                       | :material-check:     |
+| Support .tfvars       | :material-close:                                       | :material-check:     |
+| View Statistics       | :material-close:                                       | :material-check:     |
+| Filtering by Severity | :material-check:                                       | :material-check:     |
+| Supported Formats     | Dockerfile, JSON, YAML, Terraform, CloudFormation etc. | Terraform            |
 
-[^1]: Terraform HCL files are not supported.
-[^2]: To enrich the results such as ID, Title, Description, Severity, etc.
+[^1]: To enrich the results such as ID, Title, Description, Severity, etc.
 
 tfsec is designed for Terraform.
 People who use only Terraform should use tfsec.

docs/docs/misconfiguration/custom/debug.md

@@ -6,38 +6,209 @@ This will output a large trace from Open Policy Agent like the following:
 !!! tip
     Only failed policies show traces. If you want to debug a passed policy, you need to make it fail on purpose.
 
-```bash
+```shell
 $ trivy conf --trace configs/
-2021-07-11T16:45:58.493+0300    INFO    Detected config files: 1
+2022-05-16T13:47:58.853+0100	INFO	Detected config files: 1
 
 Dockerfile (dockerfile)
 =======================
-Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 1, CRITICAL: 0)
+Tests: 23 (SUCCESSES: 21, FAILURES: 2, EXCEPTIONS: 0)
+Failures: 2 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 1, CRITICAL: 0)
+
+MEDIUM: Specify a tag in the 'FROM' statement for image 'alpine'
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+When using a 'FROM' statement you should use a specific tag to avoid uncontrolled behavior when the image is updated.
+
+See https://avd.aquasec.com/misconfig/ds001
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ Dockerfile:1
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   1 [ FROM alpine:latest
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+HIGH: Last USER command in Dockerfile should not be 'root'
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+Running containers with 'root' user can lead to a container escape situation. It is a best practice to run containers as non-root users, which can be done by adding a 'USER' statement to the Dockerfile.
+
+See https://avd.aquasec.com/misconfig/ds002
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ Dockerfile:3
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   3 [ USER root
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+
+ID: DS001
+File: Dockerfile
+Namespace: builtin.dockerfile.DS001
+Query: data.builtin.dockerfile.DS001.deny
+Message: Specify a tag in the 'FROM' statement for image 'alpine'
+TRACE  Enter data.builtin.dockerfile.DS001.deny = _
+TRACE  | Eval data.builtin.dockerfile.DS001.deny = _
+TRACE  | Index data.builtin.dockerfile.DS001.deny (matched 1 rule)
+TRACE  | Enter data.builtin.dockerfile.DS001.deny
+TRACE  | | Eval output = data.builtin.dockerfile.DS001.fail_latest[_]
+TRACE  | | Index data.builtin.dockerfile.DS001.fail_latest (matched 1 rule)
+TRACE  | | Enter data.builtin.dockerfile.DS001.fail_latest
+TRACE  | | | Eval output = data.builtin.dockerfile.DS001.image_tags[_]
+TRACE  | | | Index data.builtin.dockerfile.DS001.image_tags (matched 2 rules)
+TRACE  | | | Enter data.builtin.dockerfile.DS001.image_tags
+TRACE  | | | | Eval from = data.lib.docker.from[_]
+TRACE  | | | | Index data.lib.docker.from (matched 1 rule)
+TRACE  | | | | Enter data.lib.docker.from
+TRACE  | | | | | Eval instruction = input.stages[_][_]
+TRACE  | | | | | Eval instruction.Cmd = "from"
+TRACE  | | | | | Exit data.lib.docker.from
+TRACE  | | | | Redo data.lib.docker.from
+TRACE  | | | | | Redo instruction.Cmd = "from"
+TRACE  | | | | | Redo instruction = input.stages[_][_]
+TRACE  | | | | | Eval instruction.Cmd = "from"
+TRACE  | | | | | Fail instruction.Cmd = "from"
+TRACE  | | | | | Redo instruction = input.stages[_][_]
+TRACE  | | | | | Eval instruction.Cmd = "from"
+TRACE  | | | | | Fail instruction.Cmd = "from"
+TRACE  | | | | | Redo instruction = input.stages[_][_]
+TRACE  | | | | Eval name = from.Value[0]
+TRACE  | | | | Eval not startswith(name, "$")
+TRACE  | | | | Enter startswith(name, "$")
+TRACE  | | | | | Eval startswith(name, "$")
+TRACE  | | | | | Fail startswith(name, "$")
+TRACE  | | | | Eval data.builtin.dockerfile.DS001.parse_tag(name, __local505__)
+TRACE  | | | | Index data.builtin.dockerfile.DS001.parse_tag (matched 2 rules)
+TRACE  | | | | Enter data.builtin.dockerfile.DS001.parse_tag
+TRACE  | | | | | Eval split(name, ":", __local504__)
+TRACE  | | | | | Eval [img, tag] = __local504__
+TRACE  | | | | | Exit data.builtin.dockerfile.DS001.parse_tag
+TRACE  | | | | Eval [img, tag] = __local505__
+TRACE  | | | | Eval output = {"cmd": from, "img": img, "tag": tag}
+TRACE  | | | | Exit data.builtin.dockerfile.DS001.image_tags
+TRACE  | | | Redo data.builtin.dockerfile.DS001.image_tags
+TRACE  | | | | Redo output = {"cmd": from, "img": img, "tag": tag}
+TRACE  | | | | Redo [img, tag] = __local505__
+TRACE  | | | | Redo data.builtin.dockerfile.DS001.parse_tag(name, __local505__)
+TRACE  | | | | Redo data.builtin.dockerfile.DS001.parse_tag
+TRACE  | | | | | Redo [img, tag] = __local504__
+TRACE  | | | | | Redo split(name, ":", __local504__)
+TRACE  | | | | Enter data.builtin.dockerfile.DS001.parse_tag
+TRACE  | | | | | Eval tag = "latest"
+TRACE  | | | | | Eval not contains(img, ":")
+TRACE  | | | | | Enter contains(img, ":")
+TRACE  | | | | | | Eval contains(img, ":")
+TRACE  | | | | | | Exit contains(img, ":")
+TRACE  | | | | | Redo contains(img, ":")
+TRACE  | | | | | | Redo contains(img, ":")
+TRACE  | | | | | Fail not contains(img, ":")
+TRACE  | | | | | Redo tag = "latest"
+TRACE  | | | | Redo name = from.Value[0]
+TRACE  | | | | Redo from = data.lib.docker.from[_]
+TRACE  | | | Enter data.builtin.dockerfile.DS001.image_tags
+TRACE  | | | | Eval from = data.lib.docker.from[i]
+TRACE  | | | | Index data.lib.docker.from (matched 1 rule)
+TRACE  | | | | Eval name = from.Value[0]
+TRACE  | | | | Eval cmd_obj = input.stages[j][k]
+TRACE  | | | | Eval possibilities = {"arg", "env"}
+TRACE  | | | | Eval cmd_obj.Cmd = possibilities[l]
+TRACE  | | | | Fail cmd_obj.Cmd = possibilities[l]
+TRACE  | | | | Redo possibilities = {"arg", "env"}
+TRACE  | | | | Redo cmd_obj = input.stages[j][k]
+TRACE  | | | | Eval possibilities = {"arg", "env"}
+TRACE  | | | | Eval cmd_obj.Cmd = possibilities[l]
+TRACE  | | | | Fail cmd_obj.Cmd = possibilities[l]
+TRACE  | | | | Redo possibilities = {"arg", "env"}
+TRACE  | | | | Redo cmd_obj = input.stages[j][k]
+TRACE  | | | | Eval possibilities = {"arg", "env"}
+TRACE  | | | | Eval cmd_obj.Cmd = possibilities[l]
+TRACE  | | | | Fail cmd_obj.Cmd = possibilities[l]
+TRACE  | | | | Redo possibilities = {"arg", "env"}
+TRACE  | | | | Redo cmd_obj = input.stages[j][k]
+TRACE  | | | | Redo name = from.Value[0]
+TRACE  | | | | Redo from = data.lib.docker.from[i]
+TRACE  | | | Eval __local752__ = output.img
+TRACE  | | | Eval neq(__local752__, "scratch")
+TRACE  | | | Eval __local753__ = output.img
+TRACE  | | | Eval not data.builtin.dockerfile.DS001.is_alias(__local753__)
+TRACE  | | | Enter data.builtin.dockerfile.DS001.is_alias(__local753__)
+TRACE  | | | | Eval data.builtin.dockerfile.DS001.is_alias(__local753__)
+TRACE  | | | | Index data.builtin.dockerfile.DS001.is_alias (matched 1 rule, early exit)
+TRACE  | | | | Enter data.builtin.dockerfile.DS001.is_alias
+TRACE  | | | | | Eval img = data.builtin.dockerfile.DS001.get_aliases[_]
+TRACE  | | | | | Index data.builtin.dockerfile.DS001.get_aliases (matched 1 rule)
+TRACE  | | | | | Enter data.builtin.dockerfile.DS001.get_aliases
+TRACE  | | | | | | Eval from_cmd = data.lib.docker.from[_]
+TRACE  | | | | | | Index data.lib.docker.from (matched 1 rule)
+TRACE  | | | | | | Eval __local749__ = from_cmd.Value
+TRACE  | | | | | | Eval data.builtin.dockerfile.DS001.get_alias(__local749__, __local503__)
+TRACE  | | | | | | Index data.builtin.dockerfile.DS001.get_alias (matched 1 rule)
+TRACE  | | | | | | Enter data.builtin.dockerfile.DS001.get_alias
+TRACE  | | | | | | | Eval __local748__ = values[i]
+TRACE  | | | | | | | Eval lower(__local748__, __local501__)
+TRACE  | | | | | | | Eval "as" = __local501__
+TRACE  | | | | | | | Fail "as" = __local501__
+TRACE  | | | | | | | Redo lower(__local748__, __local501__)
+TRACE  | | | | | | | Redo __local748__ = values[i]
+TRACE  | | | | | | Fail data.builtin.dockerfile.DS001.get_alias(__local749__, __local503__)
+TRACE  | | | | | | Redo __local749__ = from_cmd.Value
+TRACE  | | | | | | Redo from_cmd = data.lib.docker.from[_]
+TRACE  | | | | | Fail img = data.builtin.dockerfile.DS001.get_aliases[_]
+TRACE  | | | | Fail data.builtin.dockerfile.DS001.is_alias(__local753__)
+TRACE  | | | Eval output.tag = "latest"
+TRACE  | | | Exit data.builtin.dockerfile.DS001.fail_latest
+TRACE  | | Redo data.builtin.dockerfile.DS001.fail_latest
+TRACE  | | | Redo output.tag = "latest"
+TRACE  | | | Redo __local753__ = output.img
+TRACE  | | | Redo neq(__local752__, "scratch")
+TRACE  | | | Redo __local752__ = output.img
+TRACE  | | | Redo output = data.builtin.dockerfile.DS001.image_tags[_]
+TRACE  | | Eval __local754__ = output.img
+TRACE  | | Eval sprintf("Specify a tag in the 'FROM' statement for image '%s'", [__local754__], __local509__)
+TRACE  | | Eval msg = __local509__
+TRACE  | | Eval __local755__ = output.cmd
+TRACE  | | Eval data.lib.docker.result(msg, __local755__, __local510__)
+TRACE  | | Index data.lib.docker.result (matched 1 rule)
+TRACE  | | Enter data.lib.docker.result
+TRACE  | | | Eval object.get(cmd, "EndLine", 0, __local470__)
+TRACE  | | | Eval object.get(cmd, "Path", "", __local471__)
+TRACE  | | | Eval object.get(cmd, "StartLine", 0, __local472__)
+TRACE  | | | Eval result = {"endline": __local470__, "filepath": __local471__, "msg": msg, "startline": __local472__}
+TRACE  | | | Exit data.lib.docker.result
+TRACE  | | Eval res = __local510__
+TRACE  | | Exit data.builtin.dockerfile.DS001.deny
+TRACE  | Redo data.builtin.dockerfile.DS001.deny
+TRACE  | | Redo res = __local510__
+TRACE  | | Redo data.lib.docker.result(msg, __local755__, __local510__)
+TRACE  | | Redo data.lib.docker.result
+TRACE  | | | Redo result = {"endline": __local470__, "filepath": __local471__, "msg": msg, "startline": __local472__}
+TRACE  | | | Redo object.get(cmd, "StartLine", 0, __local472__)
+TRACE  | | | Redo object.get(cmd, "Path", "", __local471__)
+TRACE  | | | Redo object.get(cmd, "EndLine", 0, __local470__)
+TRACE  | | Redo __local755__ = output.cmd
+TRACE  | | Redo msg = __local509__
+TRACE  | | Redo sprintf("Specify a tag in the 'FROM' statement for image '%s'", [__local754__], __local509__)
+TRACE  | | Redo __local754__ = output.img
+TRACE  | | Redo output = data.builtin.dockerfile.DS001.fail_latest[_]
+TRACE  | Exit data.builtin.dockerfile.DS001.deny = _
+TRACE  Redo data.builtin.dockerfile.DS001.deny = _
+TRACE  | Redo data.builtin.dockerfile.DS001.deny = _
+TRACE
 
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-|                           |            |                      |          | Dockerfile should not be 'root'          |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
 
 ID: DS002
 File: Dockerfile
-Namespace: appshield.dockerfile.DS002
-Query: data.appshield.dockerfile.DS002.deny
+Namespace: builtin.dockerfile.DS002
+Query: data.builtin.dockerfile.DS002.deny
 Message: Last USER command in Dockerfile should not be 'root'
-TRACE  Enter data.appshield.dockerfile.DS002.deny = _
-TRACE  | Eval data.appshield.dockerfile.DS002.deny = _
-TRACE  | Index data.appshield.dockerfile.DS002.deny matched 2 rules)
-TRACE  | Enter data.appshield.dockerfile.DS002.deny
-TRACE  | | Eval data.appshield.dockerfile.DS002.fail_user_count
-TRACE  | | Index data.appshield.dockerfile.DS002.fail_user_count (matched 1 rule)
-TRACE  | | Enter data.appshield.dockerfile.DS002.fail_user_count
-TRACE  | | | Eval __local559__ = data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Index data.appshield.dockerfile.DS002.get_user (matched 1 rule)
-TRACE  | | | Enter data.appshield.dockerfile.DS002.get_user
+TRACE  Enter data.builtin.dockerfile.DS002.deny = _
+TRACE  | Eval data.builtin.dockerfile.DS002.deny = _
+TRACE  | Index data.builtin.dockerfile.DS002.deny (matched 2 rules)
+TRACE  | Enter data.builtin.dockerfile.DS002.deny
+TRACE  | | Eval data.builtin.dockerfile.DS002.fail_user_count
+TRACE  | | Index data.builtin.dockerfile.DS002.fail_user_count (matched 1 rule, early exit)
+TRACE  | | Enter data.builtin.dockerfile.DS002.fail_user_count
+TRACE  | | | Eval __local771__ = data.builtin.dockerfile.DS002.get_user
+TRACE  | | | Index data.builtin.dockerfile.DS002.get_user (matched 1 rule)
+TRACE  | | | Enter data.builtin.dockerfile.DS002.get_user
 TRACE  | | | | Eval user = data.lib.docker.user[_]
 TRACE  | | | | Index data.lib.docker.user (matched 1 rule)
 TRACE  | | | | Enter data.lib.docker.user
@@ -46,180 +217,88 @@ TRACE  | | | | | Eval instruction.Cmd = "user"
 TRACE  | | | | | Fail instruction.Cmd = "user"
 TRACE  | | | | | Redo instruction = input.stages[_][_]
 TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
 TRACE  | | | | | Exit data.lib.docker.user
-TRACE  | | | | Eval username = user.Value[_]
-TRACE  | | | | Exit data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Redo username = user.Value[_]
-TRACE  | | | | Redo user = data.lib.docker.user[_]
-TRACE  | | | | Redo data.lib.docker.user
-TRACE  | | | | | Redo instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Exit data.lib.docker.user
-TRACE  | | | | Eval username = user.Value[_]
-TRACE  | | | | Exit data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Redo username = user.Value[_]
-TRACE  | | | | Redo user = data.lib.docker.user[_]
 TRACE  | | | | Redo data.lib.docker.user
 TRACE  | | | | | Redo instruction.Cmd = "user"
 TRACE  | | | | | Redo instruction = input.stages[_][_]
 TRACE  | | | | | Eval instruction.Cmd = "user"
 TRACE  | | | | | Fail instruction.Cmd = "user"
 TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | Eval count(__local559__, __local391__)
-TRACE  | | | Eval lt(__local391__, 1)
-TRACE  | | | Fail lt(__local391__, 1)
-TRACE  | | | Redo count(__local559__, __local391__)
-TRACE  | | | Redo __local559__ = data.appshield.dockerfile.DS002.get_user
-TRACE  | | Fail data.appshield.dockerfile.DS002.fail_user_count
-TRACE  | Enter data.appshield.dockerfile.DS002.deny
-TRACE  | | Eval data.appshield.dockerfile.DS002.fail_last_user_root
-TRACE  | | Index data.appshield.dockerfile.DS002.fail_last_user_root (matched 1 rule)
-TRACE  | | Enter data.appshield.dockerfile.DS002.fail_last_user_root
-TRACE  | | | Eval __local560__ = data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Index data.appshield.dockerfile.DS002.get_user (matched 1 rule)
-TRACE  | | | Enter data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Eval user = data.lib.docker.user[_]
-TRACE  | | | | Index data.lib.docker.user (matched 1 rule)
-TRACE  | | | | Enter data.lib.docker.user
-TRACE  | | | | | Eval instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Exit data.lib.docker.user
 TRACE  | | | | Eval username = user.Value[_]
-TRACE  | | | | Exit data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo data.appshield.dockerfile.DS002.get_user
+TRACE  | | | | Exit data.builtin.dockerfile.DS002.get_user
+TRACE  | | | Redo data.builtin.dockerfile.DS002.get_user
 TRACE  | | | | Redo username = user.Value[_]
 TRACE  | | | | Redo user = data.lib.docker.user[_]
-TRACE  | | | | Redo data.lib.docker.user
-TRACE  | | | | | Redo instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Exit data.lib.docker.user
-TRACE  | | | | Eval username = user.Value[_]
-TRACE  | | | | Exit data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Redo username = user.Value[_]
-TRACE  | | | | Redo user = data.lib.docker.user[_]
-TRACE  | | | | Redo data.lib.docker.user
-TRACE  | | | | | Redo instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | Eval cast_array(__local560__, __local392__)
-TRACE  | | | Eval user = __local392__
-TRACE  | | | Eval __local561__ = data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Index data.appshield.dockerfile.DS002.get_user (matched 1 rule)
-TRACE  | | | Enter data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Eval user = data.lib.docker.user[_]
-TRACE  | | | | Index data.lib.docker.user (matched 1 rule)
-TRACE  | | | | Enter data.lib.docker.user
-TRACE  | | | | | Eval instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Exit data.lib.docker.user
-TRACE  | | | | Eval username = user.Value[_]
-TRACE  | | | | Exit data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Redo username = user.Value[_]
-TRACE  | | | | Redo user = data.lib.docker.user[_]
-TRACE  | | | | Redo data.lib.docker.user
-TRACE  | | | | | Redo instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Exit data.lib.docker.user
-TRACE  | | | | Eval username = user.Value[_]
-TRACE  | | | | Exit data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo data.appshield.dockerfile.DS002.get_user
-TRACE  | | | | Redo username = user.Value[_]
-TRACE  | | | | Redo user = data.lib.docker.user[_]
-TRACE  | | | | Redo data.lib.docker.user
-TRACE  | | | | | Redo instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | | | Eval instruction.Cmd = "user"
-TRACE  | | | | | Fail instruction.Cmd = "user"
-TRACE  | | | | | Redo instruction = input.stages[_][_]
-TRACE  | | | Eval count(__local561__, __local393__)
-TRACE  | | | Eval len = __local393__
-TRACE  | | | Eval minus(len, 1, __local394__)
-TRACE  | | | Eval user[__local394__] = "root"
-TRACE  | | | Exit data.appshield.dockerfile.DS002.fail_last_user_root
-TRACE  | | Eval res = "Last USER command in Dockerfile should not be 'root'"
-TRACE  | | Exit data.appshield.dockerfile.DS002.deny
-TRACE  | Redo data.appshield.dockerfile.DS002.deny
-TRACE  | | Redo res = "Last USER command in Dockerfile should not be 'root'"
-TRACE  | | Redo data.appshield.dockerfile.DS002.fail_last_user_root
-TRACE  | | Redo data.appshield.dockerfile.DS002.fail_last_user_root
-TRACE  | | | Redo user[__local394__] = "root"
-TRACE  | | | Redo minus(len, 1, __local394__)
-TRACE  | | | Redo len = __local393__
-TRACE  | | | Redo count(__local561__, __local393__)
-TRACE  | | | Redo __local561__ = data.appshield.dockerfile.DS002.get_user
-TRACE  | | | Redo user = __local392__
-TRACE  | | | Redo cast_array(__local560__, __local392__)
-TRACE  | | | Redo __local560__ = data.appshield.dockerfile.DS002.get_user
-TRACE  | Exit data.appshield.dockerfile.DS002.deny = _
-TRACE  Redo data.appshield.dockerfile.DS002.deny = _
-TRACE  | Redo data.appshield.dockerfile.DS002.deny = _
+TRACE  | | | Eval count(__local771__, __local536__)
+TRACE  | | | Eval lt(__local536__, 1)
+TRACE  | | | Fail lt(__local536__, 1)
+TRACE  | | | Redo count(__local771__, __local536__)
+TRACE  | | | Redo __local771__ = data.builtin.dockerfile.DS002.get_user
+TRACE  | | Fail data.builtin.dockerfile.DS002.fail_user_count
+TRACE  | Enter data.builtin.dockerfile.DS002.deny
+TRACE  | | Eval cmd = data.builtin.dockerfile.DS002.fail_last_user_root[_]
+TRACE  | | Index data.builtin.dockerfile.DS002.fail_last_user_root (matched 1 rule)
+TRACE  | | Enter data.builtin.dockerfile.DS002.fail_last_user_root
+TRACE  | | | Eval stage_users = data.lib.docker.stage_user[_]
+TRACE  | | | Index data.lib.docker.stage_user (matched 1 rule)
+TRACE  | | | Enter data.lib.docker.stage_user
+TRACE  | | | | Eval stage = input.stages[stage_name]
+TRACE  | | | | Eval users = [cmd | cmd = stage[_]; cmd.Cmd = "user"]
+TRACE  | | | | Enter cmd = stage[_]; cmd.Cmd = "user"
+TRACE  | | | | | Eval cmd = stage[_]
+TRACE  | | | | | Eval cmd.Cmd = "user"
+TRACE  | | | | | Fail cmd.Cmd = "user"
+TRACE  | | | | | Redo cmd = stage[_]
+TRACE  | | | | | Eval cmd.Cmd = "user"
+TRACE  | | | | | Exit cmd = stage[_]; cmd.Cmd = "user"
+TRACE  | | | | Redo cmd = stage[_]; cmd.Cmd = "user"
+TRACE  | | | | | Redo cmd.Cmd = "user"
+TRACE  | | | | | Redo cmd = stage[_]
+TRACE  | | | | | Eval cmd.Cmd = "user"
+TRACE  | | | | | Fail cmd.Cmd = "user"
+TRACE  | | | | | Redo cmd = stage[_]
+TRACE  | | | | Exit data.lib.docker.stage_user
+TRACE  | | | Redo data.lib.docker.stage_user
+TRACE  | | | | Redo users = [cmd | cmd = stage[_]; cmd.Cmd = "user"]
+TRACE  | | | | Redo stage = input.stages[stage_name]
+TRACE  | | | Eval count(stage_users, __local537__)
+TRACE  | | | Eval len = __local537__
+TRACE  | | | Eval minus(len, 1, __local538__)
+TRACE  | | | Eval last = stage_users[__local538__]
+TRACE  | | | Eval user = last.Value[0]
+TRACE  | | | Eval user = "root"
+TRACE  | | | Exit data.builtin.dockerfile.DS002.fail_last_user_root
+TRACE  | | Redo data.builtin.dockerfile.DS002.fail_last_user_root
+TRACE  | | | Redo user = "root"
+TRACE  | | | Redo user = last.Value[0]
+TRACE  | | | Redo last = stage_users[__local538__]
+TRACE  | | | Redo minus(len, 1, __local538__)
+TRACE  | | | Redo len = __local537__
+TRACE  | | | Redo count(stage_users, __local537__)
+TRACE  | | | Redo stage_users = data.lib.docker.stage_user[_]
+TRACE  | | Eval msg = "Last USER command in Dockerfile should not be 'root'"
+TRACE  | | Eval data.lib.docker.result(msg, cmd, __local540__)
+TRACE  | | Index data.lib.docker.result (matched 1 rule)
+TRACE  | | Enter data.lib.docker.result
+TRACE  | | | Eval object.get(cmd, "EndLine", 0, __local470__)
+TRACE  | | | Eval object.get(cmd, "Path", "", __local471__)
+TRACE  | | | Eval object.get(cmd, "StartLine", 0, __local472__)
+TRACE  | | | Eval result = {"endline": __local470__, "filepath": __local471__, "msg": msg, "startline": __local472__}
+TRACE  | | | Exit data.lib.docker.result
+TRACE  | | Eval res = __local540__
+TRACE  | | Exit data.builtin.dockerfile.DS002.deny
+TRACE  | Redo data.builtin.dockerfile.DS002.deny
+TRACE  | | Redo res = __local540__
+TRACE  | | Redo data.lib.docker.result(msg, cmd, __local540__)
+TRACE  | | Redo data.lib.docker.result
+TRACE  | | | Redo result = {"endline": __local470__, "filepath": __local471__, "msg": msg, "startline": __local472__}
+TRACE  | | | Redo object.get(cmd, "StartLine", 0, __local472__)
+TRACE  | | | Redo object.get(cmd, "Path", "", __local471__)
+TRACE  | | | Redo object.get(cmd, "EndLine", 0, __local470__)
+TRACE  | | Redo msg = "Last USER command in Dockerfile should not be 'root'"
+TRACE  | | Redo cmd = data.builtin.dockerfile.DS002.fail_last_user_root[_]
+TRACE  | Exit data.builtin.dockerfile.DS002.deny = _
+TRACE  Redo data.builtin.dockerfile.DS002.deny = _
+TRACE  | Redo data.builtin.dockerfile.DS002.deny = _
+TRACE
 ```

docs/docs/misconfiguration/custom/index.md

@@ -14,26 +14,23 @@ As for `--namespaces` option, the detail is described as below.
 If a file name matches the following file patterns, Trivy will parse the file and pass it as input to your Rego policy.
 
 | File format   | File pattern                                              |
-| ------------- | --------------------------------------------------------- |
+|---------------|-----------------------------------------------------------|
 | JSON          | `*.json`                                                  |
-| YAML          | `*.yaml`                                                  |
-| TOML          | `*.toml`                                                  |
-| HCL           | `*.hcl`, `*.hcl1`, and `*.hcl2`                           |
+| YAML          | `*.yaml` and `*.yml`                                      |
 | Dockerfile    | `Dockerfile`, `Dockerfile.*`, and `*.Dockerfile`          |
 | Containerfile | `Containerfile`, `Containerfile.*`, and `*.Containerfile` |
+| Terraform     | `*.tf` and `*.tf.json`                                    |
 
 ### Configuration languages
 In the above general file formats, Trivy automatically identifies the following types of configuration files:
 
-- Ansible (YAML)
 - CloudFormation (JSON/YAML)
 - Kubernetes (JSON/YAML)
+- Helm (YAML)
+- Terraform Plan (JSON)
 
 This is useful for filtering inputs, as described below.
 
-!!! warning
-    Custom policies do not support Terraform at the moment.
-
 ## Rego format
 A single package must contain only one policy.
 
@@ -41,11 +38,12 @@ A single package must contain only one policy.
     ``` rego
     package user.kubernetes.ID001
     
+    import lib.result
+
     __rego_metadata__ := {
     	"id": "ID001",
     	"title": "Deployment not allowed",
     	"severity": "LOW",
-    	"type": "Custom Kubernetes Check",
     	"description": "Deployments are not allowed because of some reasons.",
     }
 
@@ -55,9 +53,10 @@ A single package must contain only one policy.
         ],
     }
     
-    deny[msg] {
-    	input.kind == "Deployment"
-    	msg = sprintf("Found deployment '%s' but deployments are not allowed", [input.metadata.name])
+    deny[res] {
+        input.kind == "Deployment"
+        msg := sprintf("Found deployment '%s' but deployments are not allowed", [input.metadata.name])
+        res := result.new(msg, input)
     }
     ```
 
@@ -73,6 +72,9 @@ If you add a new custom policy, it must be defined under a new package like `use
     - MAY include the group name such as `kubernetes` for clarity
         - Group name has no effect on policy evaluation
 
+`import data.lib.result` (optional)
+:   - MAY be defined if you would like to embellish your result(s) with line numbers and code highlighting
+
 `__rego_metadata__` (optional)
 :   - SHOULD be defined for clarity since these values will be displayed in the scan results
 
@@ -82,9 +84,11 @@ If you add a new custom policy, it must be defined under a new package like `use
 `deny` (required)
 :   - SHOULD be `deny` or start with `deny_`
         - Although `warn`, `warn_*`, `violation`, `violation_` also work for compatibility, `deny` is recommended as severity can be defined in `__rego_metadata__`.
-    - SHOULD return `string`
-        - Although `object` with `msg` field is accepted, other fields are dropped and `string` is recommended.
-        - e.g. `{"msg": "deny message", "details": "something"}`
+    - SHOULD return ONE OF:
+        - The result of a call to `result.new(msg, cause)`. The `msg` is a `string` describing the issue occurrence, and the `cause` is the property/object where the issue occurred. Providing this allows Trivy to ascertain line numbers and highlight code in the output. 
+        - A `string` denoting the detected issue
+            - Although `object` with `msg` field is accepted, other fields are dropped and `string` is recommended if `result.new()` is not utilised.
+            - e.g. `{"msg": "deny message", "details": "something"}`
     
 
 ### Package
@@ -95,7 +99,7 @@ A package name must be unique per policy.
     package user.kubernetes.ID001
     ```
 
-By default, only `appshield.*` packages will be evaluated.
+By default, only `builtin.*` packages will be evaluated.
 If you define custom packages, you have to specify the package prefix via `--namespaces` option. 
 
 ``` bash
@@ -114,7 +118,6 @@ Metadata helps enrich Trivy's scan results with useful information.
     	"id": "ID001",
     	"title": "Deployment not allowed",
     	"severity": "LOW",
-    	"type": "Custom Kubernetes Check",
     	"description": "Deployments are not allowed because of some reasons.",
     	"recommended_actions": "Remove Deployment",
     	"url": "https://cloud.google.com/blog/products/containers-kubernetes/kubernetes-best-practices-resource-requests-and-limits",
@@ -123,30 +126,33 @@ Metadata helps enrich Trivy's scan results with useful information.
   
 All fields under `__rego_metadata__` are optional.
 
-| Field name         | Allowed values                      | Default value | In table           | In JSON          |
-| ------------------ | ------------------------------------| :-----------: | :----------------: |:---------------: |
-| id                 | Any characters                      | N/A           | :material-check:   | :material-check: |
-| title              | Any characters                      | N/A           | :material-check:   | :material-check: |
-| severity           | `LOW`, `MEDIUM`, `HIGH`, `CRITICAL` | UNKNOWN       | :material-check:   | :material-check: |
-| type               | Any characters                      | N/A           | :material-check:   | :material-check: |
-| description        | Any characters                      |               | :material-close:   | :material-check: |
-| recommended_actions| Any characters                      |               | :material-close:   | :material-check: | 
-| url                | Any characters                      |               | :material-close:   | :material-check: |
+| Field name          | Allowed values                      | Default value |     In table     |     In JSON      |
+|---------------------|-------------------------------------|:-------------:|:----------------:|:----------------:|
+| id                  | Any characters                      |      N/A      | :material-check: | :material-check: |
+| title               | Any characters                      |      N/A      | :material-check: | :material-check: |
+| severity            | `LOW`, `MEDIUM`, `HIGH`, `CRITICAL` |    UNKNOWN    | :material-check: | :material-check: |
+| description         | Any characters                      |               | :material-close: | :material-check: |
+| recommended_actions | Any characters                      |               | :material-close: | :material-check: | 
+| url                 | Any characters                      |               | :material-close: | :material-check: |
 
 Some fields are displayed in scan results.
 
 ``` bash
-deployment.yaml (kubernetes)
-============================
-Tests: 28 (SUCCESSES: 14, FAILURES: 14, EXCEPTIONS: 0)
-Failures: 14 (HIGH: 1)
+k.yaml (kubernetes)
+───────────────────
 
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |                CHECK                | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-| Custom Kubernetes Check   |   ID001    | Deployment not allowed              |   LOW    | Found deployment 'test' but deployments  |
-|                           |            |                                     |          | are not allowed                          |
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
+Tests: 32 (SUCCESSES: 31, FAILURES: 1, EXCEPTIONS: 0)
+Failures: 1 (UNKNOWN: 0, LOW: 1, MEDIUM: 0, HIGH: 0, CRITICAL: 0)
+
+LOW: Found deployment 'my-deployment' but deployments are not allowed
+════════════════════════════════════════════════════════════════════════
+Deployments are not allowed because of some reasons.
+────────────────────────────────────────────────────────────────────────
+ k.yaml:1-2
+────────────────────────────────────────────────────────────────────────
+   1 ┌ apiVersion: v1
+   2 └ kind: Deployment
+────────────────────────────────────────────────────────────────────────
 ```
 
 ### Input
@@ -164,21 +170,21 @@ All fields under `__rego_input` are optional.
     ```
 
 `combine` (boolean)
-: The details is [here](combine.md).
+: The details are [here](combine.md).
 
 `selector` (array)
-:   This option filters the input by file formats or configuration languages. 
+:   This option filters the input by file format or configuration language. 
     In the above example, Trivy passes only Kubernetes files to this policy.
-    Even if Dockerfile exists in the specified directory, it will not be passed to the policy as input.
+    Even if a Dockerfile exists in the specified directory, it will not be passed to the policy as input.
 
-    When configuration language such as Kubernetes is not identified, file format such as JSON will be used as `type`.
-    When configuration language is identified, it will overwrite `type`.
+    When configuration languages such as Kubernetes are not identified, file formats such as JSON will be used as `type`.
+    When a configuration language is identified, it will overwrite `type`.
     
     !!! example
         `pod.yaml` including Kubernetes Pod will be handled as `kubernetes`, not `yaml`.
         `type` is overwritten by `kubernetes` from `yaml`.
 
-    `type` accepts `kubernetes`, `dockerfile`, `ansible`, `cloudformation`, `json`, `yaml`, `toml`, or `hcl`.
+    `type` accepts `kubernetes`, `dockerfile`, `cloudformation`, `terraform`, `terraformplan`, `json`, or `yaml`.
 
 [rego]: https://www.openpolicyagent.org/docs/latest/policy-language/
 [package]: https://www.openpolicyagent.org/docs/latest/policy-language/#packages

docs/docs/misconfiguration/custom/testing.md

@@ -22,7 +22,7 @@ For more details, see [Policy Testing][opa-testing].
     }
     ```
 
-To write tests for custom policies, you can refer to existing tests under [AppShield][appshield].
+To write tests for custom policies, you can refer to existing tests under [defsec][defsec].
 
 ## Go testing
 [Fanal][fanal] which is a core library of Trivy can be imported as a Go library.
@@ -85,6 +85,6 @@ The following example stores allowed and denied configuration files in a directo
 `Dockerfile.allowed` has one successful result in `Successes`, while `Dockerfile.denied` has one failure result in `Failures`.
 
 [opa-testing]: https://www.openpolicyagent.org/docs/latest/policy-testing/
-[appshield]: https://github.com/aquasecurity/appshield
+[defsec]: https://github.com/aquasecurity/defsec
 [table]: https://github.com/golang/go/wiki/TableDrivenTests
 [fanal]: https://github.com/aquasecurity/fanal

docs/docs/misconfiguration/filesystem.md

@@ -1,56 +0,0 @@
-# Filesystem
-
-## Quick start
-
-Trivy scans a filesystem such as a virtual machine to detect misconfigurations.
-
-You have to specify `--security-checks config` to enable misconfiguration detection.
-
-```bash
-$ trivy fs --security-checks config /path/to/dir
-```
-
-Internally, it is the same as [config subcommand](iac.md).
-
-## Vulnerability and Misconfiguration scanning
-The difference between `fs` and `config` subcommand is that `fs` can detect both vulnerabilities and misconfiguration at the same time.
-
-You have to specify `--security-checks vuln,config` to enable vulnerability and misconfiguration detection.
-
-``` bash
-$ ls myapp/
-Dockerfile Pipfile.lock
-$ trivy fs --security-checks vuln,config --severity HIGH,CRITICAL myapp/
-2021-07-09T12:03:27.564+0300    INFO    Detected OS: unknown
-2021-07-09T12:03:27.564+0300    INFO    Number of language-specific files: 1
-2021-07-09T12:03:27.564+0300    INFO    Detecting pipenv vulnerabilities...
-2021-07-09T12:03:27.566+0300    INFO    Detected config files: 1
-
-Pipfile.lock (pipenv)
-=====================
-Total: 1 (HIGH: 1, CRITICAL: 0)
-
-+----------+------------------+----------+-------------------+---------------+---------------------------------------+
-| LIBRARY  | VULNERABILITY ID | SEVERITY | INSTALLED VERSION | FIXED VERSION |                 TITLE                 |
-+----------+------------------+----------+-------------------+---------------+---------------------------------------+
-| httplib2 | CVE-2021-21240   | HIGH     | 0.12.1            | 0.19.0        | python-httplib2: Regular              |
-|          |                  |          |                   |               | expression denial of                  |
-|          |                  |          |                   |               | service via malicious header          |
-|          |                  |          |                   |               | -->avd.aquasec.com/nvd/cve-2021-21240 |
-+----------+------------------+----------+-------------------+---------------+---------------------------------------+
-
-Dockerfile (dockerfile)
-=======================
-Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-|                           |            |                      |          | Dockerfile should not be 'root'          |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-```
-
-In the above example, Trivy detected vulnerabilities of Python dependencies and misconfigurations in Dockerfile.

docs/docs/misconfiguration/iac.md

@@ -1,163 +0,0 @@
-# Infrastructure as Code (IaC)
-
-## Quick start
-
-Simply specify a directory containing IaC files such as Terraform, CloudFormation and Dockerfile.
-
-``` bash
-$ trivy config [YOUR_IaC_DIRECTORY]
-```
-
-Trivy will automatically fetch the managed policies and will keep them up-to-date in future scans.
-
-!!! example
-    ```
-    $ ls build/
-    Dockerfile
-    $ trivy config ./build
-    2021-07-09T10:06:29.188+0300    INFO    Need to update the built-in policies
-    2021-07-09T10:06:29.188+0300    INFO    Downloading the built-in policies...
-    2021-07-09T10:06:30.520+0300    INFO    Detected config files: 1
-    
-    Dockerfile (dockerfile)
-    =======================
-    Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-    Failures: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 1, CRITICAL: 0)
-    
-    +---------------------------+------------+----------------------+----------+------------------------------------------+
-    |           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-    +---------------------------+------------+----------------------+----------+------------------------------------------+
-    | Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-    |                           |            |                      |          | Dockerfile should not be 'root'          |
-    |                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-    +---------------------------+------------+----------------------+----------+------------------------------------------+
-    ```
-    
-## Type detection
-The specified directory can contain mixed types of IaC files.
-Trivy automatically detects config types and applies relevant policies.
-
-For example, the following example holds IaC files for Terraform, CloudFormation, Kubernetes, and Dockerfile in the same directory.
-
-``` bash
-$ ls iac/
-Dockerfile  deployment.yaml  main.tf
-$ trivy conf --severity HIGH,CRITICAL ./iac
-```
-
-<details>
-<summary>Result</summary>
-
-```
-2021-07-09T11:51:08.212+0300    INFO    Need to update the built-in policies
-2021-07-09T11:51:08.212+0300    INFO    Downloading the built-in policies...
-2021-07-09T11:51:09.527+0300    INFO    Detected config files: 3
-
-Dockerfile (dockerfile)
-=======================
-Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-|                           |            |                      |          | Dockerfile should not be 'root'          |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-
-deployment.yaml (kubernetes)
-============================
-Tests: 28 (SUCCESSES: 15, FAILURES: 13, EXCEPTIONS: 0)
-Failures: 13 (HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+----------------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |           CHECK            | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------------+----------+------------------------------------------+
-| Kubernetes Security Check |   KSV005   | SYS_ADMIN capability added |   HIGH   | Container 'hello-kubernetes' of          |
-|                           |            |                            |          | Deployment 'hello-kubernetes'            |
-|                           |            |                            |          | should not include 'SYS_ADMIN' in        |
-|                           |            |                            |          | 'securityContext.capabilities.add'       |
-|                           |            |                            |          | -->avd.aquasec.com/appshield/ksv005      |
-+---------------------------+------------+----------------------------+----------+------------------------------------------+
-
-main.tf (terraform)
-===================
-Tests: 23 (SUCCESSES: 14, FAILURES: 9, EXCEPTIONS: 0)
-Failures: 9 (HIGH: 6, CRITICAL: 1)
-
-+------------------------------------------+------------+------------------------------------------+----------+--------------------------------------------------------+
-|                   TYPE                   | MISCONF ID |                  CHECK                   | SEVERITY |                        MESSAGE                         |
-+------------------------------------------+------------+------------------------------------------+----------+--------------------------------------------------------+
-|   Terraform Security Check powered by    |   AWS003   | AWS Classic resource usage.              |   HIGH   | Resource                                               |
-|                  tfsec                   |            |                                          |          | 'aws_db_security_group.my-group'                       |
-|                                          |            |                                          |          | uses EC2 Classic. Use a VPC instead.                   |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS003/                          |
-+                                          +------------+------------------------------------------+----------+--------------------------------------------------------+
-|                                          |   AWS004   | Use of plain HTTP.                       | CRITICAL | Resource                                               |
-|                                          |            |                                          |          | 'aws_alb_listener.my-alb-listener'                     |
-|                                          |            |                                          |          | uses plain HTTP instead of HTTPS.                      |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS004/                          |
-+                                          +------------+------------------------------------------+----------+--------------------------------------------------------+
-|                                          |   AWS018   | Missing description for security         |   HIGH   | Resource                                               |
-|                                          |            | group/security group rule.               |          | 'aws_security_group_rule.my-rule' should               |
-|                                          |            |                                          |          | include a description for auditing                     |
-|                                          |            |                                          |          | purposes. -->tfsec.dev/docs/aws/AWS018/                |
-+                                          +------------+------------------------------------------+          +--------------------------------------------------------+
-|                                          |   AWS025   | API Gateway domain name uses outdated    |          | Resource                                               |
-|                                          |            | SSL/TLS protocols.                       |          | 'aws_api_gateway_domain_name.empty_security_policy'    |
-|                                          |            |                                          |          | defines outdated SSL/TLS policies (not using           |
-|                                          |            |                                          |          | TLS_1_2). -->tfsec.dev/docs/aws/AWS025/                |
-+                                          +            +                                          +          +--------------------------------------------------------+
-|                                          |            |                                          |          | Resource                                               |
-|                                          |            |                                          |          | 'aws_api_gateway_domain_name.missing_security_policy'  |
-|                                          |            |                                          |          | should include security_policy (defaults to outdated   |
-|                                          |            |                                          |          | SSL/TLS policy). -->tfsec.dev/docs/aws/AWS025/         |
-+                                          +            +                                          +          +--------------------------------------------------------+
-|                                          |            |                                          |          | Resource                                               |
-|                                          |            |                                          |          | 'aws_api_gateway_domain_name.outdated_security_policy' |
-|                                          |            |                                          |          | defines outdated SSL/TLS policies (not using TLS_1_2). |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS025/                          |
-+                                          +------------+------------------------------------------+          +--------------------------------------------------------+
-|                                          |   AZU003   | Unencrypted managed disk.                |          | Resource 'azurerm_managed_disk.source'                 |
-|                                          |            |                                          |          | defines an unencrypted managed disk.                   |
-|                                          |            |                                          |          | -->tfsec.dev/docs/azure/AZU003/                        |
-+------------------------------------------+------------+------------------------------------------+----------+--------------------------------------------------------+
-```
-
-</details>
-
-You can see the config type next to each file name.
-
-!!! example
-    ``` bash
-    Dockerfile (dockerfile)
-    =======================
-    Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-    Failures: 1 (HIGH: 1, CRITICAL: 0)
-    
-    ...
-    
-    deployment.yaml (kubernetes)
-    ============================
-    Tests: 28 (SUCCESSES: 15, FAILURES: 13, EXCEPTIONS: 0)
-    Failures: 13 (HIGH: 1, CRITICAL: 0)
-    
-    ...
-    
-    main.tf (terraform)
-    ===================
-    Tests: 23 (SUCCESSES: 14, FAILURES: 9, EXCEPTIONS: 0)
-    Failures: 9 (HIGH: 6, CRITICAL: 1)
-
-    ...
-
-    bucket.yaml (cloudformation)
-    ============================
-    Tests: 9 (SUCCESSES: 3, FAILURES: 6, EXCEPTIONS: 0)
-    Failures: 6 (UNKNOWN: 0, LOW: 0, MEDIUM: 2, HIGH: 4, CRITICAL: 0)
-
-    ```
-
-## Example
-See [here](https://github.com/aquasecurity/trivy/tree/125c457517f05b6498bc68eaeec6e683dd36c49a/examples/misconf/mixed)

docs/docs/misconfiguration/index.md

@@ -1,8 +0,0 @@
-# Misconfiguration Scanning
-Trivy provides built-in policies to detect configuration issues in Docker, Kubernetes and Terraform.
-Also, you can write your own policies in [Rego][rego] to scan JSON, YAML, HCL, etc, like [Conftest][conftest].
-
-![misconf](../../imgs/misconf.png)
-
-[rego]: https://www.openpolicyagent.org/docs/latest/policy-language/
-[conftest]: https://github.com/open-policy-agent/conftest/

docs/docs/misconfiguration/options/filter.md

@@ -11,202 +11,50 @@ trivy conf --severity HIGH,CRITICAL examples/misconf/mixed
 <details>
 <summary>Result</summary>
 
-```bash
-2021-07-10T17:37:13.267+0300    INFO    Detected config files: 4
+```shell
+2022-05-16T13:50:42.718+0100	INFO	Detected config files: 3
 
-configs/Dockerfile (dockerfile)
-===============================
-Tests: 23 (SUCCESSES: 21, FAILURES: 2, EXCEPTIONS: 0)
-Failures: 2 (HIGH: 1, CRITICAL: 0)
+Dockerfile (dockerfile)
+=======================
+Tests: 17 (SUCCESSES: 16, FAILURES: 1, EXCEPTIONS: 0)
+Failures: 1 (HIGH: 1, CRITICAL: 0)
 
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Specify at least 1 USER                  |
-|                           |            |                      |          | command in Dockerfile with               |
-|                           |            |                      |          | non-root user as argument                |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
+HIGH: Last USER command in Dockerfile should not be 'root'
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+Running containers with 'root' user can lead to a container escape situation. It is a best practice to run containers as non-root users, which can be done by adding a 'USER' statement to the Dockerfile.
 
-configs/deployment.yaml (kubernetes)
-====================================
-Tests: 28 (SUCCESSES: 14, FAILURES: 14, EXCEPTIONS: 0)
-Failures: 14 (HIGH: 1, CRITICAL: 0)
+See https://avd.aquasec.com/misconfig/ds002
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ Dockerfile:3
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   3 [ USER root
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |                CHECK                | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-| Kubernetes Security Check |   KSV006   | docker.sock is mounted to container |   HIGH   | Deployment 'hello-kubernetes' should     |
-|                           |            |                                     |          | not specify '/var/run/docker.socker' in  |
-|                           |            |                                     |          | 'spec.template.volumes.hostPath.path'    |
-|                           |            |                                     |          | -->avd.aquasec.com/appshield/ksv006      |
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
 
-configs/main.tf (terraform)
-===========================
-Tests: 19 (SUCCESSES: 11, FAILURES: 8, EXCEPTIONS: 0)
-Failures: 8 (HIGH: 6, CRITICAL: 1)
 
-+------------------------------------------+------------+------------------------------------------+----------+--------------------------------------------------------+
-|                   TYPE                   | MISCONF ID |                  CHECK                   | SEVERITY |                        MESSAGE                         |
-+------------------------------------------+------------+------------------------------------------+----------+--------------------------------------------------------+
-|   Terraform Security Check powered by    |   AWS003   | AWS Classic resource usage.              |   HIGH   | Resource                                               |
-|                  tfsec                   |            |                                          |          | 'aws_db_security_group.my-group'                       |
-|                                          |            |                                          |          | uses EC2 Classic. Use a VPC instead.                   |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS003/                          |
-+                                          +------------+------------------------------------------+----------+--------------------------------------------------------+
-|                                          |   AWS004   | Use of plain HTTP.                       | CRITICAL | Resource                                               |
-|                                          |            |                                          |          | 'aws_alb_listener.my-alb-listener'                     |
-|                                          |            |                                          |          | uses plain HTTP instead of HTTPS.                      |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS004/                          |
-+                                          +------------+------------------------------------------+----------+--------------------------------------------------------+
-|                                          |   AWS018   | Missing description for security         |   HIGH   | Resource                                               |
-|                                          |            | group/security group rule.               |          | 'aws_security_group_rule.my-rule' should               |
-|                                          |            |                                          |          | include a description for auditing                     |
-|                                          |            |                                          |          | purposes. -->tfsec.dev/docs/aws/AWS018/                |
-+                                          +------------+------------------------------------------+          +--------------------------------------------------------+
-|                                          |   AWS025   | API Gateway domain name uses outdated    |          | Resource                                               |
-|                                          |            | SSL/TLS protocols.                       |          | 'aws_api_gateway_domain_name.empty_security_policy'    |
-|                                          |            |                                          |          | defines outdated SSL/TLS policies (not using           |
-|                                          |            |                                          |          | TLS_1_2). -->tfsec.dev/docs/aws/AWS025/                |
-+                                          +            +                                          +          +--------------------------------------------------------+
-|                                          |            |                                          |          | Resource                                               |
-|                                          |            |                                          |          | 'aws_api_gateway_domain_name.missing_security_policy'  |
-|                                          |            |                                          |          | should include security_policy (defaults to outdated   |
-|                                          |            |                                          |          | SSL/TLS policy). -->tfsec.dev/docs/aws/AWS025/         |
-+                                          +            +                                          +          +--------------------------------------------------------+
-|                                          |            |                                          |          | Resource                                               |
-|                                          |            |                                          |          | 'aws_api_gateway_domain_name.outdated_security_policy' |
-|                                          |            |                                          |          | defines outdated SSL/TLS policies (not using TLS_1_2). |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS025/                          |
-+                                          +------------+------------------------------------------+          +--------------------------------------------------------+
-|                                          |   AZU003   | Unencrypted managed disk.                |          | Resource 'azurerm_managed_disk.source'                 |
-|                                          |            |                                          |          | defines an unencrypted managed disk.                   |
-|                                          |            |                                          |          | -->tfsec.dev/docs/azure/AZU003/                        |
-+------------------------------------------+------------+------------------------------------------+----------+--------------------------------------------------------+
-
-configs/variables.tf (terraform)
-================================
-Tests: 1 (SUCCESSES: 1, FAILURES: 0, EXCEPTIONS: 0)
+deployment.yaml (kubernetes)
+============================
+Tests: 8 (SUCCESSES: 8, FAILURES: 0, EXCEPTIONS: 0)
 Failures: 0 (HIGH: 0, CRITICAL: 0)
-```
 
-</details>
 
-## By Misconfiguration IDs
+main.tf (terraform)
+===================
+Tests: 1 (SUCCESSES: 0, FAILURES: 1, EXCEPTIONS: 0)
+Failures: 1 (HIGH: 0, CRITICAL: 1)
 
-Use `.trivyignore`.
+CRITICAL: Classic resources should not be used.
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+AWS Classic resources run in a shared environment with infrastructure owned by other AWS customers. You should run
+resources in a VPC instead.
 
-```bash
-$ cat .trivyignore
-# Accept the risk
-AWS003
-AWS018
-AWS025
-
-$ trivy conf --severity HIGH,CRITICAL examples/misconf/mixed
-```
-
-<details>
-<summary>Result</summary>
-
-```bash
-2021-07-10T17:38:51.306+0300    INFO    Detected config files: 4
-
-configs/Dockerfile (dockerfile)
-===============================
-Tests: 23 (SUCCESSES: 21, FAILURES: 2, EXCEPTIONS: 0)
-Failures: 2 (HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Specify at least 1 USER                  |
-|                           |            |                      |          | command in Dockerfile with               |
-|                           |            |                      |          | non-root user as argument                |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-
-configs/deployment.yaml (kubernetes)
-====================================
-Tests: 28 (SUCCESSES: 14, FAILURES: 14, EXCEPTIONS: 0)
-Failures: 14 (HIGH: 1, CRITICAL: 0)
-
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |                CHECK                | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-| Kubernetes Security Check |   KSV006   | docker.sock is mounted to container |   HIGH   | Deployment 'hello-kubernetes' should     |
-|                           |            |                                     |          | not specify '/var/run/docker.socker' in  |
-|                           |            |                                     |          | 'spec.template.volumes.hostPath.path'    |
-|                           |            |                                     |          | -->avd.aquasec.com/appshield/ksv006      |
-+---------------------------+------------+-------------------------------------+----------+------------------------------------------+
-
-configs/main.tf (terraform)
-===========================
-Tests: 19 (SUCCESSES: 11, FAILURES: 8, EXCEPTIONS: 0)
-Failures: 8 (HIGH: 1, CRITICAL: 1)
-
-+------------------------------------------+------------+---------------------------+----------+------------------------------------------+
-|                   TYPE                   | MISCONF ID |           CHECK           | SEVERITY |                 MESSAGE                  |
-+------------------------------------------+------------+---------------------------+----------+------------------------------------------+
-|   Terraform Security Check powered by    |   AWS004   | Use of plain HTTP.        | CRITICAL | Resource                                 |
-|                  tfsec                   |            |                           |          | 'aws_alb_listener.my-alb-listener'       |
-|                                          |            |                           |          | uses plain HTTP instead of HTTPS.        |
-|                                          |            |                           |          | -->tfsec.dev/docs/aws/AWS004/            |
-+                                          +------------+---------------------------+----------+------------------------------------------+
-|                                          |   AZU003   | Unencrypted managed disk. |   HIGH   | Resource 'azurerm_managed_disk.source'   |
-|                                          |            |                           |          | defines an unencrypted managed disk.     |
-|                                          |            |                           |          | -->tfsec.dev/docs/azure/AZU003/          |
-+------------------------------------------+------------+---------------------------+----------+------------------------------------------+
-
-configs/variables.tf (terraform)
-================================
-Tests: 1 (SUCCESSES: 1, FAILURES: 0, EXCEPTIONS: 0)
-Failures: 0 (HIGH: 0, CRITICAL: 0)
-```
-
-</details>
-
-## By Exceptions
-See [Exceptions](../policy/exceptions.md)
-
-## Show Successes and Exceptions
-Use `--include-non-failures` option to show successes and exceptions as well as failures.
-
-```bash
-trivy conf --severity CRITICAL --include-non-failures examples/misconf/mixed
-```
-
-<details>
-<summary>Result</summary>
-```
-2021-07-10T17:44:02.049+0300    INFO    Detected config files: 4
-
-configs/Dockerfile (dockerfile)
-===============================
-Tests: 23 (SUCCESSES: 21, FAILURES: 2, EXCEPTIONS: 0)
-Failures: 2 (CRITICAL: 0)
-
-+---------------------------+------------+------------------------------------------+----------+--------+-----------------+
-|           TYPE            | MISCONF ID |                  CHECK                   | SEVERITY | STATUS |     MESSAGE     |
-+---------------------------+------------+------------------------------------------+----------+--------+-----------------+
-| Dockerfile Security Check |   DS006    | COPY '--from' refers to the current      | CRITICAL |  PASS  | No issues found |
-|                           |            | image                                    |          |        |                 |
-+                           +------------+------------------------------------------+          +        +                 +
-|                           |   DS007    | Multiple ENTRYPOINT instructions are     |          |        |                 |
-|                           |            | listed                                   |          |        |                 |
-+                           +------------+------------------------------------------+          +        +                 +
-|                           |   DS008    | Exposed port is out of range             |          |        |                 |
-+                           +------------+------------------------------------------+          +        +                 +
-|                           |   DS010    | 'sudo' is used                           |          |        |                 |
-+                           +------------+------------------------------------------+          +        +                 +
-|                           |   DS011    | COPY with more than two arguments is not |          |        |                 |
-|                           |            | ending with slash                        |          |        |                 |
-+                           +------------+------------------------------------------+          +        +                 +
-|                           |   DS012    | Duplicate aliases are defined in         |          |        |                 |
-|                           |            | different FROMs                          |          |        |                 |
-+---------------------------+------------+------------------------------------------+----------+--------+-----------------+
-
-...
+See https://avd.aquasec.com/misconfig/avd-aws-0081
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ main.tf:2-4
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   2 ┌ resource "aws_db_security_group" "sg" {
+   3 │
+   4 └ }
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 ```
 </details>

docs/docs/misconfiguration/options/policy.md

@@ -26,63 +26,10 @@ trivy conf --policy ./policy --data ./data --namespaces user ./configs
 For more details, see [Custom Data](../custom/data.md).
 
 ## Pass namespaces
-By default, Trivy evaluate policies defined in `appshield.*`.
+By default, Trivy evaluates policies defined in `builtin.*`.
 If you want to evaluate custom policies in other packages, you have to specify package prefixes through `--namespaces` option.
 This can be repeated for specifying multiple packages.
 
 ``` bash
 trivy conf --policy ./policy --namespaces main --namespaces user ./configs
 ```
-
-## Skip update of built-in policies
-`Trivy` downloads built-in policies when it starts operating.
-Then, it checks for updates every 24 hours.
-You can use the `--skip-policy-update` option to skip it.
-If you skip it the first time, the built-in policies will not be loaded.
-
-!!! note
-    Even if you specify the option the first time, it will be loaded as Terraform policies are written in Go.
-
-```
-trivy conf --skip-policy-update examples/misconf/mixed                                                                                           [~/src/github.com/aquasecurity/trivy]
-
-```
-
-<details>
-<summary>Result</summary>
-
-```
-2021-07-10T18:04:19.083+0300    INFO    No builtin policies were loaded
-2021-07-10T18:04:19.174+0300    INFO    Detected config files: 2
-
-configs/main.tf (terraform)
-===========================
-Tests: 19 (SUCCESSES: 11, FAILURES: 8, EXCEPTIONS: 0)
-Failures: 8 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 1, CRITICAL: 1)
-
-+------------------------------------------+------------+------------------------------------------+----------+------------------------------------------+
-|                   TYPE                   | MISCONF ID |                  CHECK                   | SEVERITY |                 MESSAGE                  |
-+------------------------------------------+------------+------------------------------------------+----------+------------------------------------------+
-|   Terraform Security Check powered by    |   AWS004   | Use of plain HTTP.                       | CRITICAL | Resource                                 |
-|                  tfsec                   |            |                                          |          | 'aws_alb_listener.my-alb-listener'       |
-|                                          |            |                                          |          | uses plain HTTP instead of HTTPS.        |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS004/            |
-+                                          +------------+------------------------------------------+----------+------------------------------------------+
-|                                          |   AWS006   | An ingress security group rule allows    |  MEDIUM  | Resource                                 |
-|                                          |            | traffic from /0.                         |          | 'aws_security_group_rule.my-rule'        |
-|                                          |            |                                          |          | defines a fully open                     |
-|                                          |            |                                          |          | ingress security group rule.             |
-|                                          |            |                                          |          | -->tfsec.dev/docs/aws/AWS006/            |
-+                                          +------------+------------------------------------------+----------+------------------------------------------+
-|                                          |   AZU003   | Unencrypted managed disk.                |   HIGH   | Resource 'azurerm_managed_disk.source'   |
-|                                          |            |                                          |          | defines an unencrypted managed disk.     |
-|                                          |            |                                          |          | -->tfsec.dev/docs/azure/AZU003/          |
-+------------------------------------------+------------+------------------------------------------+----------+------------------------------------------+
-
-configs/variables.tf (terraform)
-================================
-Tests: 1 (SUCCESSES: 1, FAILURES: 0, EXCEPTIONS: 0)
-Failures: 0 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 0, CRITICAL: 0)
-```
-</details>
-

docs/docs/misconfiguration/policy/builtin.md

@@ -2,40 +2,26 @@
 
 ## Policy Sources
 
-Built-in policies are mainly written in [Rego][rego].
-Those policies are managed under [AppShield repository][appshield].
-Terraform policies are currently powered by [tfsec][tfsec] and CloudFormation policies are powered by [cfsec][cfsec].
+Built-in policies are mainly written in [Rego][rego] and Go.
+Those policies are managed under [defsec repository][defsec].
 
-| Config type               | Source                  |
-| ------------------------- | ----------------------- |
-| Kubernetes                | [AppShield][kubernetes] |
-| Dockerfile, Containerfile | [AppShield][docker]     |
-| Terraform                 | [tfsec][tfsec-checks]   |
-| CloudFormation            | [cfsec][cfsec-checks]   |
+| Config type               | Source               |
+|---------------------------|----------------------|
+| Kubernetes                | [defsec][kubernetes] |
+| Dockerfile, Containerfile | [defsec][docker]     |
+| Terraform                 | [defsec][defsec]     |
+| CloudFormation            | [defsec][defsec]     |
+| Helm Chart                | [defsec][kubernetes] |      
+| RBAC                      | [defsec][rbac]       |      
 
-For suggestions or issues regarding policy content, please open an issue under [AppShield][appshield], [tfsec][tfsec] or [cfsec][cfsec] repository.
+For suggestions or issues regarding policy content, please open an issue under the [defsec][defsec] repository.
 
-Ansible are coming soon.
+Helm Chart scanning will resolve the chart to Kubernetes manifests then run the [kubenetes][kubernetes] checks.
 
-## Policy Distribution
-AppShield policies are distributed as an OPA bundle on [GitHub Container Registry][ghcr] (GHCR).
-When misconfiguration detection is enabled, Trivy pulls the OPA bundle from GHCR as an OCI artifact and stores it in the cache.
-Those policies are then loaded into Trivy OPA engine and used for detecting misconfigurations.
-
-## Update Interval
-Trivy checks for updates to OPA bundle on GHCR every 24 hours and pulls it if there are any updates.
+Ansible scanning is coming soon.
 
 [rego]: https://www.openpolicyagent.org/docs/latest/policy-language/
-[appshield]: https://github.com/aquasecurity/appshield
-[kubernetes]: https://github.com/aquasecurity/appshield/tree/master/kubernetes
-[docker]: https://github.com/aquasecurity/appshield/tree/master/docker
-[tfsec-checks]: https://tfsec.dev/
-[tfsec]: https://github.com/aquasecurity/tfsec
-[cfsec-checks]: https://cfsec.dev/
-[cfsec]: https://github.com/aquasecurity/cfsec
-[ghcr]: https://github.com/aquasecurity/appshield/pkgs/container/appshield
-
-[dockerfile-bestpractice]: https://docs.docker.com/develop/develop-images/dockerfile_best-practices/
-[pss]: https://kubernetes.io/docs/concepts/security/pod-security-standards/
-[azure]: https://docs.microsoft.com/en-us/azure/security/fundamentals/network-best-practices
-[kics]: https://github.com/Checkmarx/kics/
+[defsec]: https://github.com/aquasecurity/defsec
+[kubernetes]: https://github.com/aquasecurity/defsec/tree/master/internal/rules/kubernetes
+[kubernetes]: https://github.com/aquasecurity/defsec/tree/master/internal/rules/rbac
+[docker]: https://github.com/aquasecurity/defsec/tree/master/internal/rules/docker

docs/docs/misconfiguration/policy/exceptions.md

@@ -1,5 +1,5 @@
 # Exceptions
-Exceptions lets you to specify cases where you allow policy violations.
+Exceptions let you specify cases where you allow policy violations.
 Trivy supports two types of exceptions.
 
 !!! info
@@ -22,7 +22,7 @@ The `exception` rule must be defined under `namespace.exceptions`.
         
     exception[ns] {
         ns := data.namespaces[_]
-        startswith(ns, "appshield")
+        startswith(ns, "builtin.kubernetes")
     }
     ```
 
@@ -79,7 +79,7 @@ If you want to apply rule-based exceptions to built-in policies, you have to def
 
 !!! example
     ``` rego
-    package appshield.kubernetes.KSV012
+    package builtin.kubernetes.KSV012
 
     exception[rules] {
         input.metadata.name == "can-run-as-root"
@@ -87,12 +87,12 @@ If you want to apply rule-based exceptions to built-in policies, you have to def
     }
     ```
 
-This exception is applied to [KSV012][ksv012] in AppShield.
-You can get the package names in [AppShield repository][appshield] or the JSON output from Trivy.
+This exception is applied to [KSV012][ksv012] in defsec.
+You can get the package names in the [defsec repository][defsec] or the JSON output from Trivy.
 
 For more details, see [an example][rule-example].
 
 [ns-example]: https://github.com/aquasecurity/trivy/tree/{{ git.commit }}/examples/misconf/namespace-exception
 [rule-example]: https://github.com/aquasecurity/trivy/tree/{{ git.commit }}/examples/misconf/rule-exception
-[ksv012]: https://github.com/aquasecurity/appshield/blob/57bccc1897b2500a731415bda3990b0d4fbc959e/kubernetes/policies/pss/restricted/3_runs_as_root.rego
-[appshield]: https://github.com/aquasecurity/appshield/
+[ksv012]: https://github.com/aquasecurity/defsec/blob/master/internal/rules/kubernetes/policies/pss/restricted/3_runs_as_root.rego
+[defsec]: https://github.com/aquasecurity/defsec/

docs/docs/misconfiguration/scanning.md

@@ -0,0 +1,321 @@
+# Misconfiguration Scanning
+Trivy provides built-in policies to detect configuration issues in Docker, Kubernetes, Terraform and CloudFormation.
+Also, you can write your own policies in [Rego][rego] to scan JSON, YAML, etc, like [Conftest][conftest].
+
+![misconf](../../imgs/misconf.png)
+
+## Quick start
+
+Simply specify a directory containing IaC files such as Terraform, CloudFormation and Dockerfile.
+
+``` bash
+$ trivy config [YOUR_IaC_DIRECTORY]
+```
+
+
+!!! example
+    ```
+    $ ls build/
+    Dockerfile
+    $ trivy config ./build
+    2022-05-16T13:29:29.952+0100	INFO	Detected config files: 1
+    
+    Dockerfile (dockerfile)
+    =======================
+    Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
+    Failures: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
+    
+    MEDIUM: Specify a tag in the 'FROM' statement for image 'alpine'
+    ══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+    When using a 'FROM' statement you should use a specific tag to avoid uncontrolled behavior when the image is updated.
+    
+    See https://avd.aquasec.com/misconfig/ds001
+    ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+    Dockerfile:1
+    ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+    1 [ FROM alpine:latest
+    ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+    ```
+
+You can also enable misconfiguration detection in container image, filesystem and git repository scanning via `--security-checks config`.
+
+```bash
+$ trivy image --security-checks config IMAGE_NAME
+```
+
+```bash
+$ trivy fs --security-checks config /path/to/dir
+```
+
+!!! note
+    Misconfiguration detection is not enabled by default in `image`, `fs` and `repo` subcommands.
+
+Unlike the `config` subcommand, `image`, `fs` and `repo` subcommands can also scan for vulnerabilities and secrets at the same time. 
+You can specify `--security-checks vuln,config,secret` to enable vulnerability and secret detection as well as misconfiguration detection.
+
+
+!!! example
+    ``` bash
+    $ ls myapp/
+    Dockerfile Pipfile.lock
+    $ trivy fs --security-checks vuln,config,secret --severity HIGH,CRITICAL myapp/
+    2022-05-16T13:42:21.440+0100	INFO	Number of language-specific files: 1
+    2022-05-16T13:42:21.440+0100	INFO	Detecting pipenv vulnerabilities...
+    2022-05-16T13:42:21.440+0100	INFO	Detected config files: 1
+    
+    Pipfile.lock (pipenv)
+    =====================
+    Total: 1 (HIGH: 1, CRITICAL: 0)
+    
+    ┌──────────┬────────────────┬──────────┬───────────────────┬───────────────┬───────────────────────────────────────────────────────────┐
+    │ Library  │ Vulnerability  │ Severity │ Installed Version │ Fixed Version │                           Title                           │
+    ├──────────┼────────────────┼──────────┼───────────────────┼───────────────┼───────────────────────────────────────────────────────────┤
+    │ httplib2 │ CVE-2021-21240 │ HIGH     │ 0.12.1            │ 0.19.0        │ python-httplib2: Regular expression denial of service via │
+    │          │                │          │                   │               │ malicious header                                          │
+    │          │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2021-21240                │
+    └──────────┴────────────────┴──────────┴───────────────────┴───────────────┴───────────────────────────────────────────────────────────┘
+    
+    Dockerfile (dockerfile)
+    =======================
+    Tests: 17 (SUCCESSES: 16, FAILURES: 1, EXCEPTIONS: 0)
+    Failures: 1 (HIGH: 1, CRITICAL: 0)
+    
+    HIGH: Last USER command in Dockerfile should not be 'root'
+    ════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+    Running containers with 'root' user can lead to a container escape situation. It is a best practice to run containers as non-root users, which can be done by adding a 'USER' statement to the Dockerfile.
+    
+    See https://avd.aquasec.com/misconfig/ds002
+    ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+    Dockerfile:3
+    ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+    3 [ USER root
+    ────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+    ```
+
+In the above example, Trivy detected vulnerabilities of Python dependencies and misconfigurations in Dockerfile.
+
+## Type detection
+The specified directory can contain mixed types of IaC files.
+Trivy automatically detects config types and applies relevant policies.
+
+For example, the following example holds IaC files for Terraform, CloudFormation, Kubernetes, Helm Charts, and Dockerfile in the same directory.
+
+``` bash
+$ ls iac/
+Dockerfile  deployment.yaml  main.tf mysql-8.8.26.tar
+$ trivy conf --severity HIGH,CRITICAL ./iac
+```
+
+<details>
+<summary>Result</summary>
+
+```
+2022-06-06T11:01:21.142+0100	INFO	Detected config files: 8
+
+Dockerfile (dockerfile)
+
+Tests: 21 (SUCCESSES: 20, FAILURES: 1, EXCEPTIONS: 0)
+Failures: 1 (MEDIUM: 0, HIGH: 1, CRITICAL: 0)
+
+HIGH: Specify at least 1 USER command in Dockerfile with non-root user as argument
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+Running containers with 'root' user can lead to a container escape situation. It is a best practice to run containers as non-root users, which can be done by adding a 'USER' statement to the Dockerfile.
+
+See https://avd.aquasec.com/misconfig/ds002
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+
+deployment.yaml (kubernetes)
+
+Tests: 20 (SUCCESSES: 15, FAILURES: 5, EXCEPTIONS: 0)
+Failures: 5 (MEDIUM: 4, HIGH: 1, CRITICAL: 0)
+
+MEDIUM: Container 'hello-kubernetes' of Deployment 'hello-kubernetes' should set 'securityContext.allowPrivilegeEscalation' to false
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+A program inside the container can elevate its own privileges and run as root, which might give the program control over the container and node.
+
+See https://avd.aquasec.com/misconfig/ksv001
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ deployment.yaml:16-19
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+  16 ┌       - name: hello-kubernetes
+  17 │         image: hello-kubernetes:1.5
+  18 │         ports:
+  19 └         - containerPort: 8080
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+HIGH: Deployment 'hello-kubernetes' should not specify '/var/run/docker.socker' in 'spec.template.volumes.hostPath.path'
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+Mounting docker.sock from the host can give the container full root access to the host.
+
+See https://avd.aquasec.com/misconfig/ksv006
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ deployment.yaml:6-29
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   6 ┌   replicas: 3
+   7 │   selector:
+   8 │     matchLabels:
+   9 │       app: hello-kubernetes
+  10 │   template:
+  11 │     metadata:
+  12 │       labels:
+  13 │         app: hello-kubernetes
+  14 └     spec:
+  ..   
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+MEDIUM: Container 'hello-kubernetes' of Deployment 'hello-kubernetes' should set 'securityContext.runAsNonRoot' to true
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+'runAsNonRoot' forces the running image to run as a non-root user to ensure least privileges.
+
+See https://avd.aquasec.com/misconfig/ksv012
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ deployment.yaml:16-19
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+  16 ┌       - name: hello-kubernetes
+  17 │         image: hello-kubernetes:1.5
+  18 │         ports:
+  19 └         - containerPort: 8080
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+MEDIUM: Deployment 'hello-kubernetes' should not set 'spec.template.volumes.hostPath'
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+HostPath volumes must be forbidden.
+
+See https://avd.aquasec.com/misconfig/ksv023
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ deployment.yaml:6-29
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   6 ┌   replicas: 3
+   7 │   selector:
+   8 │     matchLabels:
+   9 │       app: hello-kubernetes
+  10 │   template:
+  11 │     metadata:
+  12 │       labels:
+  13 │         app: hello-kubernetes
+  14 └     spec:
+  ..   
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+MEDIUM: Deployment 'hello-kubernetes' should set 'securityContext.sysctl' to the allowed values
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+Sysctls can disable security mechanisms or affect all containers on a host, and should be disallowed except for an allowed 'safe' subset. A sysctl is considered safe if it is namespaced in the container or the Pod, and it is isolated from other Pods or processes on the same Node.
+
+See https://avd.aquasec.com/misconfig/ksv026
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ deployment.yaml:6-29
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   6 ┌   replicas: 3
+   7 │   selector:
+   8 │     matchLabels:
+   9 │       app: hello-kubernetes
+  10 │   template:
+  11 │     metadata:
+  12 │       labels:
+  13 │         app: hello-kubernetes
+  14 └     spec:
+  ..   
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+
+mysql-8.8.26.tar:templates/primary/statefulset.yaml (helm)
+
+Tests: 20 (SUCCESSES: 18, FAILURES: 2, EXCEPTIONS: 0)
+Failures: 2 (MEDIUM: 2, HIGH: 0, CRITICAL: 0)
+
+MEDIUM: Container 'mysql' of StatefulSet 'mysql' should set 'securityContext.allowPrivilegeEscalation' to false
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+A program inside the container can elevate its own privileges and run as root, which might give the program control over the container and node.
+
+See https://avd.aquasec.com/misconfig/ksv001
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ mysql-8.8.26.tar:templates/primary/statefulset.yaml:56-130
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+  56 ┌         - name: mysql
+  57 │           image: docker.io/bitnami/mysql:8.0.28-debian-10-r23
+  58 │           imagePullPolicy: "IfNotPresent"
+  59 │           securityContext:
+  60 │             runAsUser: 1001
+  61 │           env:
+  62 │             - name: BITNAMI_DEBUG
+  63 │               value: "false"
+  64 └             - name: MYSQL_ROOT_PASSWORD
+  ..   
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+
+MEDIUM: Container 'mysql' of StatefulSet 'mysql' should set 'securityContext.runAsNonRoot' to true
+═══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+'runAsNonRoot' forces the running image to run as a non-root user to ensure least privileges.
+
+See https://avd.aquasec.com/misconfig/ksv012
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ mysql-8.8.26.tar:templates/primary/statefulset.yaml:56-130
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+  56 ┌         - name: mysql
+  57 │           image: docker.io/bitnami/mysql:8.0.28-debian-10-r23
+  58 │           imagePullPolicy: "IfNotPresent"
+  59 │           securityContext:
+  60 │             runAsUser: 1001
+  61 │           env:
+  62 │             - name: BITNAMI_DEBUG
+  63 │               value: "false"
+  64 └             - name: MYSQL_ROOT_PASSWORD
+  ..   
+───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+```
+
+</details>
+
+You can see the config type next to each file name.
+
+!!! example
+``` bash
+Dockerfile (dockerfile)
+=======================
+Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
+Failures: 1 (HIGH: 1, CRITICAL: 0)
+
+...
+
+deployment.yaml (kubernetes)
+============================
+Tests: 28 (SUCCESSES: 15, FAILURES: 13, EXCEPTIONS: 0)
+Failures: 13 (MEDIUM: 4, HIGH: 1, CRITICAL: 0)
+
+...
+
+main.tf (terraform)
+===================
+Tests: 23 (SUCCESSES: 14, FAILURES: 9, EXCEPTIONS: 0)
+Failures: 9 (HIGH: 6, CRITICAL: 1)
+
+...
+
+bucket.yaml (cloudformation)
+============================
+Tests: 9 (SUCCESSES: 3, FAILURES: 6, EXCEPTIONS: 0)
+Failures: 6 (UNKNOWN: 0, LOW: 0, MEDIUM: 2, HIGH: 4, CRITICAL: 0)
+
+...
+
+mysql-8.8.26.tar:templates/primary/statefulset.yaml (helm)
+==========================================================
+Tests: 20 (SUCCESSES: 18, FAILURES: 2, EXCEPTIONS: 0)
+Failures: 2 (MEDIUM: 2, HIGH: 0, CRITICAL: 0)
+```
+
+## Examples
+See [here](https://github.com/aquasecurity/trivy/tree/{{ git.tag }}/examples/misconf/mixed)
+
+[rego]: https://www.openpolicyagent.org/docs/latest/policy-language/
+[conftest]: https://github.com/open-policy-agent/conftest/
+

docs/docs/references/cli/client.md

@@ -2,19 +2,20 @@
 
 ```bash
 NAME:
-   trivy client - client mode
+   trivy client - DEPRECATED client mode, use `trivy image` with `--server` option for remote scans now.
 
 USAGE:
-   trivy client [command options] image_name
+   trivy image --server value
 
-OPTIONS:
+   trivy client [deprecated command options] image_name
+
+DEPRECATED OPTIONS:
    --template value, -t value  output template [$TRIVY_TEMPLATE]
    --format value, -f value    format (table, json, sarif, template) (default: "table") [$TRIVY_FORMAT]
    --input value, -i value     input file path instead of image name [$TRIVY_INPUT]
    --severity value, -s value  severities of vulnerabilities to be displayed (comma separated) (default: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL") [$TRIVY_SEVERITY]
    --output value, -o value    output file name [$TRIVY_OUTPUT]
    --exit-code value           Exit code when vulnerabilities were found (default: 0) [$TRIVY_EXIT_CODE]
-   --clear-cache, -c           clear image caches without scanning (default: false) [$TRIVY_CLEAR_CACHE]
    --ignore-unfixed            display only fixed vulnerabilities (default: false) [$TRIVY_IGNORE_UNFIXED]
    --removed-pkgs              detect vulnerabilities of removed packages (only for Alpine) (default: false) [$TRIVY_REMOVED_PKGS]
    --vuln-type value           comma-separated list of vulnerability types (os,library) (default: "os,library") [$TRIVY_VULN_TYPE]

docs/docs/references/cli/fs.md

@@ -15,6 +15,7 @@ OPTIONS:
    --exit-code value                              Exit code when vulnerabilities were found (default: 0) [$TRIVY_EXIT_CODE]
    --skip-db-update, --skip-update                skip updating vulnerability database (default: false) [$TRIVY_SKIP_UPDATE, $TRIVY_SKIP_DB_UPDATE]
    --skip-policy-update                           skip updating built-in policies (default: false) [$TRIVY_SKIP_POLICY_UPDATE]
+   --insecure                                     allow insecure server connections when using SSL (default: false) [$TRIVY_INSECURE]
    --clear-cache, -c                              clear image caches without scanning (default: false) [$TRIVY_CLEAR_CACHE]
    --ignore-unfixed                               display only fixed vulnerabilities (default: false) [$TRIVY_IGNORE_UNFIXED]
    --vuln-type value                              comma-separated list of vulnerability types (os,library) (default: "os,library") [$TRIVY_VULN_TYPE]

docs/docs/references/cli/image.md

@@ -22,7 +22,7 @@ OPTIONS:
    --ignore-unfixed                 display only fixed vulnerabilities (default: false) [$TRIVY_IGNORE_UNFIXED]
    --removed-pkgs                   detect vulnerabilities of removed packages (only for Alpine) (default: false) [$TRIVY_REMOVED_PKGS]
    --vuln-type value                comma-separated list of vulnerability types (os,library) (default: "os,library") [$TRIVY_VULN_TYPE]
-   --security-checks value          comma-separated list of what security issues to detect (vuln,config) (default: "vuln") [$TRIVY_SECURITY_CHECKS]
+   --security-checks value          comma-separated list of what security issues to detect (vuln,config,secret) (default: "vuln,secret") [$TRIVY_SECURITY_CHECKS]
    --ignorefile value               specify .trivyignore file (default: ".trivyignore") [$TRIVY_IGNOREFILE]
    --timeout value                  timeout (default: 5m0s) [$TRIVY_TIMEOUT]
    --light                          deprecated (default: false) [$TRIVY_LIGHT]
@@ -35,5 +35,9 @@ OPTIONS:
    --db-repository value            OCI repository to retrieve trivy-db from (default: "ghcr.io/aquasecurity/trivy-db") [$TRIVY_DB_REPOSITORY]
    --skip-files value               specify the file paths to skip traversal                (accepts multiple inputs) [$TRIVY_SKIP_FILES]
    --skip-dirs value                specify the directories where the traversal is skipped  (accepts multiple inputs) [$TRIVY_SKIP_DIRS]
+   --server value                   server address [$TRIVY_SERVER]
+   --token value                    for authentication in client/server mode [$TRIVY_TOKEN]
+   --token-header value             specify a header name for token in client/server mode (default: "Trivy-Token") [$TRIVY_TOKEN_HEADER]
+   --custom-headers value           custom headers in client/server mode  (accepts multiple inputs) [$TRIVY_CUSTOM_HEADERS]
    --help, -h                       show help (default: false)
 ```

docs/docs/references/cli/index.md

@@ -2,7 +2,7 @@ Trivy has several sub commands, image, fs, repo, client and server.
 
 ``` bash
 NAME:
-   trivy - A simple and comprehensive vulnerability scanner for containers
+   trivy - Scanner for vulnerabilities in container images, file systems, and Git repositories, as well as for configuration issues and hard-coded secrets
 
 USAGE:
    trivy [global options] command [command options] target
@@ -12,12 +12,14 @@ VERSION:
 
 COMMANDS:
    image, i          scan an image
-   filesystem, fs    scan local filesystem
+   filesystem, fs    scan local filesystem for language-specific dependencies and config files
+   rootfs            scan rootfs
    repository, repo  scan remote repository
-   client, c         client mode
    server, s         server mode
    config, conf      scan config files
    plugin, p         manage plugins
+   kubernetes, k8s   scan kubernetes vulnerabilities and misconfigurations
+   sbom              generate SBOM for an artifact
    version           print the version
    help, h           Shows a list of commands or help for one command
 
@@ -27,5 +29,4 @@ GLOBAL OPTIONS:
    --cache-dir value  cache directory (default: "/Users/teppei/Library/Caches/trivy") [$TRIVY_CACHE_DIR]
    --help, -h         show help (default: false)
    --version, -v      print the version (default: false)
-
 ```

docs/docs/references/cli/module.md

@@ -0,0 +1,17 @@
+# Module
+
+```bash
+NAME:
+   trivy module - manage modules
+
+USAGE:
+   trivy module command [command options] [arguments...]
+
+COMMANDS:
+   install, i    install a module
+   uninstall, u  uninstall a module
+   help, h       Shows a list of commands or help for one command
+
+OPTIONS:
+   --help, -h  show help (default: false)
+```

docs/docs/references/cli/plugin.md

@@ -0,0 +1,21 @@
+# Plugin
+
+```bash
+NAME:
+   trivy plugin - manage plugins
+
+USAGE:
+   trivy plugin command [command options] plugin_uri
+
+COMMANDS:
+   install, i    install a plugin
+   uninstall, u  uninstall a plugin
+   list, l       list installed plugin
+   info          information about a plugin
+   run, r        run a plugin on the fly
+   update        update an existing plugin
+   help, h       Shows a list of commands or help for one command
+
+OPTIONS:
+   --help, -h  show help (default: false)
+```

docs/docs/references/cli/plugins.md

@@ -1,173 +0,0 @@
-# Plugins
-Trivy provides a plugin feature to allow others to extend the Trivy CLI without the need to change the Trivycode base.
-This plugin system was inspired by the plugin system used in [kubectl][kubectl], [Helm][helm], and [Conftest][conftest].
-
-## Overview
-Trivy plugins are add-on tools that integrate seamlessly with Trivy.
-They provide a way to extend the core feature set of Trivy, but without requiring every new feature to be written in Go and added to the core tool.
-
-- They can be added and removed from a Trivy installation without impacting the core Trivy tool.
-- They can be written in any programming language.
-- They integrate with Trivy, and will show up in Trivy help and subcommands.
-
-!!! warning
-    Trivy plugins available in public are not audited for security.
-    You should install and run third-party plugins at your own risk, since they are arbitrary programs running on your machine.
-
-
-## Installing a Plugin
-A plugin can be installed using the `trivy plugin install` command.
-This command takes a url and will download the plugin and install it in the plugin cache.
-
-Trivy adheres to the XDG specification, so the location depends on whether XDG_DATA_HOME is set.
-Trivy will now search XDG_DATA_HOME for the location of the Trivy plugins cache.
-The preference order is as follows:
-
-- XDG_DATA_HOME if set and .trivy/plugins exists within the XDG_DATA_HOME dir
-- ~/.trivy/plugins
-
-Under the hood Trivy leverages [go-getter][go-getter] to download plugins.
-This means the following protocols are supported for downloading plugins:
-
-- OCI Registries
-- Local Files
-- Git
-- HTTP/HTTPS
-- Mercurial
-- Amazon S3
-- Google Cloud Storage
-
-For example, to download the Kubernetes Trivy plugin you can execute the following command:
-
-```bash
-$ trivy plugin install github.com/aquasecurity/trivy-plugin-kubectl
-```
-## Using Plugins
-Once the plugin is installed, Trivy will load all available plugins in the cache on the start of the next Trivy execution.
-A plugin will be made in the Trivy CLI based on the plugin name.
-To display all plugins, you can list them by `trivy --help`
-
-```bash
-$ trivy --help
-NAME:
-   trivy - A simple and comprehensive vulnerability scanner for containers
-
-USAGE:
-   trivy [global options] command [command options] target
-
-VERSION:
-   dev
-
-COMMANDS:
-   image, i          scan an image
-   filesystem, fs    scan local filesystem
-   repository, repo  scan remote repository
-   client, c         client mode
-   server, s         server mode
-   plugin, p         manage plugins
-   kubectl           scan kubectl resources
-   help, h           Shows a list of commands or help for one command
-```
-
-As shown above, `kubectl` subcommand exists in the `COMMANDS` section.
-To call the kubectl plugin and scan existing Kubernetes deployments, you can execute the following command:
-
-```
-$ trivy kubectl deployment <deployment-id> -- --ignore-unfixed --severity CRITICAL
-```
-
-Internally the kubectl plugin calls the kubectl binary to fetch information about that deployment and passes the using images to Trivy.
-You can see the detail [here][trivy-plugin-kubectl].
-
-If you want to omit even the subcommand, you can use `TRIVY_RUN_AS_PLUGIN` environment variable.
-
-```bash
-$ TRIVY_RUN_AS_PLUGIN=kubectl trivy job your-job -- --format json
-```
-
-## Installing and Running Plugins on the fly
-`trivy plugin run` installs a plugin and runs it on the fly.
-If the plugin is already present in the cache, the installation is skipped.
-
-```bash
-trivy plugin run github.com/aquasecurity/trivy-plugin-kubectl pod your-pod -- --exit-code 1
-```
-
-## Uninstalling Plugins
-Specify a plugin name with `trivy plugin uninstall` command.
-
-```bash
-$ trivy plugin uninstall kubectl
-```
-
-## Building Plugins
-Each plugin has a top-level directory, and then a plugin.yaml file.
-
-```bash
-your-plugin/
-  |
-  |- plugin.yaml
-  |- your-plugin.sh
-```
-
-In the example above, the plugin is contained inside of a directory named `your-plugin`.
-It has two files: plugin.yaml (required) and an executable script, your-plugin.sh (optional).
-
-The core of a plugin is a simple YAML file named plugin.yaml.
-Here is an example YAML of trivy-plugin-kubectl plugin that adds support for Kubernetes scanning.
-
-```yaml
-name: "kubectl"
-repository: github.com/aquasecurity/trivy-plugin-kubectl
-version: "0.1.0"
-usage: scan kubectl resources
-description: |-
-  A Trivy plugin that scans the images of a kubernetes resource.
-  Usage: trivy kubectl TYPE[.VERSION][.GROUP] NAME
-platforms:
-  - selector: # optional
-      os: darwin
-      arch: amd64
-    uri: ./trivy-kubectl # where the execution file is (local file, http, git, etc.)
-    bin: ./trivy-kubectl # path to the execution file
-  - selector: # optional
-      os: linux
-      arch: amd64
-    uri: https://github.com/aquasecurity/trivy-plugin-kubectl/releases/download/v0.1.0/trivy-kubectl.tar.gz
-    bin: ./trivy-kubectl
-```
-
-The `plugin.yaml` field should contain the following information:
-
-- name: The name of the plugin. This also determines how the plugin will be made available in the Trivy CLI. For example, if the plugin is named kubectl, you can call the plugin with `trivy kubectl`. (required)
-- version: The version of the plugin. (required)
-- usage: A short usage description. (required)
-- description: A long description of the plugin. This is where you could provide a helpful documentation of your plugin. (required)
-- platforms: (required)
-  - selector: The OS/Architecture specific variations of a execution file. (optional)
-    - os: OS information based on GOOS (linux, darwin, etc.) (optional)
-    - arch: The architecture information based on GOARCH (amd64, arm64, etc.) (optional)
-  - uri: Where the executable file is. Relative path from the root directory of the plugin or remote URL such as HTTP and S3. (required)
-  - bin: Which file to call when the plugin is executed. Relative path from the root directory of the plugin. (required)
-
-The following rules will apply in deciding which platform to select:
-
-- If both `os` and `arch` under `selector` match the current platform, search will stop and the platform will be used.
-- If `selector` is not present, the platform will be used.
-- If `os` matches and there is no more specific `arch` match, the platform will be used.
-- If no `platform` match is found, Trivy will exit with an error.
-
-After determining platform, Trivy will download the execution file from `uri` and store it in the plugin cache.
-When the plugin is called via Trivy CLI, `bin` command will be executed.
-
-The plugin is responsible for handling flags and arguments. Any arguments are passed to the plugin from the `trivy` command.
-
-## Example
-https://github.com/aquasecurity/trivy-plugin-kubectl
-
-[kubectl]: https://kubernetes.io/docs/tasks/extend-kubectl/kubectl-plugins/
-[helm]: https://helm.sh/docs/topics/plugins/
-[conftest]: https://www.conftest.dev/plugins/
-[go-getter]: https://github.com/hashicorp/go-getter
-[trivy-plugin-kubectl]: https://github.com/aquasecurity/trivy-plugin-kubectl
-

docs/docs/references/cli/rootfs.md

@@ -14,6 +14,7 @@ OPTIONS:
    --output value, -o value                       output file name [$TRIVY_OUTPUT]
    --exit-code value                              Exit code when vulnerabilities were found (default: 0) [$TRIVY_EXIT_CODE]
    --skip-db-update, --skip-update                skip updating vulnerability database (default: false) [$TRIVY_SKIP_UPDATE, $TRIVY_SKIP_DB_UPDATE]
+   --insecure                                     allow insecure server connections when using SSL (default: false) [$TRIVY_INSECURE]
    --skip-policy-update                           skip updating built-in policies (default: false) [$TRIVY_SKIP_POLICY_UPDATE]
    --clear-cache, -c                              clear image caches without scanning (default: false) [$TRIVY_CLEAR_CACHE]
    --ignore-unfixed                               display only fixed vulnerabilities (default: false) [$TRIVY_IGNORE_UNFIXED]

docs/docs/references/cli/sbom.md

@@ -7,13 +7,21 @@ NAME:
 USAGE:
    trivy sbom [command options] ARTIFACT
 
+DESCRIPTION:
+   ARTIFACT can be a container image, file path/directory, git repository or container image archive. See examples.
+
 OPTIONS:
    --output value, -o value             output file name [$TRIVY_OUTPUT]
    --clear-cache, -c                    clear image caches without scanning (default: false) [$TRIVY_CLEAR_CACHE]
    --ignorefile value                   specify .trivyignore file (default: ".trivyignore") [$TRIVY_IGNOREFILE]
    --timeout value                      timeout (default: 5m0s) [$TRIVY_TIMEOUT]
    --severity value, -s value           severities of vulnerabilities to be displayed (comma separated) (default: "UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL") [$TRIVY_SEVERITY]
+   --offline-scan                       do not issue API requests to identify dependencies (default: false) [$TRIVY_OFFLINE_SCAN]
+   --db-repository value                OCI repository to retrieve trivy-db from (default: "ghcr.io/aquasecurity/trivy-db") [$TRIVY_DB_REPOSITORY]
+   --insecure                           allow insecure server connections when using SSL (default: false) [$TRIVY_INSECURE]
+   --skip-files value                   specify the file paths to skip traversal                (accepts multiple inputs) [$TRIVY_SKIP_FILES]
+   --skip-dirs value                    specify the directories where the traversal is skipped  (accepts multiple inputs) [$TRIVY_SKIP_DIRS]
    --artifact-type value, --type value  input artifact type (image, fs, repo, archive) (default: "image") [$TRIVY_ARTIFACT_TYPE]
-   --sbom-format value, --format value  SBOM format (cyclonedx) (default: "cyclonedx") [$TRIVY_SBOM_FORMAT]
+   --sbom-format value, --format value  SBOM format (cyclonedx, spdx, spdx-json) (default: "cyclonedx") [$TRIVY_SBOM_FORMAT]
    --help, -h                           show help (default: false)
 ```

docs/docs/references/cli/server.md

@@ -10,6 +10,7 @@ USAGE:
 OPTIONS:
    --skip-db-update, --skip-update  skip updating vulnerability database (default: false) [$TRIVY_SKIP_UPDATE, $TRIVY_SKIP_DB_UPDATE]
    --download-db-only               download/update vulnerability database but don't run a scan (default: false) [$TRIVY_DOWNLOAD_DB_ONLY]
+   --insecure                       allow insecure server connections when using SSL (default: false) [$TRIVY_INSECURE]
    --reset                          remove all caches and database (default: false) [$TRIVY_RESET]
    --cache-backend value            cache backend (e.g. redis://localhost:6379) (default: "fs") [$TRIVY_CACHE_BACKEND]
    --cache-ttl value                cache TTL when using redis as cache backend (default: 0s) [$TRIVY_CACHE_TTL]

docs/docs/references/modes/client-server.md

@@ -1,6 +1,6 @@
 # Client/Server
 
-Trivy has client/server mode. Trivy server has vulnerability database and Trivy client doesn't have to download vulnerability database. It is useful if you want to scan images at multiple locations and do not want to download the database at every location.
+Trivy has client/server mode. Trivy server has vulnerability database and Trivy client doesn't have to download vulnerability database. It is useful if you want to scan images or files at multiple locations and do not want to download the database at every location.
 
 ## Server
 At first, you need to launch Trivy server. It downloads vulnerability database automatically and continue to fetch the latest DB in the background.
@@ -17,11 +17,12 @@ If you want to accept a connection from outside, you have to specify `0.0.0.0` o
 $ trivy server --listen 0.0.0.0:8080
 ```
 
-## Client
-Then, specify the remote address.
+## Remote image scan
+Then, specify the server address for `image` command.
 ```
-$ trivy client --remote http://localhost:8080 alpine:3.10
+$ trivy image --server http://localhost:8080 alpine:3.10
 ```
+**Note**: It's important to specify the protocol (http or https).
 
 <details>
 <summary>Result</summary>
@@ -43,6 +44,137 @@ Total: 3 (UNKNOWN: 0, LOW: 1, MEDIUM: 2, HIGH: 0, CRITICAL: 0)
 ```
 </details>
 
+## Remote scan of local filesystem
+Also, there is a way to scan local file system:
+```shell
+$ trivy fs --server http://localhost:8080 --severity CRITICAL ./integration/testdata/fixtures/fs/pom/
+```
+**Note**: It's important to specify the protocol (http or https).
+<details>
+<summary>Result</summary>
+pom.xml (pom)
+=============
+Total: 24 (CRITICAL: 24)
+
++---------------------------------------------+------------------+----------+-------------------+--------------------------------+---------------------------------------+
+|                   LIBRARY                   | VULNERABILITY ID | SEVERITY | INSTALLED VERSION |         FIXED VERSION          |                 TITLE                 |
++---------------------------------------------+------------------+----------+-------------------+--------------------------------+---------------------------------------+
+| com.fasterxml.jackson.core:jackson-databind | CVE-2017-17485   | CRITICAL | 2.9.1             | 2.8.11, 2.9.4                  | jackson-databind: Unsafe              |
+|                                             |                  |          |                   |                                | deserialization due to                |
+|                                             |                  |          |                   |                                | incomplete black list (incomplete     |
+|                                             |                  |          |                   |                                | fix for CVE-2017-15095)...            |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2017-17485 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2018-11307   |          |                   | 2.7.9.4, 2.8.11.2, 2.9.6       | jackson-databind: Potential           |
+|                                             |                  |          |                   |                                | information exfiltration with         |
+|                                             |                  |          |                   |                                | default typing, serialization         |
+|                                             |                  |          |                   |                                | gadget from MyBatis                   |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-11307 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2018-14718   |          |                   | 2.6.7.2, 2.9.7                 | jackson-databind: arbitrary code      |
+|                                             |                  |          |                   |                                | execution in slf4j-ext class          |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-14718 |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2018-14719   |          |                   |                                | jackson-databind: arbitrary           |
+|                                             |                  |          |                   |                                | code execution in blaze-ds-opt        |
+|                                             |                  |          |                   |                                | and blaze-ds-core classes             |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-14719 |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2018-14720   |          |                   |                                | jackson-databind: exfiltration/XXE    |
+|                                             |                  |          |                   |                                | in some JDK classes                   |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-14720 |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2018-14721   |          |                   |                                | jackson-databind: server-side request |
+|                                             |                  |          |                   |                                | forgery (SSRF) in axis2-jaxws class   |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-14721 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2018-19360   |          |                   | 2.6.7.3, 2.7.9.5, 2.8.11.3,    | jackson-databind: improper            |
+|                                             |                  |          |                   | 2.9.8                          | polymorphic deserialization           |
+|                                             |                  |          |                   |                                | in axis2-transport-jms class          |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-19360 |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2018-19361   |          |                   |                                | jackson-databind: improper            |
+|                                             |                  |          |                   |                                | polymorphic deserialization           |
+|                                             |                  |          |                   |                                | in openjpa class                      |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-19361 |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2018-19362   |          |                   |                                | jackson-databind: improper            |
+|                                             |                  |          |                   |                                | polymorphic deserialization           |
+|                                             |                  |          |                   |                                | in jboss-common-core class            |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-19362 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2018-7489    |          |                   | 2.7.9.3, 2.8.11.1, 2.9.5       | jackson-databind: incomplete fix      |
+|                                             |                  |          |                   |                                | for CVE-2017-7525 permits unsafe      |
+|                                             |                  |          |                   |                                | serialization via c3p0 libraries      |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2018-7489  |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-14379   |          |                   | 2.7.9.6, 2.8.11.4, 2.9.9.2     | jackson-databind: default             |
+|                                             |                  |          |                   |                                | typing mishandling leading            |
+|                                             |                  |          |                   |                                | to remote code execution              |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-14379 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-14540   |          |                   | 2.9.10                         | jackson-databind:                     |
+|                                             |                  |          |                   |                                | Serialization gadgets in              |
+|                                             |                  |          |                   |                                | com.zaxxer.hikari.HikariConfig        |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-14540 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-14892   |          |                   | 2.6.7.3, 2.8.11.5, 2.9.10      | jackson-databind: Serialization       |
+|                                             |                  |          |                   |                                | gadgets in classes of the             |
+|                                             |                  |          |                   |                                | commons-configuration package         |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-14892 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-14893   |          |                   | 2.8.11.5, 2.9.10               | jackson-databind:                     |
+|                                             |                  |          |                   |                                | Serialization gadgets in              |
+|                                             |                  |          |                   |                                | classes of the xalan package          |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-14893 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-16335   |          |                   | 2.9.10                         | jackson-databind:                     |
+|                                             |                  |          |                   |                                | Serialization gadgets in              |
+|                                             |                  |          |                   |                                | com.zaxxer.hikari.HikariDataSource    |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-16335 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-16942   |          |                   | 2.9.10.1                       | jackson-databind:                     |
+|                                             |                  |          |                   |                                | Serialization gadgets in              |
+|                                             |                  |          |                   |                                | org.apache.commons.dbcp.datasources.* |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-16942 |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2019-16943   |          |                   |                                | jackson-databind:                     |
+|                                             |                  |          |                   |                                | Serialization gadgets in              |
+|                                             |                  |          |                   |                                | com.p6spy.engine.spy.P6DataSource     |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-16943 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-17267   |          |                   | 2.9.10                         | jackson-databind: Serialization       |
+|                                             |                  |          |                   |                                | gadgets in classes of                 |
+|                                             |                  |          |                   |                                | the ehcache package                   |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-17267 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-17531   |          |                   | 2.9.10.1                       | jackson-databind:                     |
+|                                             |                  |          |                   |                                | Serialization gadgets in              |
+|                                             |                  |          |                   |                                | org.apache.log4j.receivers.db.*       |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-17531 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2019-20330   |          |                   | 2.8.11.5, 2.9.10.2             | jackson-databind: lacks               |
+|                                             |                  |          |                   |                                | certain net.sf.ehcache blocking       |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2019-20330 |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2020-8840    |          |                   | 2.7.9.7, 2.8.11.5, 2.9.10.3    | jackson-databind: Lacks certain       |
+|                                             |                  |          |                   |                                | xbean-reflect/JNDI blocking           |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2020-8840  |
++                                             +------------------+          +                   +--------------------------------+---------------------------------------+
+|                                             | CVE-2020-9546    |          |                   | 2.7.9.7, 2.8.11.6, 2.9.10.4    | jackson-databind: Serialization       |
+|                                             |                  |          |                   |                                | gadgets in shaded-hikari-config       |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2020-9546  |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2020-9547    |          |                   |                                | jackson-databind: Serialization       |
+|                                             |                  |          |                   |                                | gadgets in ibatis-sqlmap              |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2020-9547  |
++                                             +------------------+          +                   +                                +---------------------------------------+
+|                                             | CVE-2020-9548    |          |                   |                                | jackson-databind: Serialization       |
+|                                             |                  |          |                   |                                | gadgets in anteros-core               |
+|                                             |                  |          |                   |                                | -->avd.aquasec.com/nvd/cve-2020-9548  |
++---------------------------------------------+------------------+----------+-------------------+--------------------------------+---------------------------------------+
+</details>
+
 ## Authentication
 
 ```
@@ -50,7 +182,7 @@ $ trivy server --listen localhost:8080 --token dummy
 ```
 
 ```
-$ trivy client --remote http://localhost:8080 --token dummy alpine:3.10
+$ trivy image --server http://localhost:8080 --token dummy alpine:3.10
 ```
 
 ## Architecture

docs/docs/sbom/index.md

@@ -1,7 +1,9 @@
 # SBOM
+
 Trivy currently supports the following SBOM formats.
 
 - [CycloneDX][cyclonedx]
+- [SPDX][spdx]
 
 To generate SBOM, you can use the `--format` option for each subcommand such as `image` and `fs`.
 
@@ -188,4 +190,5 @@ $ trivy sbom --artifact-type repo github.com/aquasecurity/trivy-ci-test
 $ trivy sbom --artifact-type archive alpine.tar
 ```
 
-[cyclonedx]: cyclonedx.md
+[cyclonedx]: cyclonedx.md
+[spdx]: spdx.md

docs/docs/sbom/spdx.md

@@ -0,0 +1,297 @@
+# SPDX
+
+Trivy generates reports in the [SPDX][spdx] format.
+
+You can use the regular subcommands (like `image`, `fs` and `rootfs`) and specify `spdx` with the `--format` option.
+
+```
+$ trivy image --format spdx --output result.spdx alpine:3.15
+```
+
+<details>
+<summary>Result</summary>
+
+```
+$ cat result.spdx
+SPDXVersion: SPDX-2.2
+DataLicense: CC0-1.0
+SPDXID: SPDXRef-DOCUMENT
+DocumentName: alpine:3.15
+DocumentNamespace: http://aquasecurity.github.io/trivy/container_image/alpine:3.15-bebf6b19-a94c-4e2c-af44-065f63923f48
+Creator: Organization: aquasecurity
+Creator: Tool: trivy
+Created: 2022-04-28T07:32:57.142806Z
+
+##### Package: zlib
+
+PackageName: zlib
+SPDXID: SPDXRef-12bc938ac028a5e1
+PackageVersion: 1.2.12-r0
+FilesAnalyzed: false
+PackageLicenseConcluded: Zlib
+PackageLicenseDeclared: Zlib
+
+##### Package: apk-tools
+
+PackageName: apk-tools
+SPDXID: SPDXRef-26c274652190d87f
+PackageVersion: 2.12.7-r3
+FilesAnalyzed: false
+PackageLicenseConcluded: GPL-2.0-only
+PackageLicenseDeclared: GPL-2.0-only
+
+##### Package: libretls
+
+PackageName: libretls
+SPDXID: SPDXRef-2b021966d19a8211
+PackageVersion: 3.3.4-r3
+FilesAnalyzed: false
+PackageLicenseConcluded: ISC AND (BSD-3-Clause OR MIT)
+PackageLicenseDeclared: ISC AND (BSD-3-Clause OR MIT)
+
+##### Package: busybox
+
+PackageName: busybox
+SPDXID: SPDXRef-317ce3476703f20d
+PackageVersion: 1.34.1-r5
+FilesAnalyzed: false
+PackageLicenseConcluded: GPL-2.0-only
+PackageLicenseDeclared: GPL-2.0-only
+
+##### Package: libcrypto1.1
+
+PackageName: libcrypto1.1
+SPDXID: SPDXRef-34f407fb4dbd67f4
+PackageVersion: 1.1.1n-r0
+FilesAnalyzed: false
+PackageLicenseConcluded: OpenSSL
+PackageLicenseDeclared: OpenSSL
+
+##### Package: libc-utils
+
+PackageName: libc-utils
+SPDXID: SPDXRef-4bbc1cb449d54083
+PackageVersion: 0.7.2-r3
+FilesAnalyzed: false
+PackageLicenseConcluded: BSD-2-Clause AND BSD-3-Clause
+PackageLicenseDeclared: BSD-2-Clause AND BSD-3-Clause
+
+##### Package: alpine-keys
+
+PackageName: alpine-keys
+SPDXID: SPDXRef-a3bdd174be1456b6
+PackageVersion: 2.4-r1
+FilesAnalyzed: false
+PackageLicenseConcluded: MIT
+PackageLicenseDeclared: MIT
+
+##### Package: ca-certificates-bundle
+
+PackageName: ca-certificates-bundle
+SPDXID: SPDXRef-ac6472ba26fb991c
+PackageVersion: 20211220-r0
+FilesAnalyzed: false
+PackageLicenseConcluded: MPL-2.0 AND MIT
+PackageLicenseDeclared: MPL-2.0 AND MIT
+
+##### Package: libssl1.1
+
+PackageName: libssl1.1
+SPDXID: SPDXRef-b2d1b1d70fe90f7d
+PackageVersion: 1.1.1n-r0
+FilesAnalyzed: false
+PackageLicenseConcluded: OpenSSL
+PackageLicenseDeclared: OpenSSL
+
+##### Package: scanelf
+
+PackageName: scanelf
+SPDXID: SPDXRef-c617077ba6649520
+PackageVersion: 1.3.3-r0
+FilesAnalyzed: false
+PackageLicenseConcluded: GPL-2.0-only
+PackageLicenseDeclared: GPL-2.0-only
+
+##### Package: musl
+
+PackageName: musl
+SPDXID: SPDXRef-ca80b810029cde0e
+PackageVersion: 1.2.2-r7
+FilesAnalyzed: false
+PackageLicenseConcluded: MIT
+PackageLicenseDeclared: MIT
+
+##### Package: alpine-baselayout
+
+PackageName: alpine-baselayout
+SPDXID: SPDXRef-d782e64751ba9faa
+PackageVersion: 3.2.0-r18
+FilesAnalyzed: false
+PackageLicenseConcluded: GPL-2.0-only
+PackageLicenseDeclared: GPL-2.0-only
+
+##### Package: musl-utils
+
+PackageName: musl-utils
+SPDXID: SPDXRef-e5e8a237f6162e22
+PackageVersion: 1.2.2-r7
+FilesAnalyzed: false
+PackageLicenseConcluded: MIT BSD GPL2+
+PackageLicenseDeclared: MIT BSD GPL2+
+
+##### Package: ssl_client
+
+PackageName: ssl_client
+SPDXID: SPDXRef-fdf0ce84f6337be4
+PackageVersion: 1.34.1-r5
+FilesAnalyzed: false
+PackageLicenseConcluded: GPL-2.0-only
+PackageLicenseDeclared: GPL-2.0-only
+```
+
+</details>
+
+SPDX-JSON format is also supported by using `spdx-json` with the `--format` option.
+
+```
+$ trivy image --format spdx-json --output result.spdx.json alpine:3.15
+```
+
+<details>
+<summary>Result</summary>
+
+```
+$ cat result.spdx.json | jq .
+{
+	"SPDXID": "SPDXRef-DOCUMENT",
+	"creationInfo": {
+		"created": "2022-04-28T08:16:55.328255Z",
+		"creators": [
+			"Tool: trivy",
+			"Organization: aquasecurity"
+		]
+	},
+	"dataLicense": "CC0-1.0",
+	"documentNamespace": "http://aquasecurity.github.io/trivy/container_image/alpine:3.15-d9549e3a-a4c5-4ee3-8bde-8c78d451fbe7",
+	"name": "alpine:3.15",
+	"packages": [
+		{
+			"SPDXID": "SPDXRef-12bc938ac028a5e1",
+			"filesAnalyzed": false,
+			"licenseConcluded": "Zlib",
+			"licenseDeclared": "Zlib",
+			"name": "zlib",
+			"versionInfo": "1.2.12-r0"
+		},
+		{
+			"SPDXID": "SPDXRef-26c274652190d87f",
+			"filesAnalyzed": false,
+			"licenseConcluded": "GPL-2.0-only",
+			"licenseDeclared": "GPL-2.0-only",
+			"name": "apk-tools",
+			"versionInfo": "2.12.7-r3"
+		},
+		{
+			"SPDXID": "SPDXRef-2b021966d19a8211",
+			"filesAnalyzed": false,
+			"licenseConcluded": "ISC AND (BSD-3-Clause OR MIT)",
+			"licenseDeclared": "ISC AND (BSD-3-Clause OR MIT)",
+			"name": "libretls",
+			"versionInfo": "3.3.4-r3"
+		},
+		{
+			"SPDXID": "SPDXRef-317ce3476703f20d",
+			"filesAnalyzed": false,
+			"licenseConcluded": "GPL-2.0-only",
+			"licenseDeclared": "GPL-2.0-only",
+			"name": "busybox",
+			"versionInfo": "1.34.1-r5"
+		},
+		{
+			"SPDXID": "SPDXRef-34f407fb4dbd67f4",
+			"filesAnalyzed": false,
+			"licenseConcluded": "OpenSSL",
+			"licenseDeclared": "OpenSSL",
+			"name": "libcrypto1.1",
+			"versionInfo": "1.1.1n-r0"
+		},
+		{
+			"SPDXID": "SPDXRef-4bbc1cb449d54083",
+			"filesAnalyzed": false,
+			"licenseConcluded": "BSD-2-Clause AND BSD-3-Clause",
+			"licenseDeclared": "BSD-2-Clause AND BSD-3-Clause",
+			"name": "libc-utils",
+			"versionInfo": "0.7.2-r3"
+		},
+		{
+			"SPDXID": "SPDXRef-a3bdd174be1456b6",
+			"filesAnalyzed": false,
+			"licenseConcluded": "MIT",
+			"licenseDeclared": "MIT",
+			"name": "alpine-keys",
+			"versionInfo": "2.4-r1"
+		},
+		{
+			"SPDXID": "SPDXRef-ac6472ba26fb991c",
+			"filesAnalyzed": false,
+			"licenseConcluded": "MPL-2.0 AND MIT",
+			"licenseDeclared": "MPL-2.0 AND MIT",
+			"name": "ca-certificates-bundle",
+			"versionInfo": "20211220-r0"
+		},
+		{
+			"SPDXID": "SPDXRef-b2d1b1d70fe90f7d",
+			"filesAnalyzed": false,
+			"licenseConcluded": "OpenSSL",
+			"licenseDeclared": "OpenSSL",
+			"name": "libssl1.1",
+			"versionInfo": "1.1.1n-r0"
+		},
+		{
+			"SPDXID": "SPDXRef-c617077ba6649520",
+			"filesAnalyzed": false,
+			"licenseConcluded": "GPL-2.0-only",
+			"licenseDeclared": "GPL-2.0-only",
+			"name": "scanelf",
+			"versionInfo": "1.3.3-r0"
+		},
+		{
+			"SPDXID": "SPDXRef-ca80b810029cde0e",
+			"filesAnalyzed": false,
+			"licenseConcluded": "MIT",
+			"licenseDeclared": "MIT",
+			"name": "musl",
+			"versionInfo": "1.2.2-r7"
+		},
+		{
+			"SPDXID": "SPDXRef-d782e64751ba9faa",
+			"filesAnalyzed": false,
+			"licenseConcluded": "GPL-2.0-only",
+			"licenseDeclared": "GPL-2.0-only",
+			"name": "alpine-baselayout",
+			"versionInfo": "3.2.0-r18"
+		},
+		{
+			"SPDXID": "SPDXRef-e5e8a237f6162e22",
+			"filesAnalyzed": false,
+			"licenseConcluded": "MIT BSD GPL2+",
+			"licenseDeclared": "MIT BSD GPL2+",
+			"name": "musl-utils",
+			"versionInfo": "1.2.2-r7"
+		},
+		{
+			"SPDXID": "SPDXRef-fdf0ce84f6337be4",
+			"filesAnalyzed": false,
+			"licenseConcluded": "GPL-2.0-only",
+			"licenseDeclared": "GPL-2.0-only",
+			"name": "ssl_client",
+			"versionInfo": "1.34.1-r5"
+		}
+	],
+	"spdxVersion": "SPDX-2.2"
+}
+```
+
+</details>
+
+[spdx]: https://spdx.dev/wp-content/uploads/sites/41/2020/08/SPDX-specification-2-2.pdf

docs/docs/secret/configuration.md

@@ -14,8 +14,7 @@ rules:
     category: general
     title: Generic Rule
     severity: HIGH
-    path:
-      - .*\.sh
+    path: .*\.sh
     keywords:
       - secret
     regex: (?i)(?P<key>(secret))(=|:).{0,5}['"](?P<secret>[0-9a-zA-Z\-_=]{8,64})['"]

docs/docs/secret/scanning.md

@@ -89,11 +89,6 @@ Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 1, CRITICAL: 0)
 ## Configuration
 Trivy has a set of builtin rules for secret scanning, which can be extended or modified by a configuration file.
 
-If you don't need secret scanning, you can disable it via the `--security-checks` flag.
-
-```shell
-$ trivy image --security-checks vuln alpine:3.15
-```
 
 ## Recommendation
 We would recommend specifying `--skip-dirs` for faster secret scanning.
@@ -111,6 +106,13 @@ All rules are disabled except for the ones you specify, so it runs very fast.
 On the other hand, you should use `disable-rules` if you just want to disable some built-in rules.
 See the [enable-rules][enable-rules] and [disable-rules][disable-rules] sections for the detail.
 
+If you don't need secret scanning, you can disable it via the `--security-checks` flag.
+
+```shell
+$ trivy image --security-checks vuln alpine:3.15
+```
+
+
 ## Credit
 This feature is inspired by [gitleaks][gitleaks]. 
 

docs/docs/vulnerability/detection/data-source.md

@@ -45,6 +45,16 @@
 | --------------------------------|------------|
 | National Vulnerability Database | [NVD][nvd] | 
 
+# Data source selection
+Trivy **only** consumes security advisories from the sources listed in the following tables.
+
+As for packages installed from OS package managers (`dpkg`, `yum`, `apk`, etc.), Trivy uses the advisory database from the appropriate **OS vendor**.
+
+For example: for a python package installed from `yum` (Amazon linux), Trivy will only get advisories from [ALAS][amazon2]. But for a python package installed from another source (e.g. `pip`), Trivy will get advisories from the `GitLab` and `GitHub` databases.
+
+This advisory selection is essential to avoid getting false positives because OS vendors usually backport upstream fixes, and the fixed version can be different from the upstream fixed version.
+The severity is from the selected data source. If the data source does not provide severity, it falls back to NVD, and if NVD does not have severity, it will be UNKNOWN.
+
 [arch]: https://security.archlinux.org/
 [alpine]: https://secdb.alpinelinux.org/
 [amazon1]: https://alas.aws.amazon.com/

docs/docs/vulnerability/detection/language.md

@@ -2,7 +2,7 @@
 
 `Trivy` automatically detects the following files in the container and scans vulnerabilities in the application dependencies.
 
-| Language | File                     | Image[^7] | Rootfs[^8] | Filesystem[^9] | Repository[^10] |Dev dependencies |
+| Language | File                     | Image[^8] | Rootfs[^9] | Filesystem[^10] | Repository[^11] |Dev dependencies |
 |----------|--------------------------|:---------:|:----------:|:--------------:|:--------------:|-----------------|
 | Ruby     | Gemfile.lock             | -         | -          |       ✅        |       ✅        | included        |
 |          | gemspec                  | ✅        | ✅         |       -        |       -        | included        |
@@ -20,7 +20,7 @@
 | Java     | JAR/WAR/PAR/EAR[^3][^4]  | ✅        | ✅         |       -        |       -        | included        |
 |          | pom.xml[^5]              | -         | -          |       ✅        |       ✅        | excluded        |
 | Go       | Binaries built by Go[^6] | ✅        | ✅         |       -        |       -        | excluded        |
-|          | go.sum                   | -         | -          |       ✅        |       ✅        | included        |
+|          | go.mod[^7]               | -         | -          |       ✅        |       ✅        | included        |
 | Rust     | Cargo.lock               | ✅        | ✅         |       ✅        |       ✅        | included        |
 
 The path of these files does not matter.
@@ -33,7 +33,8 @@ Example: [Dockerfile](https://github.com/aquasecurity/trivy-ci-test/blob/main/Do
 [^4]: It requires Internet access
 [^5]: It requires Internet access when the POM doesn't exist in your local repository
 [^6]: UPX-compressed binaries don't work
-[^7]: ✅ means "enabled" and `-` means "disabled" in the image scanning
-[^8]: ✅ means "enabled" and `-` means "disabled" in the rootfs scanning
-[^9]: ✅ means "enabled" and `-` means "disabled" in the filesystem scanning
-[^10]: ✅ means "enabled" and `-` means "disabled" in the git repository scanning
+[^7]: If smaller than go 1.17, go.sum is also required
+[^8]: ✅ means "enabled" and `-` means "disabled" in the image scanning
+[^9]: ✅ means "enabled" and `-` means "disabled" in the rootfs scanning
+[^10]: ✅ means "enabled" and `-` means "disabled" in the filesystem scanning
+[^11]: ✅ means "enabled" and `-` means "disabled" in the git repository scanning

docs/docs/vulnerability/detection/os.md

@@ -4,8 +4,8 @@ The unfixed/unfixable vulnerabilities mean that the patch has not yet been provi
 
 | OS                               | Supported Versions                        | Target Packages               | Detection of unfixed vulnerabilities |
 | -------------------------------- |-------------------------------------------| ----------------------------- | :----------------------------------: |
-| Alpine Linux                     | 2.2 - 2.7, 3.0 - 3.15, edge               | Installed by apk              |                  NO                  |
-| Red Hat Universal Base Image[^1] | 7, 8                                      | Installed by yum/rpm          |                 YES                  |
+| Alpine Linux                     | 2.2 - 2.7, 3.0 - 3.16, edge               | Installed by apk              |                  NO                  |
+| Red Hat Universal Base Image[^1] | 7, 8, 9                                   | Installed by yum/rpm          |                 YES                  |
 | Red Hat Enterprise Linux         | 6, 7, 8                                   | Installed by yum/rpm          |                 YES                  |
 | CentOS                           | 6, 7, 8                                   | Installed by yum/rpm          |                 YES                  |
 | AlmaLinux                        | 8                                         | Installed by yum/rpm          |                  NO                  |

docs/docs/vulnerability/detection/supported.md

@@ -3,6 +3,7 @@
 ## Container Runtime
 - [Docker Engine](https://docs.docker.com/engine/)
 - [Podman](../../advanced/container/podman.md)
+- [containerd](../../advanced/container/containerd.md)
 
 ## Container Registry
 - [Docker Registry HTTP API V2](https://docs.docker.com/registry/spec/api/)

docs/docs/vulnerability/distributions.md

@@ -7,7 +7,7 @@ The following table provides an outline of the features Trivy offers.
 | Version | Container image | Virtual machine | Distroless |  Multi-arch  | Unfixed support |
 |---------|:---------------:|:---------------:|:----------:|:------------:|:---------------:|
 | 1.0     |        ✔        |        ✔        |            | amd64, arm64 |        ✔        |
-| 2.0     |        ✔        |        ✔        |            | amd64, arm64 |        ✔        |
+| 2.0     |        ✔        |        ✔        |      ✔     | amd64, arm64 |        ✔        |
 
 ### Examples
 

docs/docs/vulnerability/examples/filter.md

@@ -122,6 +122,9 @@ $ cat .trivyignore
 # Accept the risk
 CVE-2018-14618
 
+# Accept the risk until 2023-01-01
+CVE-2019-14697 exp:2023-01-01
+
 # No impact in our settings
 CVE-2019-1543
 

docs/docs/vulnerability/examples/report.md

@@ -6,6 +6,90 @@
 $ trivy image -f table golang:1.12-alpine
 ```
 
+### Show origins of vulnerable dependencies
+
+!!! warning "EXPERIMENTAL"
+    This feature might change without preserving backwards compatibility.
+
+Modern software development relies on the use of third-party libraries.
+Third-party dependencies also depend on others so a list of dependencies can be represented as a dependency graph.
+In some cases, vulnerable dependencies are not linked directly, and it requires analyses of the tree.
+To make this task simpler Trivy can show a dependency origin tree with the `--dependency-tree` flag.
+This flag is available with the `--format table` flag only.
+
+This tree is the reverse of the npm list command.
+However, if you want to resolve a vulnerability in a particular indirect dependency, the reversed tree is useful to know where that dependency comes from and identify which package you actually need to update.
+
+In table output, it looks like:
+
+```sh
+$ trivy fs --severity HIGH,CRITICAL --dependency-tree /path/to/your_node_project
+
+package-lock.json (npm)
+=======================
+Total: 2 (HIGH: 1, CRITICAL: 1)
+
+┌──────────────────┬────────────────┬──────────┬───────────────────┬───────────────┬────────────────────────────────────────────────────────────┐
+│     Library      │ Vulnerability  │ Severity │ Installed Version │ Fixed Version │                           Title                            │
+├──────────────────┼────────────────┼──────────┼───────────────────┼───────────────┼────────────────────────────────────────────────────────────┤
+│ follow-redirects │ CVE-2022-0155  │ HIGH     │ 1.14.6            │ 1.14.7        │ follow-redirects: Exposure of Private Personal Information │
+│                  │                │          │                   │               │ to an Unauthorized Actor                                   │
+│                  │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2022-0155                  │
+├──────────────────┼────────────────┼──────────┼───────────────────┼───────────────┼────────────────────────────────────────────────────────────┤
+│ glob-parent      │ CVE-2020-28469 │ CRITICAL │ 3.1.0             │ 5.1.2         │ nodejs-glob-parent: Regular expression denial of service   │
+│                  │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2020-28469                 │
+└──────────────────┴────────────────┴──────────┴───────────────────┴───────────────┴────────────────────────────────────────────────────────────┘
+
+Dependency Origin Tree
+======================
+package-lock.json
+├── follow-redirects@1.14.6, (HIGH: 1, CRITICAL: 0)
+│   └── axios@0.21.4
+└── glob-parent@3.1.0, (HIGH: 0, CRITICAL: 1)
+    └── chokidar@2.1.8
+        └── watchpack-chokidar2@2.0.1
+            └── watchpack@1.7.5
+                └── webpack@4.46.0
+                    └── cra-append-sw@2.7.0
+```
+
+Vulnerable dependencies are shown in the top level of the tree.
+Lower levels show how those vulnerabilities are introduced.
+In the example above **axios@0.21.4** included in the project directly depends on the vulnerable **follow-redirects@1.14.6**.
+Also, **glob-parent@3.1.0** with some vulnerabilities is included through chain of dependencies that is added by **cra-append-sw@2.7.0**.
+
+Then, you can try to update **axios@0.21.4** and **cra-append-sw@2.7.0** to resolve vulnerabilities in **follow-redirects@1.14.6** and **glob-parent@3.1.0**.
+
+!!! note
+    Only Node.js (package-lock.json) is supported at the moment.
+
+## JSON
+Similar structure is included in JSON output format
+```json
+          "VulnerabilityID": "CVE-2022-0235",
+          "PkgID": "node-fetch@1.7.3",
+          "PkgName": "node-fetch",
+          "PkgParents": [
+            {
+              "ID": "isomorphic-fetch@2.2.1",
+              "Parents": [
+                {
+                  "ID": "fbjs@0.8.18",
+                  "Parents": [
+                    {
+                      "ID": "styled-components@3.1.3"
+                    }
+                  ]
+                }
+              ]
+            }
+          ],
+
+```
+
+!!! caution
+As of May 2022 the feature is supported for `npm` dependency parser only
+
 ## JSON
 
 ```

docs/getting-started/installation.md

@@ -2,15 +2,15 @@
 
 ## RHEL/CentOS
 
-
 === "Repository"
     Add repository setting to `/etc/yum.repos.d`.
 
     ``` bash
+    RELEASE_VERSION=$(grep -Po '(?<=VERSION_ID=")[0-9]' /etc/os-release)
     cat << EOF | sudo tee -a /etc/yum.repos.d/trivy.repo
     [trivy]
     name=Trivy repository
-    baseurl=https://aquasecurity.github.io/trivy-repo/rpm/releases/$releasever/$basearch/
+    baseurl=https://aquasecurity.github.io/trivy-repo/rpm/releases/$RELEASE_VERSION/\$basearch/
     gpgcheck=0
     enabled=1
     EOF
@@ -44,9 +44,8 @@
     sudo dpkg -i trivy_{{ git.tag[1:] }}_Linux-64bit.deb
     ```
 
-
-
 ## Arch Linux
+
 Package trivy-bin can be installed from the Arch User Repository.
 
 === "pikaur"
@@ -71,18 +70,36 @@ brew install aquasecurity/trivy/trivy
 
 ## Nix/NixOS
 
-You can use nix on Linux or macOS and on others unofficially.
+Direct issues installing `trivy` via `nix` through the channels mentioned [here](https://nixos.wiki/wiki/Support)
 
-Note that trivy is currently only in the unstable channels.
+You can use `nix` on Linux or macOS and on other platforms unofficially.
 
-```bash
-nix-env --install trivy
+`nix-env --install -A nixpkgs.trivy`
+
+Or through your configuration as usual
+
+NixOS:
+
+```nix
+  # your other config ...
+  environment.systemPackages = with pkgs; [
+    # your other packages ...
+    trivy
+  ];
 ```
 
-Or through your configuration on NixOS or with home-manager as usual
+home-manager:
 
+```nix
+  # your other config ...
+  home.packages = with pkgs; [
+    # your other packages ...
+    trivy
+  ];
+```
 
 ## Install Script
+
 This script downloads Trivy binary based on your OS and architecture.
 
 ```bash
@@ -107,7 +124,9 @@ go install
 ```
 
 ## Docker
+
 ### Docker Hub
+
 Replace [YOUR_CACHE_DIR] with the cache directory on your machine.
 
 ```bash
@@ -166,7 +185,6 @@ The same image is hosted on [GitHub Container Registry][registry] as well.
 docker pull ghcr.io/aquasecurity/trivy:{{ git.tag[1:] }}
 ```
 
-
 ### Amazon ECR Public
 
 The same image is hosted on [Amazon ECR Public][ecr] as well.
@@ -174,7 +192,9 @@ The same image is hosted on [Amazon ECR Public][ecr] as well.
 ```bash
 docker pull public.ecr.aws/aquasecurity/trivy:{{ git.tag[1:] }}
 ```
+
 ## Helm
+
 ### Installing from the Aqua Chart Repository
 
 ```
@@ -195,6 +215,37 @@ helm install my-release .
 The command deploys Trivy on the Kubernetes cluster in the default configuration. The [Parameters][helm]
 section lists the parameters that can be configured during installation.
 
+### AWS private registry permissions
+
+You may need to grant permissions to allow trivy to pull images from private registry (AWS ECR).
+
+It depends on how you want to provide AWS Role to trivy.
+
+- [IAM Role Service account](https://github.com/aws/amazon-eks-pod-identity-webhook)
+- [Kube2iam](https://github.com/jtblin/kube2iam) or [Kiam](https://github.com/uswitch/kiam)
+
+#### IAM Role Service account
+
+Add the AWS role in trivy's service account annotations:
+
+```yaml
+trivy:
+
+  serviceAccount:
+    annotations: {}
+      # eks.amazonaws.com/role-arn: arn:aws:iam::ACCOUNT_ID:role/IAM_ROLE_NAME
+```
+
+#### Kube2iam or Kiam
+
+Add the AWS role to pod's annotations:
+
+```yaml
+podAnnotations: {}
+  ## kube2iam/kiam annotation
+  # iam.amazonaws.com/role: arn:aws:iam::ACCOUNT_ID:role/IAM_ROLE_NAME
+```
+
 > **Tip**: List all releases using `helm list`.
 
 [ecr]: https://gallery.ecr.aws/aquasecurity/trivy

docs/getting-started/overview.md

@@ -30,7 +30,7 @@ See [Integrations][integrations] for details.
 [os]: ../docs/vulnerability/detection/os.md
 [lang]: ../docs/vulnerability/detection/language.md
 
-[misconf]: ../docs/misconfiguration/index.md
+[misconf]: ../docs/misconfiguration/scanning.md
 
 [secret]: ../docs/secret/scanning.md
 

docs/getting-started/quickstart.md

@@ -12,35 +12,35 @@ For example:
 
 ``` shell
 $ trivy image myimage:1.0.0
-2022-04-21T18:56:44.099+0300    INFO    Detected OS: alpine
-2022-04-21T18:56:44.099+0300    INFO    Detecting Alpine vulnerabilities...
-2022-04-21T18:56:44.101+0300    INFO    Number of language-specific files: 0
+2022-05-16T13:25:17.826+0100	INFO	Detected OS: alpine
+2022-05-16T13:25:17.826+0100	INFO	Detecting Alpine vulnerabilities...
+2022-05-16T13:25:17.826+0100	INFO	Number of language-specific files: 0
 
-myimage:1.0.0 (alpine 3.15.0)
-=============================
-Total: 6 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 0, CRITICAL: 2)
+myimage:1.0.0 (alpine 3.15.3)
 
-+--------------+------------------+----------+-------------------+---------------+---------------------------------------+
-|   LIBRARY    | VULNERABILITY ID | SEVERITY | INSTALLED VERSION | FIXED VERSION |                 TITLE                 |
-+--------------+------------------+----------+-------------------+---------------+---------------------------------------+
-| busybox      | CVE-2022-28391   | CRITICAL | 1.34.1-r3         | 1.34.1-r5     | CVE-2022-28391 affecting              |
-|              |                  |          |                   |               | package busybox 1.35.0                |
-|              |                  |          |                   |               | -->avd.aquasec.com/nvd/cve-2022-28391 |
-+--------------+------------------|          |-------------------+---------------+---------------------------------------+
-| ssl_client   | CVE-2022-28391   |          | 1.34.1-r3         | 1.34.1-r5     | CVE-2022-28391 affecting              |
-|              |                  |          |                   |               | package busybox 1.35.0                |
-|              |                  |          |                   |               | -->avd.aquasec.com/nvd/cve-2022-28391 |
-+--------------+------------------+----------+-------------------+---------------+---------------------------------------+
+Total: 2 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 0, CRITICAL: 2)
+
+┌────────────┬────────────────┬──────────┬───────────────────┬───────────────┬─────────────────────────────────────────────────────────┐
+│  Library   │ Vulnerability  │ Severity │ Installed Version │ Fixed Version │                          Title                          │
+├────────────┼────────────────┼──────────┼───────────────────┼───────────────┼─────────────────────────────────────────────────────────┤
+│ busybox    │ CVE-2022-28391 │ CRITICAL │ 1.34.1-r4         │ 1.34.1-r5     │ busybox: remote attackers may execute arbitrary code if │
+│            │                │          │                   │               │ netstat is used                                         │
+│            │                │          │                   │               │ https://avd.aquasec.com/nvd/cve-2022-28391              │
+├────────────┤                │          │                   │               │                                                         │
+│ ssl_client │                │          │                   │               │                                                         │
+│            │                │          │                   │               │                                                         │
+│            │                │          │                   │               │                                                         │
+└────────────┴────────────────┴──────────┴───────────────────┴───────────────┴─────────────────────────────────────────────────────────┘
 
 app/deploy.sh (secrets)
-=======================
+
 Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 0, CRITICAL: 1)
 
-+----------+-------------------+----------+---------+--------------------------------+
-| CATEGORY |    DESCRIPTION    | SEVERITY | LINE NO |             MATCH              |
-+----------+-------------------+----------+---------+--------------------------------+
-|   AWS    | AWS Access Key ID | CRITICAL |   10    | export AWS_ACCESS_KEY_ID=***** |
-+----------+-------------------+----------+---------+--------------------------------+
+┌──────────┬───────────────────┬──────────┬─────────┬────────────────────────────────┐
+│ Category │    Description    │ Severity │ Line No │             Match              │
+├──────────┼───────────────────┼──────────┼─────────┼────────────────────────────────┤
+│   AWS    │ AWS Access Key ID │ CRITICAL │    3    │ export AWS_ACCESS_KEY_ID=***** │
+└──────────┴───────────────────┴──────────┴─────────┴────────────────────────────────┘
 ```
 
 For more details, see [vulnerability][vulnerability] and [secret][secret] pages.
@@ -59,26 +59,27 @@ For example:
 $ ls build/
 Dockerfile
 $ trivy config ./build
-2021-07-09T10:06:29.188+0300    INFO    Need to update the built-in policies
-2021-07-09T10:06:29.188+0300    INFO    Downloading the built-in policies...
-2021-07-09T10:06:30.520+0300    INFO    Detected config files: 1
+2022-05-16T13:29:29.952+0100	INFO	Detected config files: 1
 
 Dockerfile (dockerfile)
 =======================
 Tests: 23 (SUCCESSES: 22, FAILURES: 1, EXCEPTIONS: 0)
-Failures: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 0, HIGH: 1, CRITICAL: 0)
+Failures: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
 
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-|           TYPE            | MISCONF ID |        CHECK         | SEVERITY |                 MESSAGE                  |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
-| Dockerfile Security Check |   DS002    | Image user is 'root' |   HIGH   | Last USER command in                     |
-|                           |            |                      |          | Dockerfile should not be 'root'          |
-|                           |            |                      |          | -->avd.aquasec.com/appshield/ds002       |
-+---------------------------+------------+----------------------+----------+------------------------------------------+
+MEDIUM: Specify a tag in the 'FROM' statement for image 'alpine'
+══════════════════════════════════════════════════════════════════════════════════════════════════════════════════════
+When using a 'FROM' statement you should use a specific tag to avoid uncontrolled behavior when the image is updated.
+
+See https://avd.aquasec.com/misconfig/ds001
+──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+ Dockerfile:1
+──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+   1 [ FROM alpine:latest
+──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────
 ```
 
 For more details, see [here][misconf].
 
 [vulnerability]: ../docs/vulnerability/scanning/index.md
-[misconf]: ../docs/misconfiguration/index.md
+[misconf]: ../docs/misconfiguration/scanning.md
 [secret]: ../docs/secret/scanning.md

docs/imgs/excalidraw/misconf.excalidraw

@@ -5,8 +5,8 @@
   "elements": [
     {
       "type": "rectangle",
-      "version": 573,
-      "versionNonce": 2034670720,
+      "version": 791,
+      "versionNonce": 1617738570,
       "isDeleted": false,
       "id": "BkXuq_6BxgqZGZWc8oCtu",
       "fillStyle": "hachure",
@@ -24,12 +24,15 @@
       "seed": 1632394695,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": []
+      "boundElements": [],
+      "updated": 1652181399352,
+      "link": null,
+      "locked": false
     },
     {
       "type": "text",
-      "version": 572,
-      "versionNonce": 425683840,
+      "version": 716,
+      "versionNonce": 910620246,
       "isDeleted": false,
       "id": "YQURTHNPSe05RPSlYRcok",
       "fillStyle": "hachure",
@@ -47,18 +50,23 @@
       "seed": 891391049,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": [],
+      "boundElements": [],
+      "updated": 1652181399352,
+      "link": null,
+      "locked": false,
       "fontSize": 36,
       "fontFamily": 1,
       "text": "Trivy",
       "baseline": 32,
       "textAlign": "left",
-      "verticalAlign": "top"
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "Trivy"
     },
     {
       "type": "text",
-      "version": 822,
-      "versionNonce": 1061096576,
+      "version": 1310,
+      "versionNonce": 1854587402,
       "isDeleted": false,
       "id": "6dpF2EyZBtYgO6MrvGj0-",
       "fillStyle": "hachure",
@@ -67,27 +75,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 771.2554931640625,
-      "y": 469.7777099609375,
+      "x": 731.2024841308594,
+      "y": 467.7408447265625,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
-      "width": 507,
-      "height": 35,
+      "width": 612,
+      "height": 36,
       "seed": 687997545,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": [],
+      "boundElements": [],
+      "updated": 1652181399352,
+      "link": null,
+      "locked": false,
       "fontSize": 28,
       "fontFamily": 1,
-      "text": "Vulnerability/Misconfiguration Scanner",
+      "text": "Vulnerability/Misconfiguration/Secret Scanner",
       "baseline": 25,
       "textAlign": "left",
-      "verticalAlign": "top"
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "Vulnerability/Misconfiguration/Secret Scanner"
     },
     {
       "type": "rectangle",
-      "version": 763,
-      "versionNonce": 560331648,
+      "version": 1129,
+      "versionNonce": 1307232406,
       "isDeleted": false,
       "id": "cpnTMy7L2AUg9IDJppF4H",
       "fillStyle": "hachure",
@@ -96,21 +109,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 602.28369140625,
-      "y": 258.8445587158203,
+      "x": 647.7814331054688,
+      "y": 188.2161407470703,
       "strokeColor": "#000000",
       "backgroundColor": "#fab005",
-      "width": 397.493408203125,
-      "height": 103.28388977050778,
+      "width": 248.74017333984375,
+      "height": 77.74984135828628,
       "seed": 77164935,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": []
+      "boundElements": [],
+      "updated": 1652181524751,
+      "link": null,
+      "locked": false
     },
     {
       "type": "text",
-      "version": 1072,
-      "versionNonce": 212434048,
+      "version": 1279,
+      "versionNonce": 1197686422,
       "isDeleted": false,
       "id": "9-blmNVtLesthMSY_f60t",
       "fillStyle": "hachure",
@@ -119,27 +135,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 630.9301147460938,
-      "y": 292.4002990722656,
+      "x": 664.1268412090633,
+      "y": 211.45297413880115,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
-      "width": 331,
-      "height": 35,
+      "width": 214.77717842516898,
+      "height": 35.96269034095853,
       "seed": 860091815,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": [],
-      "fontSize": 28,
+      "boundElements": [],
+      "updated": 1652181521001,
+      "link": null,
+      "locked": false,
+      "fontSize": 27.970981376301072,
       "fontFamily": 1,
-      "text": "Infrastructure as Code",
-      "baseline": 25,
+      "text": "Container image",
+      "baseline": 24.96269034095853,
       "textAlign": "center",
-      "verticalAlign": "top"
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "Container image"
     },
     {
       "type": "rectangle",
-      "version": 1194,
-      "versionNonce": 131337088,
+      "version": 1482,
+      "versionNonce": 773738186,
       "isDeleted": false,
       "id": "gugZxhi7ThlcjWY_MFO7q",
       "fillStyle": "hachure",
@@ -148,21 +169,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1021.5928955078125,
-      "y": 261.56090545654297,
+      "x": 907.46728515625,
+      "y": 189.15813446044922,
       "strokeColor": "#000000",
       "backgroundColor": "#be4bdb",
-      "width": 441.0702514648438,
-      "height": 99.05134582519533,
+      "width": 255.61367797851565,
+      "height": 77.69438171386717,
       "seed": 1232790121,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": []
+      "boundElements": [],
+      "updated": 1652181510952,
+      "link": null,
+      "locked": false
     },
     {
       "type": "text",
-      "version": 1270,
-      "versionNonce": 591785088,
+      "version": 1444,
+      "versionNonce": 80370390,
       "isDeleted": false,
       "id": "K48gtpesBxIGJxLTnI2CB",
       "fillStyle": "hachure",
@@ -171,8 +195,8 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1173.3179931640625,
-      "y": 294.12510681152344,
+      "x": 963.9347534179688,
+      "y": 212.18040466308594,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
       "width": 137,
@@ -180,70 +204,23 @@
       "seed": 449264361,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": [],
+      "boundElements": [],
+      "updated": 1652181510952,
+      "link": null,
+      "locked": false,
       "fontSize": 28,
       "fontFamily": 1,
       "text": "Filesystem",
       "baseline": 25,
       "textAlign": "center",
-      "verticalAlign": "top"
+      "verticalAlign": "top",
+      "containerId": null,
+      "originalText": "Filesystem"
     },
     {
       "type": "rectangle",
-      "version": 1319,
-      "versionNonce": 1264839808,
-      "isDeleted": false,
-      "id": "BYJwfkhd1BilbLQGc973f",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 1233.3157348632812,
-      "y": 168.29967880249023,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 229.03393554687523,
-      "height": 77.80606079101562,
-      "seed": 1923498546,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElementIds": []
-    },
-    {
-      "type": "text",
-      "version": 659,
-      "versionNonce": 2122259328,
-      "isDeleted": false,
-      "id": "eedUyCpr8i1aY_3PHsHAB",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 1241.1352844238281,
-      "y": 191.2939567565918,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 216,
-      "height": 35,
-      "seed": 595309038,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElementIds": [],
-      "fontSize": 28,
-      "fontFamily": 1,
-      "text": "Misconfiguration",
-      "baseline": 25,
-      "textAlign": "center",
-      "verticalAlign": "middle"
-    },
-    {
-      "type": "rectangle",
-      "version": 1397,
-      "versionNonce": 20077696,
+      "version": 1545,
+      "versionNonce": 819004246,
       "isDeleted": false,
       "id": "SPkrBrH6DGvkgQXtZQjIJ",
       "fillStyle": "hachure",
@@ -252,21 +229,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1023.8157043457031,
-      "y": 168.7816276550293,
+      "x": 1174.8193054199219,
+      "y": 190.58329391479492,
       "strokeColor": "#000000",
-      "backgroundColor": "#fa5252",
-      "width": 200.7496337890626,
+      "backgroundColor": "#12b886",
+      "width": 250.91937255859386,
       "height": 77.80606079101562,
       "seed": 1896460914,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": []
+      "boundElements": [],
+      "updated": 1652181500681,
+      "link": null,
+      "locked": false
     },
     {
       "type": "text",
-      "version": 840,
-      "versionNonce": 655338368,
+      "version": 1036,
+      "versionNonce": 1127482634,
       "isDeleted": false,
       "id": "n06MNIqirDmVZBkDg_UPV",
       "fillStyle": "hachure",
@@ -275,27 +255,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1040.526611328125,
-      "y": 194.3111228942871,
+      "x": 1200.8165283203125,
+      "y": 212.65081405639648,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 160,
-      "height": 35,
+      "width": 201,
+      "height": 36,
       "seed": 1131832750,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": [],
+      "boundElements": [],
+      "updated": 1652181500682,
+      "link": null,
+      "locked": false,
       "fontSize": 28,
       "fontFamily": 1,
-      "text": "Vulnerability",
+      "text": "Git Repository",
       "baseline": 25,
       "textAlign": "center",
-      "verticalAlign": "middle"
+      "verticalAlign": "middle",
+      "containerId": null,
+      "originalText": "Git Repository"
     },
     {
       "type": "rectangle",
-      "version": 1441,
-      "versionNonce": 1393118080,
+      "version": 1826,
+      "versionNonce": 405213130,
       "isDeleted": false,
       "id": "8SHSNGf7PNddFLi2ZA3Vi",
       "fillStyle": "hachure",
@@ -304,21 +289,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 673.6463928222656,
-      "y": 167.8159294128418,
+      "x": 642.0580139160156,
+      "y": 280.92316818237305,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 278.48516845703136,
+      "width": 788.2601318359375,
       "height": 77.80606079101562,
       "seed": 1986948530,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": []
+      "boundElements": [],
+      "updated": 1652181559488,
+      "link": null,
+      "locked": false
     },
     {
       "type": "text",
-      "version": 851,
-      "versionNonce": 2114620544,
+      "version": 1093,
+      "versionNonce": 573822154,
       "isDeleted": false,
       "id": "3Z5w3RXdgpvP43dlHqq26",
       "fillStyle": "hachure",
@@ -327,26 +315,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 701.5146789550781,
-      "y": 189.60757064819336,
+      "x": 851.4863586425781,
+      "y": 300.9854393005371,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 216,
-      "height": 35,
+      "width": 339,
+      "height": 36,
       "seed": 1077804654,
       "groupIds": [],
       "strokeSharpness": "sharp",
-      "boundElementIds": [],
+      "boundElements": [],
+      "updated": 1652181415054,
+      "link": null,
+      "locked": false,
       "fontSize": 28,
       "fontFamily": 1,
-      "text": "Misconfiguration",
+      "text": "Misconfiguration scanning",
       "baseline": 25,
       "textAlign": "center",
-      "verticalAlign": "middle"
+      "verticalAlign": "middle",
+      "containerId": null,
+      "originalText": "Misconfiguration scanning"
     }
   ],
   "appState": {
     "gridSize": null,
     "viewBackgroundColor": "#ffffff"
-  }
+  },
+  "files": {}
 }

docs/imgs/excalidraw/overview.excalidraw

@@ -5,8 +5,8 @@
   "elements": [
     {
       "type": "rectangle",
-      "version": 787,
-      "versionNonce": 1318065410,
+      "version": 788,
+      "versionNonce": 555477386,
       "isDeleted": false,
       "id": "BkXuq_6BxgqZGZWc8oCtu",
       "fillStyle": "hachure",
@@ -25,14 +25,14 @@
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567161407,
+      "updated": 1652177570112,
       "link": null,
       "locked": false
     },
     {
       "type": "text",
-      "version": 653,
-      "versionNonce": 1863936606,
+      "version": 713,
+      "versionNonce": 44400470,
       "isDeleted": false,
       "id": "YQURTHNPSe05RPSlYRcok",
       "fillStyle": "hachure",
@@ -41,8 +41,8 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1137.7821926540798,
-      "y": 764.0207858615452,
+      "x": 1118.2101508246528,
+      "y": 763.5906914605034,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
       "width": 88,
@@ -51,7 +51,7 @@
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567336690,
+      "updated": 1652177702292,
       "link": null,
       "locked": false,
       "fontSize": 36,
@@ -65,8 +65,8 @@
     },
     {
       "type": "text",
-      "version": 1139,
-      "versionNonce": 1994750018,
+      "version": 1191,
+      "versionNonce": 1166344150,
       "isDeleted": false,
       "id": "6dpF2EyZBtYgO6MrvGj0-",
       "fillStyle": "hachure",
@@ -75,8 +75,8 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 900.5941772460938,
-      "y": 819.7337171766493,
+      "x": 875.3033447265625,
+      "y": 820.7327100965712,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
       "width": 612,
@@ -85,7 +85,7 @@
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567334181,
+      "updated": 1652177705177,
       "link": null,
       "locked": false,
       "fontSize": 28,
@@ -99,8 +99,8 @@
     },
     {
       "type": "rectangle",
-      "version": 805,
-      "versionNonce": 1609410334,
+      "version": 858,
+      "versionNonce": 1118008458,
       "isDeleted": false,
       "id": "cpnTMy7L2AUg9IDJppF4H",
       "fillStyle": "hachure",
@@ -110,23 +110,23 @@
       "opacity": 100,
       "angle": 0,
       "x": 600.9835205078125,
-      "y": 627.2060089111328,
+      "y": 635.5783640543619,
       "strokeColor": "#000000",
       "backgroundColor": "#fab005",
-      "width": 298.6342163085937,
-      "height": 96.74092102050778,
+      "width": 335.3091227213542,
+      "height": 82.36856587727866,
       "seed": 77164935,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177872265,
       "link": null,
       "locked": false
     },
     {
       "type": "text",
-      "version": 1011,
-      "versionNonce": 477782466,
+      "version": 1077,
+      "versionNonce": 1122201878,
       "isDeleted": false,
       "id": "9-blmNVtLesthMSY_f60t",
       "fillStyle": "hachure",
@@ -135,32 +135,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 628.7854614257812,
-      "y": 658.9062805175781,
+      "x": 649.8531494140625,
+      "y": 660.223378499349,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
-      "width": 238,
-      "height": 35,
+      "width": 224,
+      "height": 36,
       "seed": 860091815,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177872265,
       "link": null,
       "locked": false,
       "fontSize": 28,
       "fontFamily": 1,
-      "text": "Container Images",
+      "text": "Container Image",
       "baseline": 25,
       "textAlign": "center",
       "verticalAlign": "top",
       "containerId": null,
-      "originalText": "Container Images"
+      "originalText": "Container Image"
     },
     {
       "type": "rectangle",
-      "version": 1051,
-      "versionNonce": 1210520414,
+      "version": 1118,
+      "versionNonce": 1679315786,
       "isDeleted": false,
       "id": "gugZxhi7ThlcjWY_MFO7q",
       "fillStyle": "hachure",
@@ -169,24 +169,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 911.257568359375,
-      "y": 625.7697677612305,
+      "x": 954.3485412597656,
+      "y": 635.849225362142,
       "strokeColor": "#000000",
       "backgroundColor": "#be4bdb",
-      "width": 452.44976806640636,
-      "height": 99.05134582519533,
+      "width": 409.35879516601574,
+      "height": 82.97188822428383,
       "seed": 1232790121,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177872265,
       "link": null,
       "locked": false
     },
     {
       "type": "text",
-      "version": 1202,
-      "versionNonce": 842114,
+      "version": 1300,
+      "versionNonce": 1187044950,
       "isDeleted": false,
       "id": "K48gtpesBxIGJxLTnI2CB",
       "fillStyle": "hachure",
@@ -195,17 +195,17 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1065.672119140625,
-      "y": 656.4816131591797,
+      "x": 1084.4311319986978,
+      "y": 660.9795074462891,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
-      "width": 137,
-      "height": 35,
+      "width": 139,
+      "height": 36,
       "seed": 449264361,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177872265,
       "link": null,
       "locked": false,
       "fontSize": 28,
@@ -219,8 +219,8 @@
     },
     {
       "type": "rectangle",
-      "version": 1163,
-      "versionNonce": 1149481794,
+      "version": 1204,
+      "versionNonce": 688085514,
       "isDeleted": false,
       "id": "La6f87LDZ0uEIZB947bXo",
       "fillStyle": "hachure",
@@ -230,23 +230,23 @@
       "opacity": 100,
       "angle": 0,
       "x": 1375.0136108398438,
-      "y": 626.2495651245117,
+      "y": 636.5654322306316,
       "strokeColor": "#000000",
       "backgroundColor": "#12b886",
       "width": 452.76554361979186,
-      "height": 96.3990020751953,
+      "height": 80.08313496907543,
       "seed": 2005637801,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567157857,
+      "updated": 1652177872265,
       "link": null,
       "locked": false
     },
     {
       "type": "text",
-      "version": 1371,
-      "versionNonce": 1552918366,
+      "version": 1432,
+      "versionNonce": 1593746326,
       "isDeleted": false,
       "id": "aOgRPVQ81jhOfkvzjWTMF",
       "fillStyle": "hachure",
@@ -255,162 +255,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1490.9330512152778,
-      "y": 654.3717736138237,
+      "x": 1498.8465237087673,
+      "y": 658.0244835747612,
       "strokeColor": "#000000",
       "backgroundColor": "transparent",
-      "width": 224,
+      "width": 201,
       "height": 36,
       "seed": 1284472935,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567166643,
+      "updated": 1652177872265,
       "link": null,
       "locked": false,
       "fontSize": 28,
       "fontFamily": 1,
-      "text": "Git Repositories",
+      "text": "Git Repository",
       "baseline": 25,
       "textAlign": "center",
       "verticalAlign": "top",
       "containerId": null,
-      "originalText": "Git Repositories"
+      "originalText": "Git Repository"
     },
     {
       "type": "rectangle",
-      "version": 2340,
-      "versionNonce": 1952732126,
-      "isDeleted": false,
-      "id": "p8fn5gPx8DfP8QE1lN98-",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 1064.5642678676506,
-      "y": 537.71609717149,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
-      "seed": 684019996,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false
-    },
-    {
-      "type": "rectangle",
-      "version": 2497,
-      "versionNonce": 832692482,
-      "isDeleted": false,
-      "id": "kFTL0HnUdDs_ngg2xVFbn",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 600.7947366176511,
-      "y": 538.67312842149,
-      "strokeColor": "#000000",
-      "backgroundColor": "#fa5252",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
-      "seed": 541443108,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false
-    },
-    {
-      "type": "rectangle",
-      "version": 2345,
-      "versionNonce": 1129796482,
-      "isDeleted": false,
-      "id": "KIztJcYHiVtM-GMlZAXAE",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 753.0955178676511,
-      "y": 538.61062842149,
-      "strokeColor": "#000000",
-      "backgroundColor": "#4c6ef5",
-      "width": 145,
-      "height": 77.80606079101562,
-      "seed": 424425892,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567234562,
-      "link": null,
-      "locked": false
-    },
-    {
-      "type": "rectangle",
-      "version": 2329,
-      "versionNonce": 1518497986,
-      "isDeleted": false,
-      "id": "IWq_LcOearBV5cvqbJ_-o",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 911.3064553676511,
-      "y": 537.97781592149,
-      "strokeColor": "#000000",
-      "backgroundColor": "#fa5252",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
-      "seed": 468230812,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false
-    },
-    {
-      "type": "rectangle",
-      "version": 2318,
-      "versionNonce": 1504408670,
-      "isDeleted": false,
-      "id": "TXeK066NA0hvyPSeZl1a5",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 1218.075986617651,
-      "y": 536.86062842149,
-      "strokeColor": "#000000",
-      "backgroundColor": "#4c6ef5",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
-      "seed": 1408574372,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false
-    },
-    {
-      "type": "rectangle",
-      "version": 2364,
-      "versionNonce": 3868802,
+      "version": 2792,
+      "versionNonce": 183831882,
       "isDeleted": false,
       "id": "10WjipxoLx2zzSI91pXbR",
       "fillStyle": "hachure",
@@ -419,24 +289,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1375.544736617651,
-      "y": 537.04812842149,
+      "x": 599.7894943723566,
+      "y": 905.6027750791251,
       "strokeColor": "#000000",
       "backgroundColor": "#fa5252",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
+      "width": 344.482180700969,
+      "height": 83.67398764683533,
       "seed": 1813731484,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177825759,
       "link": null,
       "locked": false
     },
     {
       "type": "rectangle",
-      "version": 2355,
-      "versionNonce": 2067347614,
+      "version": 2771,
+      "versionNonce": 617525398,
       "isDeleted": false,
       "id": "M7Cngti6H0_kawKRN8yJ6",
       "fillStyle": "hachure",
@@ -445,58 +315,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1528.868955367651,
-      "y": 535.89187842149,
+      "x": 963.2554264391833,
+      "y": 904.2447769132434,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
+      "width": 402.42137951281796,
+      "height": 86.03696372105414,
       "seed": 1260603804,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177777585,
       "link": null,
       "locked": false
     },
     {
       "type": "text",
-      "version": 597,
-      "versionNonce": 1519036482,
-      "isDeleted": false,
-      "id": "GHDrLyBOErQtv_WT5Lx3p",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 614.2293679653073,
-      "y": 565.5605338169978,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 114,
-      "height": 25,
-      "seed": 13297180,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false,
-      "fontSize": 20,
-      "fontFamily": 1,
-      "text": "Vulnerability",
-      "baseline": 18,
-      "textAlign": "center",
-      "verticalAlign": "middle",
-      "containerId": null,
-      "originalText": "Vulnerability"
-    },
-    {
-      "type": "text",
-      "version": 655,
-      "versionNonce": 1728345310,
+      "version": 1057,
+      "versionNonce": 405881110,
       "isDeleted": false,
       "id": "Iq57wFRtO1a8AU0rT6lRD",
       "fillStyle": "hachure",
@@ -505,23 +341,23 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1533.6317117153076,
-      "y": 565.2714713169978,
+      "x": 1046.152429428344,
+      "y": 930.8676815998951,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 136.25488281249991,
-      "height": 21.80078124999998,
+      "width": 218,
+      "height": 36,
       "seed": 1329695396,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177655817,
       "link": null,
       "locked": false,
-      "fontSize": 17.440624999999976,
+      "fontSize": 28,
       "fontFamily": 1,
       "text": "Misconfiguration",
-      "baseline": 14.800781249999979,
+      "baseline": 25,
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": null,
@@ -529,42 +365,8 @@
     },
     {
       "type": "text",
-      "version": 666,
-      "versionNonce": 1364217858,
-      "isDeleted": false,
-      "id": "gjnZl9nxrqzliwPk8sbK-",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 1067.4339578090576,
-      "y": 565.8827994419978,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 136.25488281249991,
-      "height": 21.80078124999998,
-      "seed": 290336932,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false,
-      "fontSize": 17.440624999999976,
-      "fontFamily": 1,
-      "text": "Misconfiguration",
-      "baseline": 14.800781249999979,
-      "textAlign": "center",
-      "verticalAlign": "middle",
-      "containerId": null,
-      "originalText": "Misconfiguration"
-    },
-    {
-      "type": "text",
-      "version": 613,
-      "versionNonce": 1721641246,
+      "version": 883,
+      "versionNonce": 969949898,
       "isDeleted": false,
       "id": "_cm6xpfcL9Yv2XBK5MBZF",
       "fillStyle": "hachure",
@@ -573,134 +375,32 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1390.1199929653073,
-      "y": 563.8456900669978,
+      "x": 681.3134368986982,
+      "y": 931.5212932384402,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 114,
-      "height": 25,
+      "width": 161,
+      "height": 36,
       "seed": 807441828,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177624726,
       "link": null,
       "locked": false,
-      "fontSize": 20,
+      "fontSize": 28,
       "fontFamily": 1,
       "text": "Vulnerability",
-      "baseline": 18,
+      "baseline": 25,
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": null,
       "originalText": "Vulnerability"
     },
-    {
-      "type": "text",
-      "version": 635,
-      "versionNonce": 2022375362,
-      "isDeleted": false,
-      "id": "An4-igVUkLzCwSdvDmtZl",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 925.6707742153073,
-      "y": 560.4550650669978,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 114,
-      "height": 25,
-      "seed": 1262859164,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567155021,
-      "link": null,
-      "locked": false,
-      "fontSize": 20,
-      "fontFamily": 1,
-      "text": "Vulnerability",
-      "baseline": 18,
-      "textAlign": "center",
-      "verticalAlign": "middle",
-      "containerId": null,
-      "originalText": "Vulnerability"
-    },
-    {
-      "type": "text",
-      "version": 681,
-      "versionNonce": 1813371650,
-      "isDeleted": false,
-      "id": "p3-AVxdx5KP6eNViMVTLq",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 792.0184304653073,
-      "y": 564.4160025669978,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 65,
-      "height": 25,
-      "seed": 729823772,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567236437,
-      "link": null,
-      "locked": false,
-      "fontSize": 20,
-      "fontFamily": 1,
-      "text": "Secret",
-      "baseline": 18,
-      "textAlign": "center",
-      "verticalAlign": "middle",
-      "containerId": null,
-      "originalText": "Secret"
-    },
-    {
-      "type": "text",
-      "version": 692,
-      "versionNonce": 621238878,
-      "isDeleted": false,
-      "id": "7fe9NOM7QTEEW7nyXAMjh",
-      "fillStyle": "hachure",
-      "strokeWidth": 1,
-      "strokeStyle": "solid",
-      "roughness": 1,
-      "opacity": 100,
-      "angle": 0,
-      "x": 1259.0613992153073,
-      "y": 562.4238150669978,
-      "strokeColor": "#000000",
-      "backgroundColor": "#82c91e",
-      "width": 65,
-      "height": 25,
-      "seed": 968541220,
-      "groupIds": [],
-      "strokeSharpness": "sharp",
-      "boundElements": [],
-      "updated": 1650567238433,
-      "link": null,
-      "locked": false,
-      "fontSize": 20,
-      "fontFamily": 1,
-      "text": "Secret",
-      "baseline": 18,
-      "textAlign": "center",
-      "verticalAlign": "middle",
-      "containerId": null,
-      "originalText": "Secret"
-    },
     {
       "type": "rectangle",
-      "version": 2417,
-      "versionNonce": 1222703518,
+      "version": 2874,
+      "versionNonce": 1934391254,
       "isDeleted": false,
       "id": "Fq7meULupm1A9leboPlko",
       "fillStyle": "hachure",
@@ -709,24 +409,24 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1684.2588079543348,
-      "y": 536.1830067815082,
+      "x": 1389.3043677318824,
+      "y": 903.8533384764222,
       "strokeColor": "#000000",
       "backgroundColor": "#4c6ef5",
-      "width": 144.5880126953128,
-      "height": 77.80606079101562,
+      "width": 437.15079032010976,
+      "height": 84.42746665074158,
       "seed": 230693534,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567155021,
+      "updated": 1652177785481,
       "link": null,
       "locked": false
     },
     {
       "type": "text",
-      "version": 760,
-      "versionNonce": 503898690,
+      "version": 1121,
+      "versionNonce": 110517002,
       "isDeleted": false,
       "id": "OUGk8nZzvgcKUHhKUcQov",
       "fillStyle": "hachure",
@@ -735,23 +435,23 @@
       "roughness": 1,
       "opacity": 100,
       "angle": 0,
-      "x": 1723.2672240242127,
-      "y": 561.8650424396028,
+      "x": 1556.0451356485157,
+      "y": 930.8040952304675,
       "strokeColor": "#000000",
       "backgroundColor": "#82c91e",
-      "width": 65,
-      "height": 25,
+      "width": 91,
+      "height": 36,
       "seed": 2044527454,
       "groupIds": [],
       "strokeSharpness": "sharp",
       "boundElements": [],
-      "updated": 1650567240607,
+      "updated": 1652177636085,
       "link": null,
       "locked": false,
-      "fontSize": 20,
+      "fontSize": 28,
       "fontFamily": 1,
       "text": "Secret",
-      "baseline": 18,
+      "baseline": 25,
       "textAlign": "center",
       "verticalAlign": "middle",
       "containerId": null,

docs/index.md

@@ -8,7 +8,7 @@ hide:
 
 `Trivy` (`tri` pronounced like **tri**gger, `vy` pronounced like en**vy**) is a simple and comprehensive [vulnerability][vulnerability]/[misconfiguration][misconf]/[secret][secret] scanner for containers and other artifacts.
 `Trivy` detects vulnerabilities of [OS packages][os] (Alpine, RHEL, CentOS, etc.) and [language-specific packages][lang] (Bundler, Composer, npm, yarn, etc.).
-In addition, `Trivy` scans [Infrastructure as Code (IaC) files][iac] such as Terraform and Kubernetes, to detect potential configuration issues that expose your deployments to the risk of attack.
+In addition, `Trivy` scans [Infrastructure as Code (IaC) files][misconf] such as Terraform and Kubernetes, to detect potential configuration issues that expose your deployments to the risk of attack.
 `Trivy` also scans [hardcoded secrets][secret] like passwords, API keys and tokens.
 `Trivy` is easy to use. Just install the binary and you're ready to scan.
 All you need to do for scanning is to specify a target such as an image name of the container.
@@ -44,11 +44,10 @@ Learn about our open source work and portfolio [here][oss].
 Contact us about any matter by opening a GitHub Discussion [here][discussions]
 
 [vulnerability]: docs/vulnerability/scanning/index.md
-[misconf]: docs/misconfiguration/index.md
+[misconf]: docs/misconfiguration/scanning.md
 [secret]: docs/secret/scanning.md
 [os]: docs/vulnerability/detection/os.md
 [lang]: docs/vulnerability/detection/language.md
-[iac]: docs/misconfiguration/iac.md
 
 [aquasec]: https://aquasec.com
 [oss]: https://www.aquasec.com/products/open-source-projects/

examples/misconf/namespace-exception/README.md

@@ -1,5 +1,5 @@
 # Namespace-based exceptions
-`policy/k8s_exception.rego` exempts all policies with `appshield.kubernetes` prefix.
+`policy/k8s_exception.rego` exempts all policies with `builtin.kubernetes` prefix.
 It means all built-in policies for Kubernetes are disabled.
 
 ``` bash

examples/misconf/namespace-exception/policy/k8s_exception.rego

@@ -4,5 +4,5 @@ import data.namespaces
 
 exception[ns] {
 	ns := data.namespaces[_]
-	startswith(ns, "appshield.kubernetes")
+	startswith(ns, "builtin.kubernetes")
 }

examples/misconf/rule-exception/policy/ksv006_exception.rego

@@ -1,4 +1,4 @@
-package appshield.kubernetes.KSV006
+package builtin.kubernetes.KSV006
 
 exception[rules] {
 	input.metadata.labels.mount == "docker.sock"