Skip to content

fix CVE-2025-62518 #1235

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

Merged
jhheider merged 3 commits into from
Feb 9, 2026
Merged

fix CVE-2025-62518 #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
939787c
fix CVE-2025-62518
jhheider Feb 9, 2026
5af1623
change needed to preserve permissions in astral-tokio-tar
jhheider Feb 9, 2026
ae82983
Merge branch 'main' into fix-CVE-2025-62518
jhheider Feb 9, 2026
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
76 changes: 31 additions & 45 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion crates/lib/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rusqlite = "0.38.0"
regex = "1.11.1"
reqwest = { version = "0.13", features = ["stream", "blocking"] }
async-compression = { version = "0.4", features = ["tokio", "gzip", "xz"] }
tokio-tar = "0.3.1"
astral-tokio-tar = "0.5.6"
tokio-util = { version = "0.7.13", features = ["compat"] }
futures = "0.3.31"
lazy_static = "1.5.0"
Expand Down
6 changes: 4 additions & 2 deletions crates/lib/src/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use std::{
};
use tempfile::tempdir_in;
use tokio::task;
use tokio_tar::Archive;
use tokio_tar::ArchiveBuilder;

// Compatibility trait lets us call `compat()` on a futures::io::AsyncRead
// to convert it into a tokio::io::AsyncRead.
Expand Down Expand Up @@ -108,7 +108,9 @@ where
let temp_dir = tempdir_in(config.pkgx_dir.join(&pkg.project))?;

// Step 4: Extract the tar archive
let mut archive = Archive::new(decoder);
let mut archive = ArchiveBuilder::new(decoder)
.set_preserve_permissions(true)
.build();
archive.unpack(&temp_dir).await?;

// Step 5: atomically move from temp dir to installation location
Expand Down
6 changes: 4 additions & 2 deletions crates/lib/src/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use fs2::FileExt;
use futures::TryStreamExt;
use rusqlite::Connection;
use std::{error::Error, fs::OpenOptions, path::PathBuf};
use tokio_tar::Archive;
use tokio_tar::ArchiveBuilder;
use tokio_util::compat::FuturesAsyncReadCompatExt;

#[allow(clippy::all)]
Expand Down Expand Up @@ -64,7 +64,9 @@ async fn download_and_extract_pantry(url: &str, dest: &PathBuf) -> Result<(), Bo
let decoder = XzDecoder::new(stream);

// Step 3: Extract the tar archive
let mut archive = Archive::new(decoder);
let mut archive = ArchiveBuilder::new(decoder)
.set_preserve_permissions(true)
.build();
archive.unpack(dest).await?;

Ok(())
Expand Down