Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions .github/workflows/audit-release-gate-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Audit Release Gate Tests

on:
pull_request:
paths:
- '.github/workflows/audit-release-gate-tests.yml'
- '.github/workflows/publish.yml'
- '.github/workflows/release-datadog-serverless-compat.yml'
- '.github/workflows/build-datadog-serverless-compat.yml'
- 'Cargo.lock'
- '.cargo/audit.toml'
Comment on lines +10 to +11

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 LOW: None of the offline tests read the repository's Cargo.lock or .cargo/audit.toml. test_release_gate.py and network_smoke.py write their own fixture copies, and test_workflows.py only parses workflow YAML. Because of these two path triggers, the suite runs on every lockfile or Dependabot PR without testing anything new. Suggest dropping both entries.

- 'scripts/cargo-audit-release-gate.sh'
- 'scripts/cargo-audit-report-guard.sh'
- 'scripts/tests/audit-release-gate/**'
workflow_dispatch:
inputs:
network_smoke:
description: 'Also run the opt-in real-scanner network smoke suite'
required: false
type: boolean
default: false

# Read-only: this check never publishes, signs, or uploads anything.
permissions:
contents: read

jobs:
offline:
name: Offline gate tests
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
with:
python-version: '3.12'
- name: Install test-only dependencies
run: python3 -m pip install --disable-pip-version-check 'PyYAML==6.0.2'
- name: Run deterministic offline gate tests
run: |
python3 -m unittest discover -v -s scripts/tests/audit-release-gate -p 'test_*.py'

network-smoke:
name: Opt-in real-scanner smoke
if: ${{ github.event_name == 'workflow_dispatch' && inputs.network_smoke }}
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
with:
cache: false
- name: Run real scanner download, checksum, refresh, and scan
run: python3 scripts/tests/audit-release-gate/network_smoke.py
15 changes: 10 additions & 5 deletions .github/workflows/build-datadog-serverless-compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ jobs:
RUSTC_WRAPPER: "sccache"
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.sha }}
- uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
with:
cache: false
Expand All @@ -27,6 +29,8 @@ jobs:
runs-on: ${{ inputs.runner }}
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.sha }}
- name: Install Protoc Binary
shell: bash
run: chmod +x ./scripts/install-protoc.sh && ./scripts/install-protoc.sh $HOME
Expand All @@ -35,7 +39,7 @@ jobs:
run: |
sudo apt-get update
rustup target add x86_64-unknown-linux-musl && sudo apt-get install -y musl-tools
cargo build --release -p datadog-serverless-compat --target x86_64-unknown-linux-musl
cargo build --release -p datadog-serverless-compat --target x86_64-unknown-linux-musl --locked
- if: ${{ inputs.runner == 'ubuntu-24.04' }}
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
with:
Expand All @@ -47,7 +51,7 @@ jobs:
run: |
sudo apt-get update
rustup target add aarch64-unknown-linux-musl && sudo apt-get install -y musl-tools
cargo build --release -p datadog-serverless-compat --target aarch64-unknown-linux-musl
cargo build --release -p datadog-serverless-compat --target aarch64-unknown-linux-musl --locked
- if: ${{ inputs.runner == 'ubuntu-24.04-arm' }}
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
with:
Expand All @@ -56,7 +60,7 @@ jobs:
retention-days: 3
- if: ${{ inputs.runner == 'windows-2022' }}
shell: bash
run: cargo build --release -p datadog-serverless-compat --features windows-pipes,windows-enhanced-metrics
run: cargo build --release -p datadog-serverless-compat --features windows-pipes,windows-enhanced-metrics --locked
- if: ${{ inputs.runner == 'windows-2022' }}
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
with:
Expand All @@ -69,7 +73,8 @@ jobs:
rustup target add i686-pc-windows-msvc
cargo build --release -p datadog-serverless-compat \
--target i686-pc-windows-msvc \
--features windows-pipes,windows-enhanced-metrics
--features windows-pipes,windows-enhanced-metrics \
--locked
- if: ${{ inputs.runner == 'windows-2022' }}
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
with:
Expand All @@ -78,7 +83,7 @@ jobs:
retention-days: 3
- if: ${{ inputs.runner == 'macos-14' }}
shell: bash
run: cargo build --release -p datadog-serverless-compat
run: cargo build --release -p datadog-serverless-compat --locked
- if: ${{ inputs.runner == 'macos-14' }}
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # 4.6.2
with:
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ on:
type: string

permissions:
contents: read # Read-only checkout of the audited source revision
id-token: write # For OIDC npm publishing with provenance

jobs:
Expand All @@ -35,6 +36,7 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.sha }}
sparse-checkout: npm
sparse-checkout-cone-mode: false
- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
Expand Down Expand Up @@ -109,6 +111,11 @@ jobs:
environment: Production
needs: package
steps:
- name: Check out the audited source revision
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.sha }}
path: source

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 LOW: Same pattern as the release workflow. The token here is only contents: read, but the job also holds id-token: write, so keep its footprint minimal: add persist-credentials: false to this checkout. The package job's sparse checkout could take the same change, though it isn't part of this diff.

- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
with:
name: npm-packages
Expand All @@ -117,6 +124,13 @@ jobs:
with:
node-version: "22.x"
registry-url: 'https://registry.npmjs.org'
- name: Install Rust toolchain for cargo-audit
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
with:
cache: false
- name: Strict cargo-audit release gate
working-directory: source
run: ./scripts/cargo-audit-release-gate.sh "$GITHUB_SHA"

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 LOW: Merge sequencing. The Audit check already fails on this PR because of the zstd advisories. After merge, the next Build and Publish run fails, and it only fails after someone approves the Production environment. The next release run (release-datadog-serverless-compat.yml:39) fails the same way. That's the intended behavior, but consider landing the zstd remediation (or a reviewed ignore) first, or telling release owners that publication stays blocked until it lands.

- name: Publish npm packages
run: |
npm publish ./npm/datadog-serverless-compat-linux-x64 --provenance --access public
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/release-datadog-serverless-compat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,24 @@ jobs:
permissions:
contents: write
steps:
- name: Check out the audited source revision
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ref: ${{ github.sha }}
path: source

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟡 MEDIUM: actions/checkout persists credentials by default, so this job's contents: write token gets written to source/.git/config before the gate downloads and runs cargo-audit in that same repo. setup-rust-toolchain and softprops/action-gh-release also run later in this job. The checkout only feeds Cargo.lock/audit.toml and git rev-parse/git show, and none of those need a token.

Suggested fix:

        with:
          ref: ${{ github.sha }}
          path: source
          persist-credentials: false

(zizmor's artipacked rule flags this pattern.)

- uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # 4.3.0
with:
path: target/bin
- run: |
chmod +x target/bin/linux-amd64/datadog-serverless-compat
chmod +x target/bin/windows-amd64/datadog-serverless-compat.exe
- name: Install Rust toolchain for cargo-audit
uses: actions-rust-lang/setup-rust-toolchain@9399c7bb15d4c7d47b27263d024f0a4978346ba4 # v1.11.0
with:
cache: false
- name: Strict cargo-audit release gate
working-directory: source
run: ./scripts/cargo-audit-release-gate.sh "$GITHUB_SHA"
- run: zip -r datadog-serverless-compat.zip ./*
working-directory: target
- uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
Expand Down
202 changes: 202 additions & 0 deletions scripts/cargo-audit-release-gate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
#!/usr/bin/env bash
#
# Strict cargo-audit release gate for datadog-serverless-compat publication.
#
# Usage: scripts/cargo-audit-release-gate.sh <expected-git-sha>
#
# Run this gate inside a protected publication job, immediately before its first
# publication side effect. It performs downloads and a dependency scan only:
# it never publishes, signs, uploads, or pushes anything.
#
# The gate fails closed unless every one of these holds:
# * the repository root is the expected commit (usually $GITHUB_SHA);
# * the working-tree Cargo.lock and .cargo/audit.toml byte-match that commit,
# so the audited lockfile and advisory policy cannot be swapped out;
# * a working Rust toolchain is present, because the pinned prebuilt
# cargo-audit still shells out to `cargo -V`;
# * the pinned official cargo-audit 0.22.2 (Linux x86_64 musl) archive
# downloads (bounded by curl's --connect-timeout 15 and --max-time 180) and
# matches its reviewed SHA-256;
# * the installed binary reports exactly the expected version;
# * a fresh RustSec advisory database and a fresh Cargo cache are created in a
# private temporary directory, so a warm cache can never turn a failed
# advisory refresh into an offline success;
# * the scanner runs under coreutils timeout (--kill-after=10s, 5m) and exits
# zero, the terminal log shows the full Fetching/Loaded/Updating/Scanning
# sequence with nonzero advisory and dependency counts for the expected
# lockfile, and the log carries none of the crates.io index diagnostics the
# pinned binary can otherwise hide behind a zero exit status. See
# scripts/cargo-audit-report-guard.sh.
#
# The archive URL, digest, scanner version, and advisory database URL are fixed
# reviewed constants. This script deliberately honors no environment variable
# that could point it at a different archive, digest, or advisory source, and it
# passes no --no-fetch, --stale, or extra ignore flags. All exceptions come from
# the repository's reviewed .cargo/audit.toml.
set -euo pipefail

readonly SCANNER_VERSION_LINE="cargo-audit-audit 0.22.2"
readonly ARCHIVE_URL="https://github.com/rustsec/rustsec/releases/download/cargo-audit/v0.22.2/cargo-audit-x86_64-unknown-linux-musl-v0.22.2.tgz"
readonly ARCHIVE_SHA256="7fb9497f8594b389e5fce5ef9b92db08432996895b2e0c5a0167a69ed445c428"
readonly ADVISORY_DB_URL="https://github.com/RustSec/advisory-db.git"

script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
readonly script_dir
readonly GUARD_SCRIPT="${script_dir}/cargo-audit-report-guard.sh"

die() {
printf 'cargo-audit release gate: ERROR: %s\n' "$*" >&2
exit 2
}

fail() {
printf 'cargo-audit release gate: FAILED: %s\n' "$*" >&2
exit 1
}

if [ "$#" -ne 1 ]; then
die "usage: $0 <expected-git-sha>"
fi

expected_sha="$1"
if ! [[ "$expected_sha" =~ ^([0-9a-f]{40}|[0-9a-f]{64})$ ]]; then
die "expected commit must be a 40- or 64-character lowercase hex id"
fi

[ -x "$GUARD_SCRIPT" ] || fail "report guard is missing or not executable: $GUARD_SCRIPT"

for tool in git cargo curl tar sha256sum cut timeout; do
command -v "$tool" >/dev/null 2>&1 || die "required tool not found on PATH: $tool"
done

cargo_version="$(cargo -V 2>&1)" || die "cargo -V failed; a working Rust toolchain must be installed before this gate"

repo_root="$(git rev-parse --show-toplevel 2>/dev/null)" || die "not inside a git work tree"
cd "$repo_root"

head_sha="$(git rev-parse HEAD)" || die "cannot resolve HEAD"

lockfile="$repo_root/Cargo.lock"
policy="$repo_root/.cargo/audit.toml"
[ -f "$lockfile" ] || fail "missing Cargo.lock at repository root"
[ -f "$policy" ] || fail "missing .cargo/audit.toml at repository root"

if [ "$head_sha" != "$expected_sha" ]; then
fail "HEAD ($head_sha) does not match expected release commit ($expected_sha)"
fi

# Bind the audited inputs to the expected commit, not to the working tree alone.
if ! expected_lock_hash="$(git show "${expected_sha}:Cargo.lock" | sha256sum | cut -d' ' -f1)"; then
fail "cannot read Cargo.lock from expected commit $expected_sha"
fi
actual_lock_hash="$(sha256sum "$lockfile" | cut -d' ' -f1)"
if [ "$expected_lock_hash" != "$actual_lock_hash" ]; then
fail "working-tree Cargo.lock does not match the expected commit"
fi

if ! expected_policy_hash="$(git show "${expected_sha}:.cargo/audit.toml" | sha256sum | cut -d' ' -f1)"; then
fail "cannot read .cargo/audit.toml from expected commit $expected_sha"
fi
actual_policy_hash="$(sha256sum "$policy" | cut -d' ' -f1)"
if [ "$expected_policy_hash" != "$actual_policy_hash" ]; then
fail "working-tree .cargo/audit.toml does not match the expected commit"
fi

work="$(mktemp -d "${TMPDIR:-/tmp}/cargo-audit-release-gate.XXXXXXXX")" || die "cannot create a temporary directory"
readonly work
# Single quotes defer expansion to EXIT so the cleanup always targets this run's
# directory without interpolating it into a fragile command string.
trap 'rm -rf -- "$work"' EXIT

archive="$work/cargo-audit.tgz"
install_dir="$work/install"
mkdir -p "$install_dir"

if ! curl --fail --silent --show-error --location --proto '=https' \
--connect-timeout 15 --max-time 180 --output "$archive" "$ARCHIVE_URL"; then
fail "failed to download the pinned cargo-audit archive"
fi

archive_hash="$(sha256sum "$archive" | cut -d' ' -f1)"
if [ "$archive_hash" != "$ARCHIVE_SHA256" ]; then
fail "pinned cargo-audit archive checksum mismatch"
fi

if ! tar -xzf "$archive" -C "$install_dir" --strip-components=1; then
fail "failed to extract the pinned cargo-audit archive"
fi

scanner="$install_dir/cargo-audit"
[ -x "$scanner" ] || fail "extracted archive does not contain an executable cargo-audit"

scanner_version="$("$scanner" audit --version 2>&1)" || fail "cannot execute the installed cargo-audit"
if [ "$scanner_version" != "$SCANNER_VERSION_LINE" ]; then
fail "unexpected cargo-audit version: '$scanner_version' (expected '$SCANNER_VERSION_LINE')"
fi

# Fresh advisory database and fresh Cargo cache on every execution. Nothing from
# a previous run, job, or retry is reused, so a stale cache cannot authorize a
# release when the required refresh fails.
cargo_home="$work/cargo-home"
mkdir -p "$cargo_home"
db="$work/rustsec-db"
scan_log="$work/cargo-audit.log"

# The scan is bounded by coreutils timeout: 5 minutes of runtime, then a 10
# second grace before SIGKILL. A killed scan exits 124 (SIGTERM) or 137
# (SIGKILL); both are nonzero and are rejected by the report guard below.
scan_rc=0
CARGO_HOME="$cargo_home" timeout --kill-after=10s 5m "$scanner" audit \
--file "$lockfile" \
--db "$db" \
--url "$ADVISORY_DB_URL" \
--format terminal \
--color never >"$scan_log" 2>&1 || scan_rc=$?

db_origin="unavailable"
db_revision="unavailable"
if [ -d "$db/.git" ]; then
db_origin="$(git -C "$db" remote get-url origin 2>/dev/null || printf 'unavailable')"
db_revision="$(git -C "$db" rev-parse HEAD 2>/dev/null || printf 'unavailable')"
fi

printf 'cargo-audit release gate\n'
printf 'expected-sha: %s\n' "$expected_sha"
printf 'head-sha: %s\n' "$head_sha"
printf 'cargo-lock-sha256: %s\n' "$actual_lock_hash"
printf 'audit-toml-sha256: %s\n' "$actual_policy_hash"
printf 'cargo-version: %s\n' "$cargo_version"
printf 'scanner-version: %s\n' "$scanner_version"
printf 'advisory-db-url: %s\n' "$ADVISORY_DB_URL"
printf 'advisory-db-origin: %s\n' "$db_origin"
printf 'advisory-db-revision: %s\n' "$db_revision"
printf 'scanner-exit: %s\n' "$scan_rc"

printf '%s\n' '----- begin cargo-audit output -----'
if ! cat "$scan_log"; then
fail "cannot read the cargo-audit scan log: $scan_log"
fi
printf '%s\n' '----- end cargo-audit output -----'

guard_rc=0
"$GUARD_SCRIPT" "$scan_log" "$scan_rc" "$lockfile" || guard_rc=$?
case "$guard_rc" in
0 | 1) ;;
*) fail "report guard returned an unexpected status ($guard_rc); treating as failure" ;;
esac

if [ "$guard_rc" -ne 0 ]; then
printf 'cargo-audit release gate: result: FAIL (scanner-exit=%s)\n' "$scan_rc" >&2
if [ "$scan_rc" -ne 0 ]; then
# Preserve the scanner's own status for rejected findings and errors.
exit "$scan_rc"
fi
exit 1
fi

if [ "$db_origin" != "$ADVISORY_DB_URL" ]; then
fail "unexpected advisory database origin: '$db_origin'"
fi

printf 'cargo-audit release gate: result: PASS\n'
exit 0
Loading
Loading