From 53bb2a471d19f60a684cce0bc4c4622823033bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Almeida?= Date: Sun, 3 May 2026 22:17:24 +0100 Subject: [PATCH] fix: address second-round PR review (cleanup traps, host-key pinning, supply chain) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Latest review (Claude + Greptile) flagged three security/cleanup items on top of the previous fix commit. All three addressed below. publish-npm.sh: - Add `trap 'rm -rf "$WORK_DIR"' EXIT` immediately after `mktemp -d` so the tmpdir is cleaned up even when `pnpm build` or `npm publish` fails partway through (set -e would otherwise abort before the explicit rm at the end). - Remove redundant `pnpm build` before `npm publish` — the `prepublishOnly` script in package.json already runs the build. update-homebrew-tap.sh: - Combine `cleanup_ssh` + WORK_DIR cleanup into one EXIT trap so `git clone` / `git push` failures don't leak the tmpdir. - Pin GitHub's published SSH host keys (ed25519, ECDSA, RSA) into a temp `known_hosts` file instead of using `accept-new` + `/dev/null`. This closes the "trust any host key on first connect" gap. The pinned keys come from https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints. release.yml: - Replace the curl|tar git-cliff install with `orhun/git-cliff-action@v4` (already used in publish-release). The action pins to a digest, so we no longer need to verify a tarball checksum manually. Removes a supply-chain attack surface where a tampered git-cliff binary could run during `prepare` (which has contents:write + pull-requests:write). --- .github/workflows/release.yml | 14 ++++------- scripts/release/publish-npm.sh | 9 +++----- scripts/release/update-homebrew-tap.sh | 32 +++++++++++++++++--------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 432e8d2066..275b454fac 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -66,13 +66,6 @@ jobs: with: node-version: "24" - - name: Install git-cliff - run: | - curl -sSL "https://github.com/orhun/git-cliff/releases/download/v2.6.1/git-cliff-2.6.1-x86_64-unknown-linux-gnu.tar.gz" \ - | tar -xz -C /tmp - sudo mv /tmp/git-cliff-2.6.1/git-cliff /usr/local/bin/ - git-cliff --version - - name: Configure git identity run: | git config user.email "release-bot@kandev" @@ -155,9 +148,12 @@ jobs: pnpm -C apps install --no-frozen-lockfile - name: Generate CHANGELOG + uses: orhun/git-cliff-action@v4 + with: + config: cliff.toml + args: --tag ${{ steps.compute.outputs.tag }} env: - TAG: ${{ steps.compute.outputs.tag }} - run: git-cliff --tag "$TAG" -o CHANGELOG.md + OUTPUT: CHANGELOG.md - name: Create release PR + merge + tag (or dry-run) if: ${{ !inputs.dry_run }} diff --git a/scripts/release/publish-npm.sh b/scripts/release/publish-npm.sh index 9e17f28919..c5dc45cd78 100755 --- a/scripts/release/publish-npm.sh +++ b/scripts/release/publish-npm.sh @@ -54,6 +54,7 @@ log_ok "All 5 platform assets present in GitHub release $TAG" # -- Download release assets for packaging ------------------------------------ WORK_DIR="$(mktemp -d)" +trap 'rm -rf "$WORK_DIR"' EXIT ASSETS_DIR="$WORK_DIR/assets" mkdir -p "$ASSETS_DIR" @@ -155,17 +156,13 @@ echo echo "$(bold "Publishing kandev@$VERSION...")" ( cd "$ROOT_DIR/apps/cli" - # Build before publishing - pnpm build + # `prepublishOnly` (in package.json) runs `pnpm build` automatically. npm publish --access public --provenance ) log_ok "kandev@$VERSION published" -# -- Cleanup ------------------------------------------------------------------ - -rm -rf "$WORK_DIR" - # -- Report ------------------------------------------------------------------- +# (WORK_DIR cleanup happens via the EXIT trap above.) echo echo "$(green "$(bold "All npm packages published successfully!")")" diff --git a/scripts/release/update-homebrew-tap.sh b/scripts/release/update-homebrew-tap.sh index f337707960..3cdfbdb5a9 100755 --- a/scripts/release/update-homebrew-tap.sh +++ b/scripts/release/update-homebrew-tap.sh @@ -40,14 +40,17 @@ die() { # -- Determine clone strategy: deploy key (SSH) or gh (HTTPS) ----------------- CLONE_METHOD="gh" +WORK_DIR="$(mktemp -d)" +TAP_DIR="$WORK_DIR/tap" SSH_KEY_FILE="" -SSH_WRAPPER="" +KNOWN_HOSTS_FILE="" -cleanup_ssh() { +cleanup() { [[ -n "${SSH_KEY_FILE:-}" && -f "$SSH_KEY_FILE" ]] && rm -f "$SSH_KEY_FILE" - [[ -n "${SSH_WRAPPER:-}" && -f "$SSH_WRAPPER" ]] && rm -f "$SSH_WRAPPER" + [[ -n "${KNOWN_HOSTS_FILE:-}" && -f "$KNOWN_HOSTS_FILE" ]] && rm -f "$KNOWN_HOSTS_FILE" + [[ -n "${WORK_DIR:-}" && -d "$WORK_DIR" ]] && rm -rf "$WORK_DIR" } -trap cleanup_ssh EXIT +trap cleanup EXIT if [[ -n "${HOMEBREW_TAP_DEPLOY_KEY:-}" ]]; then CLONE_METHOD="ssh" @@ -59,8 +62,18 @@ if [[ -n "${HOMEBREW_TAP_DEPLOY_KEY:-}" ]]; then if [[ "$(tail -c1 "$SSH_KEY_FILE")" != "" ]]; then echo "" >> "$SSH_KEY_FILE" fi - export GIT_SSH_COMMAND="ssh -i $SSH_KEY_FILE -o IdentitiesOnly=yes -o StrictHostKeyChecking=accept-new -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR" - log "Using SSH deploy key for tap auth" + + # Pin GitHub's published SSH host keys so we don't trust whatever key the + # remote presents. Source: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/githubs-ssh-key-fingerprints + KNOWN_HOSTS_FILE="$(mktemp)" + chmod 600 "$KNOWN_HOSTS_FILE" + cat > "$KNOWN_HOSTS_FILE" <<'EOF' +github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl +github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg= +github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= +EOF + export GIT_SSH_COMMAND="ssh -i $SSH_KEY_FILE -o IdentitiesOnly=yes -o StrictHostKeyChecking=yes -o UserKnownHostsFile=$KNOWN_HOSTS_FILE -o LogLevel=ERROR" + log "Using SSH deploy key for tap auth (pinned github.com host keys)" fi # -- Fetch sha256 values from GitHub release ---------------------------------- @@ -84,9 +97,7 @@ SHA_LINUX_X64="$(fetch_sha256 linux-x64)" log_ok "sha256 values retrieved" # -- Clone tap repo ----------------------------------------------------------- - -WORK_DIR="$(mktemp -d)" -TAP_DIR="$WORK_DIR/tap" +# (WORK_DIR and TAP_DIR were created near the top so the EXIT trap covers them.) log "Cloning $TAP_REPO..." if [[ "$CLONE_METHOD" == "ssh" ]]; then @@ -162,7 +173,6 @@ git add Formula/kandev.rb if git diff --cached --quiet; then log "Formula unchanged — nothing to commit" - rm -rf "$WORK_DIR" exit 0 fi @@ -186,5 +196,5 @@ else log_ok "PR opened in $TAP_REPO" fi -rm -rf "$WORK_DIR" +# WORK_DIR cleanup happens via the EXIT trap. echo "$(green "$(bold "Homebrew tap updated to $VERSION!")")"