Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dfe768f871 | ||
|
|
fc400e752d | ||
|
|
78d295d616 | ||
|
|
55b6b50672 | ||
|
|
e82c65a3c4 | ||
|
|
ade9877f07 | ||
|
|
371eedc0ef | ||
|
|
2656687937 | ||
|
|
6a93557620 | ||
|
|
632d2d7465 |
No files matched your search
@@ -0,0 +1,47 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Recompute the pinned SHA-256 of the Trivy and gitleaks release tarballs
|
||||||
|
# after a version bump. Renovate runs it as a postUpgradeTask (tth/renovate
|
||||||
|
# config.json), so a bump PR carries matching checksums; by hand:
|
||||||
|
# bash .gitea/update-checksums.sh
|
||||||
|
#
|
||||||
|
# Each tarball is downloaded and hashed here, and the hash must ALSO match
|
||||||
|
# the release's own checksums file - the pin is what we verified at bump
|
||||||
|
# time, the action then refuses any other bytes.
|
||||||
|
set -euo pipefail
|
||||||
|
cd "$(dirname "$0")/.."
|
||||||
|
work=$(mktemp -d)
|
||||||
|
trap 'rm -rf "$work"' EXIT
|
||||||
|
|
||||||
|
# pin <action.yml> <version var> <repo> <name prefix> <arch suffix> <sha var>...
|
||||||
|
pin() {
|
||||||
|
local file=$1 vvar=$2 repo=$3 prefix=$4
|
||||||
|
shift 4
|
||||||
|
local ver
|
||||||
|
ver=$(sed -n "s/^ *$vvar: *\"\([0-9.]*\)\".*/\1/p" "$file")
|
||||||
|
[ -n "$ver" ] || {
|
||||||
|
echo "no $vvar in $file" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
local base="https://github.com/$repo/releases/download/v$ver"
|
||||||
|
curl -fsSL --retry 3 -o "$work/sums" "$base/${prefix}_${ver}_checksums.txt"
|
||||||
|
while [ "$#" -gt 0 ]; do
|
||||||
|
local arch=$1 svar=$2
|
||||||
|
shift 2
|
||||||
|
local tgz="${prefix}_${ver}_${arch}.tar.gz"
|
||||||
|
curl -fsSL --retry 3 -o "$work/$tgz" "$base/$tgz"
|
||||||
|
local got want
|
||||||
|
got=$(sha256sum "$work/$tgz" | cut -d' ' -f1)
|
||||||
|
want=$(awk -v f="$tgz" '$2 == f {print $1}' "$work/sums")
|
||||||
|
[ "$got" = "$want" ] || {
|
||||||
|
echo "$tgz: downloaded $got, release says ${want:-nothing}" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
sed -i "s/^\( *$svar: *\)[0-9a-f]\{64\}/\1$got/" "$file"
|
||||||
|
echo "$tgz $got"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
pin trivy-gate/action.yml TRIVY_VERSION aquasecurity/trivy trivy \
|
||||||
|
Linux-64bit TRIVY_SHA256_AMD64 Linux-ARM64 TRIVY_SHA256_ARM64
|
||||||
|
pin gitleaks/action.yml GITLEAKS_VERSION gitleaks/gitleaks gitleaks \
|
||||||
|
linux_x64 GITLEAKS_SHA256_X64 linux_arm64 GITLEAKS_SHA256_ARM64
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
# PR check (Renovate bumps of Trivy / gitleaks, and any other PR): the
|
||||||
|
# actions of THIS branch must actually run. Both runtimes of trivy-gate:
|
||||||
|
# the Trivy container (docker job) and the pinned binary with its checksum
|
||||||
|
# check (container job without Docker) - a bump with a wrong checksum fails
|
||||||
|
# here, not in every pipeline that uses the next tag. Required by branch
|
||||||
|
# protection, so a green PR automerges and tag.yml cuts the next vN.
|
||||||
|
name: pr-check
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
|
||||||
|
concurrency:
|
||||||
|
group: pr-check-${{ github.head_ref }}
|
||||||
|
cancel-in-progress: true
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
docker:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
- name: trivy-gate, Trivy container, image scan
|
||||||
|
id: image
|
||||||
|
uses: ./trivy-gate
|
||||||
|
with:
|
||||||
|
image: alpine:3.22@sha256:2e0b81d60597f449baa56dc25d355367869d2dca4cd57e866f1e2b52af3eb55f
|
||||||
|
runtime: docker
|
||||||
|
mode: warn
|
||||||
|
- name: The report is real
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
jq -e '.Results | length > 0' "${{ steps.image.outputs.report }}" >/dev/null
|
||||||
|
echo "blocking=${{ steps.image.outputs.blocking }}"
|
||||||
|
- name: gitleaks
|
||||||
|
uses: ./gitleaks
|
||||||
|
with:
|
||||||
|
mode: block
|
||||||
|
|
||||||
|
binary:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
# No Docker CLI here, so trivy-gate falls back to the pinned binary.
|
||||||
|
container:
|
||||||
|
image: node:26-trixie-slim@sha256:94816674c62774da0d099a947bf4613b9e1972a2733abd0d0cd80e795f8411d0
|
||||||
|
steps:
|
||||||
|
- name: Tools the actions expect
|
||||||
|
run: apt-get update -qq && apt-get install -y -qq --no-install-recommends ca-certificates curl git jq >/dev/null
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
- name: trivy-gate, pinned binary, fs scan
|
||||||
|
id: fs
|
||||||
|
uses: ./trivy-gate
|
||||||
|
with:
|
||||||
|
scan-type: fs
|
||||||
|
runtime: binary
|
||||||
|
mode: warn
|
||||||
|
- name: The report is real
|
||||||
|
run: jq -e 'has("Results") or has("ArtifactName")' "${{ steps.fs.outputs.report }}" >/dev/null
|
||||||
|
- name: gitleaks, pinned binary
|
||||||
|
uses: ./gitleaks
|
||||||
|
with:
|
||||||
|
mode: block
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
# Cut the next major tag (vN) when a Renovate bump of a pinned tool lands on
|
||||||
|
# main, so the pipelines get it through their own Renovate PR ("update
|
||||||
|
# ci-actions to vN"). Only renovate-bot's merges: hand-made changes keep
|
||||||
|
# being tagged by hand, with the README note.
|
||||||
|
name: tag
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
tag:
|
||||||
|
if: github.actor == 'renovate-bot'
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- name: Next vN on HEAD
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
git fetch -q --tags
|
||||||
|
if git tag --points-at HEAD | grep -qE '^v[0-9]+$'; then
|
||||||
|
echo "HEAD already tagged: $(git tag --points-at HEAD | tr '\n' ' ')"; exit 0
|
||||||
|
fi
|
||||||
|
last=$(git tag -l 'v[0-9]*' | grep -E '^v[0-9]+$' | sed 's/^v//' | sort -n | tail -1)
|
||||||
|
next="v$((${last:-0} + 1))"
|
||||||
|
git tag "$next" HEAD
|
||||||
|
git push origin "refs/tags/$next"
|
||||||
|
echo "tagged $next on $(git rev-parse --short HEAD): $(git log -1 --format=%s)"
|
||||||
@@ -104,6 +104,16 @@ binary is verified by SHA-256.
|
|||||||
`v1` image gate + SBOM; `v2` fs scans, binary runtime, misconfig, gitleaks;
|
`v1` image gate + SBOM; `v2` fs scans, binary runtime, misconfig, gitleaks;
|
||||||
`v3` gitleaks fetches the parent of a single commit in a depth-1 checkout
|
`v3` gitleaks fetches the parent of a single commit in a depth-1 checkout
|
||||||
(dispatch/cron runs scanned the whole tree as a root commit before).
|
(dispatch/cron runs scanned the whole tree as a root commit before).
|
||||||
|
`v8` dtrack-sbom really never fails the job: the runner's `bash -e` turned
|
||||||
|
an unreachable Dependency-Track into a failed build instead of a warning.
|
||||||
|
|
||||||
|
Pinned tools (Trivy binary + image, gitleaks) are bumped by Renovate
|
||||||
|
(tth/renovate). Its post-upgrade task `.gitea/update-checksums.sh`
|
||||||
|
recomputes the tarball SHA-256 pins (downloaded and checked against the
|
||||||
|
release's checksums file); `.gitea/workflows/pr-check.yml` runs the actions
|
||||||
|
of the PR branch with both Trivy runtimes; after the merge `tag.yml` cuts
|
||||||
|
the next `vN`, which the pipelines then pick up through their own Renovate
|
||||||
|
PR. Hand-made changes are tagged by hand as before.
|
||||||
|
|
||||||
## portainer-deploy
|
## portainer-deploy
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ inputs:
|
|||||||
default: "5"
|
default: "5"
|
||||||
trivy-image:
|
trivy-image:
|
||||||
description: Trivy container image, pinned by digest.
|
description: Trivy container image, pinned by digest.
|
||||||
default: aquasec/trivy:0.75.0@sha256:af6acf9a6b85dfe389a1941505c0ce9efef52a4719635e1a962f022a3d855daa
|
default: aquasec/trivy:0.76.1@sha256:790fd66d1697395d8693d1acaa1ea702406a20f109b6fc7bac8db623eca6c06c
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: composite
|
using: composite
|
||||||
@@ -49,7 +49,11 @@ runs:
|
|||||||
MIN: ${{ inputs.min-components }}
|
MIN: ${{ inputs.min-components }}
|
||||||
TRIVY: ${{ inputs.trivy-image }}
|
TRIVY: ${{ inputs.trivy-image }}
|
||||||
run: |
|
run: |
|
||||||
set -uo pipefail
|
# The runner starts composite bash steps with -e; this script handles
|
||||||
|
# every failure itself (warn, exit 0), so -e only turns an unguarded
|
||||||
|
# command into a failed job - e.g. the cat of a resp.json curl never
|
||||||
|
# wrote when Dependency-Track was unreachable.
|
||||||
|
set +e -uo pipefail
|
||||||
warn() { echo "::warning::SBOM $PROJECT/$VERSION: $*"; exit 0; }
|
warn() { echo "::warning::SBOM $PROJECT/$VERSION: $*"; exit 0; }
|
||||||
[ -n "$REPORT" ] && [ -f "$REPORT" ] || warn "no report (gate skipped?)"
|
[ -n "$REPORT" ] && [ -f "$REPORT" ] || warn "no report (gate skipped?)"
|
||||||
[ -n "$DT_KEY" ] || warn "no API key"
|
[ -n "$DT_KEY" ] || warn "no API key"
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ inputs:
|
|||||||
default: "false"
|
default: "false"
|
||||||
trivy-image:
|
trivy-image:
|
||||||
description: Trivy container image, pinned by digest.
|
description: Trivy container image, pinned by digest.
|
||||||
default: aquasec/trivy:0.75.0@sha256:af6acf9a6b85dfe389a1941505c0ce9efef52a4719635e1a962f022a3d855daa
|
default: aquasec/trivy:0.76.1@sha256:790fd66d1697395d8693d1acaa1ea702406a20f109b6fc7bac8db623eca6c06c
|
||||||
cache-volume:
|
cache-volume:
|
||||||
description: >
|
description: >
|
||||||
Docker named volume for the vulnerability DB. A named volume, not a
|
Docker named volume for the vulnerability DB. A named volume, not a
|
||||||
@@ -77,9 +77,9 @@ runs:
|
|||||||
SCAN_REF: ${{ inputs.scan-ref }}
|
SCAN_REF: ${{ inputs.scan-ref }}
|
||||||
RUNTIME: ${{ inputs.runtime }}
|
RUNTIME: ${{ inputs.runtime }}
|
||||||
SCANNERS: ${{ inputs.scanners }}
|
SCANNERS: ${{ inputs.scanners }}
|
||||||
TRIVY_VERSION: "0.75.0"
|
TRIVY_VERSION: "0.76.1"
|
||||||
TRIVY_SHA256_AMD64: c6e65abddb348e25f10549df887045629cf28cc72453cd1c63acb717316b3f3f
|
TRIVY_SHA256_AMD64: c7cbe3137fb8a48a17574bede3dd6beb16742d1e9772929940fc90082c39d9c0
|
||||||
TRIVY_SHA256_ARM64: a1ee9f6ffb7d112b64ff726a2a0717c21175c1114361391f4a132956751a13b3
|
TRIVY_SHA256_ARM64: e174dff2a6dba5e3ae41f8d0537a6324405bd08132497340304c6b20e0f16a1f
|
||||||
TRIVY_USERNAME: ${{ inputs.username }}
|
TRIVY_USERNAME: ${{ inputs.username }}
|
||||||
TRIVY_PASSWORD: ${{ inputs.password }}
|
TRIVY_PASSWORD: ${{ inputs.password }}
|
||||||
PLATFORM: ${{ inputs.platform }}
|
PLATFORM: ${{ inputs.platform }}
|
||||||
|
|||||||
Reference in new issue
Block a user