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

Transfer repositoriy

Browse Source
This commit is contained in:
knqyf263
2019-08-18 22:22:54 -10:00
parent 0611bf915b
commit a843682f7c
47 changed files with 230 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@@ -21,7 +21,7 @@ jobs:
command: goreleaser --rm-dist command: goreleaser --rm-dist
- run: - run:
name: Clone trivy repository name: Clone trivy repository
command: git clone git@github.com:knqyf263/trivy-repo.git command: git clone git@github.com:aquasecurity/trivy-repo.git
- run: - run:
name: Setup git settings name: Setup git settings
command: | command: |

74
README.md
View File

@@ -1,8 +1,8 @@
<img src="imgs/logo.png" width="300"> <img src="imgs/logo.png" width="300">
[![GitHub release](https://img.shields.io/github/release/knqyf263/trivy.svg)](https://github.com/knqyf263/trivy/releases/latest) [![GitHub release](https://img.shields.io/github/release/aquasecurity/trivy.svg)](https://github.com/aquasecurity/trivy/releases/latest)
[![CircleCI](https://circleci.com/gh/knqyf263/trivy.svg?style=svg)](https://circleci.com/gh/knqyf263/trivy) [![CircleCI](https://circleci.com/gh/aquasecurity/trivy.svg?style=svg)](https://circleci.com/gh/aquasecurity/trivy)
[![Go Report Card](https://goreportcard.com/badge/github.com/knqyf263/trivy)](https://goreportcard.com/report/github.com/knqyf263/trivy) [![Go Report Card](https://goreportcard.com/badge/github.com/aquasecurity/trivy)](https://goreportcard.com/report/github.com/aquasecurity/trivy)
[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0) [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
@@ -93,7 +93,7 @@ Add repository setting to `/etc/yum.repos.d`.
$ sudo vim /etc/yum.repos.d/trivy.repo $ sudo vim /etc/yum.repos.d/trivy.repo
[trivy] [trivy]
name=Trivy repository name=Trivy repository
baseurl=https://knqyf263.github.io/trivy-repo/rpm/releases/$releasever/$basearch/ baseurl=https://aquasecurity.github.io/trivy-repo/rpm/releases/$releasever/$basearch/
gpgcheck=0 gpgcheck=0
enabled=1 enabled=1
$ sudo yum -y update $ sudo yum -y update
@@ -103,7 +103,7 @@ $ sudo yum -y install trivy
or or
``` ```
$ rpm -ivh https://github.com/knqyf263/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.rpm $ rpm -ivh https://github.com/aquasecurity/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.rpm
``` ```
## Debian/Ubuntu ## Debian/Ubuntu
@@ -116,8 +116,8 @@ CODE_NAME: wheezy, jessie, stretch, buster, trusty, xenial, bionic
``` ```
$ sudo apt-get install apt-transport-https gnupg $ sudo apt-get install apt-transport-https gnupg
$ wget -qO - https://knqyf263.github.io/trivy-repo/deb/public.key | sudo apt-key add - $ wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
$ echo deb https://knqyf263.github.io/trivy-repo/deb [CODE_NAME] main | sudo tee -a /etc/apt/sources.list.d/trivy.list $ echo deb https://aquasecurity.github.io/trivy-repo/deb [CODE_NAME] main | sudo tee -a /etc/apt/sources.list.d/trivy.list
$ sudo apt-get update $ sudo apt-get update
$ sudo apt-get install trivy $ sudo apt-get install trivy
``` ```
@@ -126,7 +126,7 @@ or
``` ```
$ sudo apt-get install rpm $ sudo apt-get install rpm
$ wget https://github.com/knqyf263/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.deb $ wget https://github.com/aquasecurity/trivy/releases/download/v0.0.15/trivy_0.0.15_Linux-64bit.deb
$ sudo dpkg -i trivy_0.0.15_Linux-64bit.deb $ sudo dpkg -i trivy_0.0.15_Linux-64bit.deb
``` ```
## Arch Linux ## Arch Linux
@@ -144,21 +144,21 @@ yay -Sy trivy-bin
You can use homebrew on Mac OS. You can use homebrew on Mac OS.
``` ```
$ brew install knqyf263/trivy/trivy $ brew install aquasecurity/trivy/trivy
``` ```
## Binary (Including Windows) ## Binary (Including Windows)
Get the latest version from [this page](https://github.com/knqyf263/trivy/releases/latest), and download the archive file for your operating system/architecture. Unpack the archive, and put the binary somewhere in your `$PATH` (on UNIX-y systems, /usr/local/bin or the like). Make sure it has execution bits turned on. Get the latest version from [this page](https://github.com/aquasecurity/trivy/releases/latest), and download the archive file for your operating system/architecture. Unpack the archive, and put the binary somewhere in your `$PATH` (on UNIX-y systems, /usr/local/bin or the like). Make sure it has execution bits turned on.
You need to install `rpm` command for scanning RHEL/CentOS. You need to install `rpm` command for scanning RHEL/CentOS.
## From source ## From source
```sh ```sh
$ mkdir -p $GOPATH/src/github.com/knqyf263 $ mkdir -p $GOPATH/src/github.com/aquasecurity
$ cd $GOPATH/src/github.com/knqyf263 $ cd $GOPATH/src/github.com/aquasecurity
$ git clone https://github.com/knqyf263/trivy $ git clone https://github.com/aquasecurity/trivy
$ cd trivy/cmd/trivy/ $ cd trivy/cmd/trivy/
$ export GO111MODULE=on $ export GO111MODULE=on
$ go install $ go install
@@ -206,23 +206,23 @@ Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
Replace [YOUR_CACHE_DIR] with the cache directory on your machine. Replace [YOUR_CACHE_DIR] with the cache directory on your machine.
``` ```
$ docker run --rm -v [YOUR_CACHE_DIR]:/root/.cache/ knqyf263/trivy [YOUR_IMAGE_NAME] $ docker run --rm -v [YOUR_CACHE_DIR]:/root/.cache/ aquasecurity/trivy [YOUR_IMAGE_NAME]
``` ```
Example for macOS: Example for macOS:
``` ```
$ docker run --rm -v $HOME/Library/Caches:/root/.cache/ knqyf263/trivy python:3.4-alpine $ docker run --rm -v $HOME/Library/Caches:/root/.cache/ aquasecurity/trivy python:3.4-alpine
``` ```
If you would like to scan the image on your host machine, you need to mount `docker.sock`. If you would like to scan the image on your host machine, you need to mount `docker.sock`.
``` ```
$ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \ $ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock \
-v $HOME/Library/Caches:/root/.cache/ knqyf263/trivy python:3.4-alpine -v $HOME/Library/Caches:/root/.cache/ aquasecurity/trivy python:3.4-alpine
``` ```
Please re-pull latest `knqyf263/trivy` if an error occured. Please re-pull latest `aquasecurity/trivy` if an error occured.
<details> <details>
<summary>Result</summary> <summary>Result</summary>
@@ -252,7 +252,7 @@ Total: 1 (UNKNOWN: 0, LOW: 0, MEDIUM: 1, HIGH: 0, CRITICAL: 0)
Simply specify an image name (and a tag). Simply specify an image name (and a tag).
``` ```
$ trivy knqyf263/test-image:1.2.3 $ trivy aquasecurity/test-image:1.2.3
``` ```
<details> <details>
@@ -272,7 +272,7 @@ $ trivy knqyf263/test-image:1.2.3
2019-05-16T12:59:10.285+0900 INFO Updating pipenv Security DB... 2019-05-16T12:59:10.285+0900 INFO Updating pipenv Security DB...
2019-05-16T12:59:11.487+0900 INFO Detecting pipenv vulnerabilities... 2019-05-16T12:59:11.487+0900 INFO Detecting pipenv vulnerabilities...
knqyf263/test-image:1.2.3 (alpine 3.7.1) aquasecurity/test-image:1.2.3 (alpine 3.7.1)
======================================== ========================================
Total: 26 (UNKNOWN: 0, LOW: 3, MEDIUM: 16, HIGH: 5, CRITICAL: 2) Total: 26 (UNKNOWN: 0, LOW: 3, MEDIUM: 16, HIGH: 5, CRITICAL: 2)
@@ -1085,8 +1085,8 @@ env:
before_install: before_install:
- docker build -t trivy-ci-test:${COMMIT} . - docker build -t trivy-ci-test:${COMMIT} .
- export VERSION=$(curl --silent "https://api.github.com/repos/knqyf263/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/') - export VERSION=$(curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
- wget https://github.com/knqyf263/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz - wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
- tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz - tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
script: script:
- ./trivy --exit-code 0 --severity HIGH --quiet --auto-refresh trivy-ci-test:${COMMIT} - ./trivy --exit-code 0 --severity HIGH --quiet --auto-refresh trivy-ci-test:${COMMIT}
@@ -1096,8 +1096,8 @@ cache:
- $HOME/.cache/trivy - $HOME/.cache/trivy
``` ```
Example: https://travis-ci.org/knqyf263/trivy-ci-test Example: https://travis-ci.org/aquasecurity/trivy-ci-test
Repository: https://github.com/knqyf263/trivy-ci-test Repository: https://github.com/aquasecurity/trivy-ci-test
## CircleCI ## CircleCI
@@ -1120,12 +1120,12 @@ jobs:
command: | command: |
apk add --update curl apk add --update curl
VERSION=$( VERSION=$(
curl --silent "https://api.github.com/repos/knqyf263/trivy/releases/latest" | \ curl --silent "https://api.github.com/repos/aquasecurity/trivy/releases/latest" | \
grep '"tag_name":' | \ grep '"tag_name":' | \
sed -E 's/.*"v([^"]+)".*/\1/' sed -E 's/.*"v([^"]+)".*/\1/'
) )
wget https://github.com/knqyf263/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz wget https://github.com/aquasecurity/trivy/releases/download/v${VERSION}/trivy_${VERSION}_Linux-64bit.tar.gz
tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz tar zxvf trivy_${VERSION}_Linux-64bit.tar.gz
mv trivy /usr/local/bin mv trivy /usr/local/bin
- run: - run:
@@ -1142,8 +1142,8 @@ workflows:
- build - build
``` ```
Example: https://circleci.com/gh/knqyf263/trivy-ci-test Example: https://circleci.com/gh/aquasecurity/trivy-ci-test
Repository: https://github.com/knqyf263/trivy-ci-test Repository: https://github.com/aquasecurity/trivy-ci-test
## Authorization for Private Docker Registry ## Authorization for Private Docker Registry
@@ -1220,7 +1220,7 @@ The unfixed/unfixable vulnerabilities mean that the patch has not yet been provi
The path of these files does not matter. The path of these files does not matter.
Example: https://npm.pkg.github.com/knqyf263/trivy-ci-test/blob/master/Dockerfile Example: https://npm.pkg.github.com/aquasecurity/trivy-ci-test/blob/master/Dockerfile
### Data source ### Data source
- PHP - PHP
@@ -1284,7 +1284,7 @@ However, the purpose of this database is to make it possible to know what packag
As README says, it is not a complete database of all security issues in Alpine. As README says, it is not a complete database of all security issues in Alpine.
`Trivy` collects vulnerability information in Alpine Linux from [Alpine Linux aports repository](https://gitlab.alpinelinux.org/alpine/aports). `Trivy` collects vulnerability information in Alpine Linux from [Alpine Linux aports repository](https://gitlab.alpinelinux.org/alpine/aports).
Then, those vulnerabilities will be saved on [vuln-list](https://github.com/knqyf263/vuln-list/tree/master/alpine). Then, those vulnerabilities will be saved on [vuln-list](https://github.com/aquasecurity/vuln-list/tree/master/alpine).
`alpine-secdb` has 6959 vulnerabilities (as of 2019/05/12). `alpine-secdb` has 6959 vulnerabilities (as of 2019/05/12).
`vuln-list` has 11101 vulnerabilities related with Alpine Linux (as of 2019/05/12). `vuln-list` has 11101 vulnerabilities related with Alpine Linux (as of 2019/05/12).
@@ -1327,7 +1327,7 @@ As `Quay` seems to use `Clair` internally, it has the same accuracy than `Clair`
### Error: Your macOS keychain GitHub credentials do not have sufficient scope! ### Error: Your macOS keychain GitHub credentials do not have sufficient scope!
``` ```
$ brew tap knqyf263/trivy $ brew tap aquasecurity/trivy
Error: Your macOS keychain GitHub credentials do not have sufficient scope! Error: Your macOS keychain GitHub credentials do not have sufficient scope!
Scopes they need: none Scopes they need: none
Scopes they have: Scopes they have:
@@ -1342,12 +1342,12 @@ Try:
$ printf "protocol=https\nhost=github.com\n" | git credential-osxkeychain erase $ printf "protocol=https\nhost=github.com\n" | git credential-osxkeychain erase
``` ```
### Error: knqyf263/trivy/trivy 64 already installed ### Error: aquasecurity/trivy/trivy 64 already installed
``` ```
$ brew upgrade $ brew upgrade
... ...
Error: knqyf263/trivy/trivy 64 already installed Error: aquasecurity/trivy/trivy 64 already installed
``` ```
Try: Try:
@@ -1355,7 +1355,7 @@ Try:
``` ```
$ brew unlink trivy && brew uninstall trivy $ brew unlink trivy && brew uninstall trivy
($ rm -rf /usr/local/Cellar/trivy/64) ($ rm -rf /usr/local/Cellar/trivy/64)
$ brew install knqyf263/trivy/trivy $ brew install aquasecurity/trivy/trivy
``` ```
## Others ## Others
@@ -1378,13 +1378,13 @@ $ trivy --reset
# Related Projects # Related Projects
- [Remic](https://github.com/knqyf263/remic) - [Remic](https://github.com/aquasecurity/remic)
- Vulnerability Scanner for Detecting Publicly Disclosed Vulnerabilities in Application Dependencies - Vulnerability Scanner for Detecting Publicly Disclosed Vulnerabilities in Application Dependencies
# Contribute # Contribute
1. fork a repository: github.com/knqyf263/trivy to github.com/you/repo 1. fork a repository: github.com/aquasecurity/trivy to github.com/you/repo
2. get original code: `go get github.com/knqyf263/trivy` 2. get original code: `go get github.com/aquasecurity/trivy`
3. work on original code 3. work on original code
4. add remote to your repo: git remote add myfork https://github.com/you/repo.git 4. add remote to your repo: git remote add myfork https://github.com/you/repo.git
5. push your changes: git push myfork 5. push your changes: git push myfork
@@ -1406,4 +1406,4 @@ AGPLv3
# Author # Author
Teppei Fukuda (knqyf263) Teppei Fukuda (aquasecurity)

8
cmd/trivy/main.go
View File

@@ -5,14 +5,14 @@ import (
"os" "os"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/urfave/cli" "github.com/urfave/cli"
"github.com/knqyf263/trivy/pkg" "github.com/aquasecurity/trivy/pkg"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
var ( var (

6
go.mod
View File

@@ -1,9 +1,11 @@
module github.com/knqyf263/trivy module github.com/aquasecurity/trivy
go 1.12 go 1.12
require ( require (
github.com/BurntSushi/toml v0.3.1 github.com/BurntSushi/toml v0.3.1
github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6
github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b
github.com/briandowns/spinner v0.0.0-20190319032542-ac46072a5a91 github.com/briandowns/spinner v0.0.0-20190319032542-ac46072a5a91
github.com/caarlos0/env/v6 v6.0.0 github.com/caarlos0/env/v6 v6.0.0
github.com/emirpasic/gods v1.12.0 // indirect github.com/emirpasic/gods v1.12.0 // indirect
@@ -11,9 +13,7 @@ require (
github.com/fatih/color v1.7.0 github.com/fatih/color v1.7.0
github.com/genuinetools/reg v0.16.0 github.com/genuinetools/reg v0.16.0
github.com/gliderlabs/ssh v0.1.3 // indirect github.com/gliderlabs/ssh v0.1.3 // indirect
github.com/knqyf263/fanal v0.0.0-20190706175150-0e953d070757
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
github.com/knqyf263/go-dep-parser v0.0.0-20190521150559-1ef8521d17a0
github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936
github.com/knqyf263/go-version v1.1.1 github.com/knqyf263/go-version v1.1.1
github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348

8
go.sum
View File

@@ -22,6 +22,10 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6 h1:pkl+kEW4KeLDPLfDtzjXa+zHOcS4YWSQuSTZ2kWO2GE=
github.com/aquasecurity/fanal v0.0.0-20190819081512-f04452b627c6/go.mod h1:enEz4FFetw4XAbkffaYgyCVq1556R9Ry+noqT4rq9BE=
github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b h1:55Ulc/gvfWm4ylhVaR7MxOwujRjA6et7KhmUbSgUFf4=
github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b/go.mod h1:BpNTD9vHfrejKsED9rx04ldM1WIbeyXGYxUrqTVwxVQ=
github.com/aws/aws-sdk-go v1.19.11 h1:tqaTGER6Byw3QvsjGW0p018U2UOqaJPeJuzoaF7jjoQ= github.com/aws/aws-sdk-go v1.19.11 h1:tqaTGER6Byw3QvsjGW0p018U2UOqaJPeJuzoaF7jjoQ=
github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.19.11/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
@@ -124,12 +128,8 @@ github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e/go.mod h1:CT
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/knqyf263/berkeleydb v0.0.0-20190501065933-fafe01fb9662/go.mod h1:bu1CcN4tUtoRcI/B/RFHhxMNKFHVq/c3SV+UTyduoXg= github.com/knqyf263/berkeleydb v0.0.0-20190501065933-fafe01fb9662/go.mod h1:bu1CcN4tUtoRcI/B/RFHhxMNKFHVq/c3SV+UTyduoXg=
github.com/knqyf263/fanal v0.0.0-20190706175150-0e953d070757 h1:+GxAt32Vfj1v2KPUvA44zcTRwZrJbUu5BVvtiU7Y1vo=
github.com/knqyf263/fanal v0.0.0-20190706175150-0e953d070757/go.mod h1:kdmitQCmUcpPs1JZA3/kBuxu0AeN9OnVLl7SRkPUoGU=
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d h1:X4cedH4Kn3JPupAwwWuo4AzYp16P0OyLO9d7OnMZc/c= github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d h1:X4cedH4Kn3JPupAwwWuo4AzYp16P0OyLO9d7OnMZc/c=
github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d/go.mod h1:o8sgWoz3JADecfc/cTYD92/Et1yMqMy0utV1z+VaZao= github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d/go.mod h1:o8sgWoz3JADecfc/cTYD92/Et1yMqMy0utV1z+VaZao=
github.com/knqyf263/go-dep-parser v0.0.0-20190521150559-1ef8521d17a0 h1:DOQ2UbTciy48dV9vpZ25BOiShrWIWZwBdMOy7SD1Wow=
github.com/knqyf263/go-dep-parser v0.0.0-20190521150559-1ef8521d17a0/go.mod h1:gSiqSkOFPstUZu/qZ4wnNJS69PtQQnPl397vxKHJ5mQ=
github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 h1:HDjRqotkViMNcGMGicb7cgxklx8OwnjtCBmyWEqrRvM= github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936 h1:HDjRqotkViMNcGMGicb7cgxklx8OwnjtCBmyWEqrRvM=
github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0= github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936/go.mod h1:i4sF0l1fFnY1aiw08QQSwVAFxHEm311Me3WsU/X7nL0=
github.com/knqyf263/go-rpmdb v0.0.0-20190501070121-10a1c42a10dc/go.mod h1:MrSSvdMpTSymaQWk1yFr9sxFSyQmKMj6jkbvGrchBV8= github.com/knqyf263/go-rpmdb v0.0.0-20190501070121-10a1c42a10dc/go.mod h1:MrSSvdMpTSymaQWk1yFr9sxFSyQmKMj6jkbvGrchBV8=

8
goreleaser.yml
View File

@@ -28,8 +28,8 @@ nfpm:
- rpm - rpm
dependencies: dependencies:
- rpm - rpm
vendor: "knqyf263" vendor: "aquasecurity"
homepage: "https://github.com/knqyf263" homepage: "https://github.com/aquasecurity"
maintainer: "Teppei Fukuda <knqyf263@gmail.com>" maintainer: "Teppei Fukuda <knqyf263@gmail.com>"
description: "A Fast Vulnerability Scanner for Containers" description: "A Fast Vulnerability Scanner for Containers"
license: "MIT" license: "MIT"
@@ -71,11 +71,11 @@ archive:
brew: brew:
github: github:
owner: knqyf263 owner: aquasecurity
name: homebrew-trivy name: homebrew-trivy
dependencies: dependencies:
- rpm - rpm
homepage: "https://github.com/knqyf263/trivy" homepage: "https://github.com/aquasecurity/trivy"
description: "" description: ""
test: | test: |
system "#{bin}/program --version" system "#{bin}/program --version"

4
pkg/db/db.go
View File

@@ -5,11 +5,11 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
) )

6
pkg/git/git.go
View File

@@ -5,10 +5,10 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"golang.org/x/xerrors" "golang.org/x/xerrors"
git "gopkg.in/src-d/go-git.v4" git "gopkg.in/src-d/go-git.v4"
"gopkg.in/src-d/go-git.v4/plumbing/object" "gopkg.in/src-d/go-git.v4/plumbing/object"

2
pkg/report/writer.go
View File

@@ -9,7 +9,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/olekukonko/tablewriter" "github.com/olekukonko/tablewriter"
) )

18
pkg/run.go
View File

@@ -6,15 +6,15 @@ import (
"strings" "strings"
"github.com/genuinetools/reg/registry" "github.com/genuinetools/reg/registry"
"github.com/knqyf263/fanal/cache" "github.com/aquasecurity/fanal/cache"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/report" "github.com/aquasecurity/trivy/pkg/report"
"github.com/knqyf263/trivy/pkg/scanner" "github.com/aquasecurity/trivy/pkg/scanner"
"github.com/knqyf263/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/types"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc" "github.com/aquasecurity/trivy/pkg/vulnsrc"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/urfave/cli" "github.com/urfave/cli"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

8
pkg/scanner/library/bundler/advisory.go
View File

@@ -8,13 +8,13 @@ import (
"github.com/etcd-io/bbolt" "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

8
pkg/scanner/library/bundler/scan.go
View File

@@ -5,12 +5,12 @@ import (
"os" "os"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/go-dep-parser/pkg/bundler" "github.com/aquasecurity/go-dep-parser/pkg/bundler"
ptypes "github.com/knqyf263/go-dep-parser/pkg/types" ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
"github.com/knqyf263/go-version" "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

8
pkg/scanner/library/cargo/advisory.go
View File

@@ -9,13 +9,13 @@ import (
"github.com/etcd-io/bbolt" "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
) )
const ( const (

8
pkg/scanner/library/cargo/scan.go
View File

@@ -4,12 +4,12 @@ import (
"os" "os"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/go-dep-parser/pkg/cargo" "github.com/aquasecurity/go-dep-parser/pkg/cargo"
ptypes "github.com/knqyf263/go-dep-parser/pkg/types" ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
"github.com/knqyf263/go-version" "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

8
pkg/scanner/library/composer/advisory.go
View File

@@ -7,13 +7,13 @@ import (
"strings" "strings"
"github.com/etcd-io/bbolt" "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

8
pkg/scanner/library/composer/scan.go
View File

@@ -5,14 +5,14 @@ import (
"os" "os"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/go-dep-parser/pkg/composer" "github.com/aquasecurity/go-dep-parser/pkg/composer"
ptypes "github.com/knqyf263/go-dep-parser/pkg/types" ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
"github.com/knqyf263/go-version" "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
) )
const ( const (

8
pkg/scanner/library/node/advisory.go
View File

@@ -10,13 +10,13 @@ import (
"github.com/etcd-io/bbolt" "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
) )
const ( const (

10
pkg/scanner/library/node/scan.go
View File

@@ -6,14 +6,14 @@ import (
"strings" "strings"
version "github.com/knqyf263/go-version" version "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/go-dep-parser/pkg/npm" "github.com/aquasecurity/go-dep-parser/pkg/npm"
ptypes "github.com/knqyf263/go-dep-parser/pkg/types" ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
"github.com/knqyf263/go-dep-parser/pkg/yarn" "github.com/aquasecurity/go-dep-parser/pkg/yarn"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
) )
const ( const (

8
pkg/scanner/library/python/advisory.go
View File

@@ -7,14 +7,14 @@ import (
"github.com/etcd-io/bbolt" "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
) )
const ( const (

10
pkg/scanner/library/python/scan.go
View File

@@ -4,15 +4,15 @@ import (
"os" "os"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/go-dep-parser/pkg/pipenv" "github.com/aquasecurity/go-dep-parser/pkg/pipenv"
"github.com/knqyf263/go-dep-parser/pkg/poetry" "github.com/aquasecurity/go-dep-parser/pkg/poetry"
ptypes "github.com/knqyf263/go-dep-parser/pkg/types" ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
"github.com/knqyf263/go-version" "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
) )
const ( const (

36
pkg/scanner/library/scan.go
View File

@@ -4,26 +4,26 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
_ "github.com/knqyf263/fanal/analyzer/library/bundler" _ "github.com/aquasecurity/fanal/analyzer/library/bundler"
_ "github.com/knqyf263/fanal/analyzer/library/cargo" _ "github.com/aquasecurity/fanal/analyzer/library/cargo"
_ "github.com/knqyf263/fanal/analyzer/library/composer" _ "github.com/aquasecurity/fanal/analyzer/library/composer"
_ "github.com/knqyf263/fanal/analyzer/library/npm" _ "github.com/aquasecurity/fanal/analyzer/library/npm"
_ "github.com/knqyf263/fanal/analyzer/library/pipenv" _ "github.com/aquasecurity/fanal/analyzer/library/pipenv"
_ "github.com/knqyf263/fanal/analyzer/library/poetry" _ "github.com/aquasecurity/fanal/analyzer/library/poetry"
_ "github.com/knqyf263/fanal/analyzer/library/yarn" _ "github.com/aquasecurity/fanal/analyzer/library/yarn"
"github.com/knqyf263/fanal/extractor" "github.com/aquasecurity/fanal/extractor"
ptypes "github.com/knqyf263/go-dep-parser/pkg/types" ptypes "github.com/aquasecurity/go-dep-parser/pkg/types"
"github.com/knqyf263/go-version" "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/scanner/library/bundler" "github.com/aquasecurity/trivy/pkg/scanner/library/bundler"
"github.com/knqyf263/trivy/pkg/scanner/library/cargo" "github.com/aquasecurity/trivy/pkg/scanner/library/cargo"
"github.com/knqyf263/trivy/pkg/scanner/library/composer" "github.com/aquasecurity/trivy/pkg/scanner/library/composer"
"github.com/knqyf263/trivy/pkg/scanner/library/node" "github.com/aquasecurity/trivy/pkg/scanner/library/node"
"github.com/knqyf263/trivy/pkg/scanner/library/python" "github.com/aquasecurity/trivy/pkg/scanner/library/python"
"github.com/knqyf263/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/types"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

10
pkg/scanner/ospkg/alpine/alpine.go
View File

@@ -4,12 +4,12 @@ import (
"strings" "strings"
"time" "time"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
version "github.com/knqyf263/go-rpm-version" version "github.com/knqyf263/go-rpm-version"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/alpine" "github.com/aquasecurity/trivy/pkg/vulnsrc/alpine"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

2
pkg/scanner/ospkg/alpine/alpine_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

12
pkg/scanner/ospkg/debian/debian.go
View File

@@ -4,15 +4,15 @@ import (
"strings" "strings"
"time" "time"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
version "github.com/knqyf263/go-deb-version" version "github.com/knqyf263/go-deb-version"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/debian" "github.com/aquasecurity/trivy/pkg/vulnsrc/debian"
debianoval "github.com/knqyf263/trivy/pkg/vulnsrc/debian-oval" debianoval "github.com/aquasecurity/trivy/pkg/vulnsrc/debian-oval"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
) )
var ( var (

2
pkg/scanner/ospkg/debian/debian_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

12
pkg/scanner/ospkg/redhat/redhat.go
View File

@@ -4,13 +4,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
"github.com/knqyf263/fanal/analyzer/os" "github.com/aquasecurity/fanal/analyzer/os"
version "github.com/knqyf263/go-rpm-version" version "github.com/knqyf263/go-rpm-version"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/redhat" "github.com/aquasecurity/trivy/pkg/vulnsrc/redhat"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

2
pkg/scanner/ospkg/redhat/redhat_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

34
pkg/scanner/ospkg/scan.go
View File

@@ -1,23 +1,23 @@
package ospkg package ospkg
import ( import (
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
_ "github.com/knqyf263/fanal/analyzer/command/apk" _ "github.com/aquasecurity/fanal/analyzer/command/apk"
fos "github.com/knqyf263/fanal/analyzer/os" fos "github.com/aquasecurity/fanal/analyzer/os"
_ "github.com/knqyf263/fanal/analyzer/os/alpine" _ "github.com/aquasecurity/fanal/analyzer/os/alpine"
_ "github.com/knqyf263/fanal/analyzer/os/amazonlinux" _ "github.com/aquasecurity/fanal/analyzer/os/amazonlinux"
_ "github.com/knqyf263/fanal/analyzer/os/debianbase" _ "github.com/aquasecurity/fanal/analyzer/os/debianbase"
_ "github.com/knqyf263/fanal/analyzer/os/opensuse" _ "github.com/aquasecurity/fanal/analyzer/os/opensuse"
_ "github.com/knqyf263/fanal/analyzer/os/redhatbase" _ "github.com/aquasecurity/fanal/analyzer/os/redhatbase"
_ "github.com/knqyf263/fanal/analyzer/pkg/apk" _ "github.com/aquasecurity/fanal/analyzer/pkg/apk"
_ "github.com/knqyf263/fanal/analyzer/pkg/dpkg" _ "github.com/aquasecurity/fanal/analyzer/pkg/dpkg"
"github.com/knqyf263/fanal/extractor" "github.com/aquasecurity/fanal/extractor"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/scanner/ospkg/alpine" "github.com/aquasecurity/trivy/pkg/scanner/ospkg/alpine"
"github.com/knqyf263/trivy/pkg/scanner/ospkg/debian" "github.com/aquasecurity/trivy/pkg/scanner/ospkg/debian"
"github.com/knqyf263/trivy/pkg/scanner/ospkg/redhat" "github.com/aquasecurity/trivy/pkg/scanner/ospkg/redhat"
"github.com/knqyf263/trivy/pkg/scanner/ospkg/ubuntu" "github.com/aquasecurity/trivy/pkg/scanner/ospkg/ubuntu"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

2
pkg/scanner/ospkg/scan_bsd.go
View File

@@ -3,5 +3,5 @@
package ospkg package ospkg
import ( import (
_ "github.com/knqyf263/fanal/analyzer/pkg/rpmcmd" _ "github.com/aquasecurity/fanal/analyzer/pkg/rpmcmd"
) )

4
pkg/scanner/ospkg/scan_unix.go
View File

@@ -3,7 +3,7 @@
package ospkg package ospkg
import ( import (
_ "github.com/knqyf263/fanal/analyzer/pkg/rpmcmd" _ "github.com/aquasecurity/fanal/analyzer/pkg/rpmcmd"
// TODO: Eliminate the dependency on "rpm" command // TODO: Eliminate the dependency on "rpm" command
// _ "github.com/knqyf263/fanal/analyzer/pkg/rpm" // _ "github.com/aquasecurity/fanal/analyzer/pkg/rpm"
) )

2
pkg/scanner/ospkg/ubuntu/ubnutu_test.go
View File

@@ -5,7 +5,7 @@ import (
"testing" "testing"
"time" "time"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
func TestMain(m *testing.M) { func TestMain(m *testing.M) {

10
pkg/scanner/ospkg/ubuntu/ubuntu.go
View File

@@ -4,13 +4,13 @@ import (
"time" "time"
version "github.com/knqyf263/go-deb-version" version "github.com/knqyf263/go-deb-version"
"github.com/knqyf263/trivy/pkg/scanner/utils" "github.com/aquasecurity/trivy/pkg/scanner/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/vulnsrc/ubuntu" "github.com/aquasecurity/trivy/pkg/vulnsrc/ubuntu"
) )
var ( var (

14
pkg/scanner/scan.go
View File

@@ -6,13 +6,13 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
"github.com/knqyf263/fanal/extractor" "github.com/aquasecurity/fanal/extractor"
"github.com/knqyf263/trivy/pkg/scanner/library" "github.com/aquasecurity/trivy/pkg/scanner/library"
"github.com/knqyf263/trivy/pkg/scanner/ospkg" "github.com/aquasecurity/trivy/pkg/scanner/ospkg"
"github.com/knqyf263/trivy/pkg/types" "github.com/aquasecurity/trivy/pkg/types"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/crypto/ssh/terminal" "golang.org/x/crypto/ssh/terminal"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

4
pkg/scanner/utils/utils.go
View File

@@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/knqyf263/fanal/analyzer" "github.com/aquasecurity/fanal/analyzer"
"github.com/knqyf263/go-version" "github.com/knqyf263/go-version"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
var ( var (

2
pkg/types/dockerConf.go
View File

@@ -4,7 +4,7 @@ import (
"time" "time"
"github.com/caarlos0/env/v6" "github.com/caarlos0/env/v6"
"github.com/knqyf263/fanal/types" "github.com/aquasecurity/fanal/types"
) )
type DockerConfig struct { type DockerConfig struct {

2
pkg/utils/utils.go
View File

@@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

2
pkg/utils/utils_test.go
View File

@@ -9,7 +9,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/kylelemons/godebug/pretty" "github.com/kylelemons/godebug/pretty"
) )

8
pkg/vulnsrc/alpine/alpine.go
View File

@@ -6,15 +6,15 @@ import (
"io" "io"
"path/filepath" "path/filepath"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"golang.org/x/xerrors" "golang.org/x/xerrors"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
) )
const ( const (

10
pkg/vulnsrc/debian-oval/debian-oval.go
View File

@@ -8,17 +8,17 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/vulnsrc/debian" "github.com/aquasecurity/trivy/pkg/vulnsrc/debian"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
) )
var ( var (

8
pkg/vulnsrc/debian/debian.go
View File

@@ -8,10 +8,10 @@ import (
"strings" "strings"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

8
pkg/vulnsrc/nvd/nvd.go
View File

@@ -6,17 +6,17 @@ import (
"io" "io"
"path/filepath" "path/filepath"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
) )
const ( const (

8
pkg/vulnsrc/redhat/redhat.go
View File

@@ -9,13 +9,13 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

8
pkg/vulnsrc/ubuntu/ubuntu.go
View File

@@ -6,16 +6,16 @@ import (
"io" "io"
"path/filepath" "path/filepath"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
) )
const ( const (

2
pkg/vulnsrc/vulnerability/db.go
View File

@@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
bolt "github.com/etcd-io/bbolt" bolt "github.com/etcd-io/bbolt"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )

4
pkg/vulnsrc/vulnerability/vulnerability.go
View File

@@ -6,11 +6,11 @@ import (
"os" "os"
"strings" "strings"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"sort" "sort"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
) )
const ( const (

22
pkg/vulnsrc/vulnsrc.go
View File

@@ -3,21 +3,21 @@ package vulnsrc
import ( import (
"path/filepath" "path/filepath"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/alpine" "github.com/aquasecurity/trivy/pkg/vulnsrc/alpine"
"github.com/knqyf263/trivy/pkg/vulnsrc/debian" "github.com/aquasecurity/trivy/pkg/vulnsrc/debian"
debianoval "github.com/knqyf263/trivy/pkg/vulnsrc/debian-oval" debianoval "github.com/aquasecurity/trivy/pkg/vulnsrc/debian-oval"
"github.com/knqyf263/trivy/pkg/vulnsrc/nvd" "github.com/aquasecurity/trivy/pkg/vulnsrc/nvd"
"github.com/knqyf263/trivy/pkg/vulnsrc/redhat" "github.com/aquasecurity/trivy/pkg/vulnsrc/redhat"
"github.com/knqyf263/trivy/pkg/vulnsrc/ubuntu" "github.com/aquasecurity/trivy/pkg/vulnsrc/ubuntu"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
"golang.org/x/xerrors" "golang.org/x/xerrors"
) )
const ( const (
repoURL = "https://github.com/knqyf263/vuln-list.git" repoURL = "https://github.com/aquasecurity/vuln-list.git"
) )
type updateFunc func(dir string, updatedFiles map[string]struct{}) error type updateFunc func(dir string, updatedFiles map[string]struct{}) error

10
pkg/vulnsrc/vulnsrc_test.go
View File

@@ -6,11 +6,11 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
"github.com/knqyf263/trivy/pkg/db" "github.com/aquasecurity/trivy/pkg/db"
"github.com/knqyf263/trivy/pkg/git" "github.com/aquasecurity/trivy/pkg/git"
"github.com/knqyf263/trivy/pkg/log" "github.com/aquasecurity/trivy/pkg/log"
"github.com/knqyf263/trivy/pkg/utils" "github.com/aquasecurity/trivy/pkg/utils"
"github.com/knqyf263/trivy/pkg/vulnsrc/vulnerability" "github.com/aquasecurity/trivy/pkg/vulnsrc/vulnerability"
) )
func BenchmarkUpdate(b *testing.B) { func BenchmarkUpdate(b *testing.B) {