Skip to content

fix: add checksum verification and harden archive extraction in CLI self-update #7575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fresh3nough wants to merge 1 commit into from
Closed

fix: add checksum verification and harden archive extraction in CLI self-update #7575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 13 additions & 1 deletion .github/workflows/build-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,12 @@ jobs:
# Create the tar archive
cd "target/${TARGET}/release"
tar -cjf "goose-${TARGET}.tar.bz2" -C goose-package .

# Generate SHA-256 checksum
sha256sum "goose-${TARGET}.tar.bz2" > "goose-${TARGET}.tar.bz2.sha256"

echo "ARTIFACT=target/${TARGET}/release/goose-${TARGET}.tar.bz2" >> $GITHUB_ENV
echo "CHECKSUM=target/${TARGET}/release/goose-${TARGET}.tar.bz2.sha256" >> $GITHUB_ENV

- name: Package CLI (Windows)
if: matrix.os == 'windows'
Expand All @@ -161,10 +166,17 @@ jobs:

cd "target/${TARGET}/release"
7z a -tzip "goose-${TARGET}.zip" goose-package/

# Generate SHA-256 checksum
sha256sum "goose-${TARGET}.zip" > "goose-${TARGET}.zip.sha256"

echo "ARTIFACT=target/${TARGET}/release/goose-${TARGET}.zip" >> $GITHUB_ENV
echo "CHECKSUM=target/${TARGET}/release/goose-${TARGET}.zip.sha256" >> $GITHUB_ENV

- name: Upload CLI artifact
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
with:
name: goose-${{ matrix.architecture }}-${{ matrix.target-suffix }}
path: ${{ env.ARTIFACT }}
path: |
${{ env.ARTIFACT }}
${{ env.CHECKSUM }}
1 change: 1 addition & 0 deletions .github/workflows/canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: |
goose-*.tar.bz2
goose-*.sha256
Goose*.zip
*.deb
*.rpm
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jobs:
artifacts: |
goose-*.tar.bz2
goose-*.zip
goose-*.sha256
Goose*.zip
*.deb
*.rpm
Expand All @@ -125,6 +126,7 @@ jobs:
artifacts: |
goose-*.tar.bz2
goose-*.zip
goose-*.sha256
Goose*.zip
*.deb
*.rpm
Expand Down
37 changes: 36 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions crates/goose-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,11 @@ anstream = "0.6.18"
open = "5.3.2"
urlencoding = "2.1"
clap_complete = "4.5.62"
sha2 = "0.10.9"
flate2 = "1.1.9"
reqwest = { workspace = true, features = ["rustls-tls"] }
zip = { version = "8.1", default-features = false, features = ["deflate"] }
bzip2 = "0.5"

[target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3", features = ["wincred"] }
Expand Down
5 changes: 1 addition & 4 deletions crates/goose-cli/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,10 +1506,7 @@ pub async fn cli() -> anyhow::Result<()> {
Some(Command::Update {
canary,
reconfigure,
}) => {
crate::commands::update::update(canary, reconfigure)?;
Ok(())
}
}) => crate::commands::update::update(canary, reconfigure).await,
Some(Command::Recipe { command }) => handle_recipe_subcommand(command),
Some(Command::Web {
port,
Expand Down
Loading