-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #894 from wakatime/develop
Release v1.73.2
- Loading branch information
Showing
20 changed files
with
181 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| #!/usr/bin/env bash | ||
| set -Eeuo pipefail | ||
|
|
||
| # a wrapper / replacement for "govulncheck" which allows for excluding vulnerabilities | ||
| # (https://github.com/golang/go/issues/59507) | ||
|
|
||
| excludeVulns="$(jq -nc '[ | ||
| # https://pkg.go.dev/vuln/GO-2023-1987 | ||
| "GO-2023-1987", | ||
| empty # trailing comma hack (makes diffs smaller) | ||
| ]')" | ||
| export excludeVulns | ||
|
|
||
| if ! command -v govulncheck > /dev/null; then | ||
| govulncheck() { | ||
| local user; user="$(id -u):$(id -g)" | ||
| local args=( | ||
| --rm --interactive --init | ||
| --user "$user" | ||
| --env HOME=/tmp | ||
| --env GOPATH=/tmp/go | ||
| --volume govulncheck:/tmp | ||
| --env CGO_ENABLED=0 | ||
| --mount "type=bind,src=$PWD,dst=/wd,ro" | ||
| --workdir /wd | ||
| "${GOLANG_IMAGE:-golang:latest}" | ||
| sh -euc ' | ||
| go install golang.org/x/vuln/cmd/govulncheck@latest > /dev/null | ||
| exec "$GOPATH/bin/govulncheck" "$@" | ||
| ' -- | ||
| ) | ||
| docker run "${args[@]}" "$@" | ||
| } | ||
| fi | ||
|
|
||
| if out="$(govulncheck "$@")"; then | ||
| printf '%s\n' "$out" | ||
| exit 0 | ||
| fi | ||
|
|
||
| json="$(govulncheck -json "$@")" | ||
|
|
||
| vulns="$(jq <<<"$json" -cs 'map(select(has("osv")) | .osv)')" | ||
| if [ "$(jq <<<"$vulns" -r 'length')" -le 0 ]; then | ||
| printf '%s\n' "$out" | ||
| exit 1 | ||
| fi | ||
|
|
||
| filtered="$(jq <<<"$vulns" -c ' | ||
| (env.excludeVulns | fromjson) as $exclude | ||
| | map(select( | ||
| .id as $id | ||
| | $exclude | index($id) | not | ||
| )) | ||
| ')" | ||
|
|
||
| text="$(jq <<<"$filtered" -r 'map("- \(.id) (aka \(.aliases | join(", ")))\n\n\t\(.details | gsub("\n"; "\n\t"))") | join("\n\n")')" | ||
|
|
||
| if [ -z "$text" ]; then | ||
| printf 'No vulnerabilities found.\n' | ||
| exit 0 | ||
| else | ||
| printf '%s\n' "$text" | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| [settings] | ||
| api_key = 00000000-0000-4000-8000-000000000002 | ||
| debug = true | ||
| import_cfg = "testdata/.import.cfg" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.