Skip to content

fix(security): prevent untarring outside expected path #5279

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
jdx merged 1 commit into from
Jun 4, 2025
Merged

fix(security): prevent untarring outside expected path #5279

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
2 changes: 1 addition & 1 deletion cliff.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ commit_parsers = [
{ message = '^chore: (release|Release)', skip = true },
{ message = '^Release', skip = true },
{ message = "^Merge commit", skip = true },
{ body = '.*security', group = "<!-- 08 -->🛡️ Security" },
{ message = '^(chore|fix)\(deps\):', group = "<!-- 99 -->📦️ Dependency Updates", scope = "" },
{ message = '^(chore|fix)\(security\):', group = "<!-- 08 -->🛡️ Security" },
{ message = '^feat', group = "<!-- 00 -->🚀 Features" },
{ message = '^fix', group = "<!-- 01 -->🐛 Bug Fixes" },
{ message = '^refactor', group = "<!-- 02 -->🚜 Refactor" },
Expand Down
6 changes: 4 additions & 2 deletions src/file.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use eyre::bail;
use filetime::{FileTime, set_file_times};
use flate2::read::GzDecoder;
use itertools::Itertools;
use path_absolutize::Absolutize;
use std::sync::LazyLock as Lazy;
use tar::Archive;
use walkdir::WalkDir;
Expand Down Expand Up @@ -719,8 +720,9 @@ pub fn untar(archive: &Path, dest: &Path, opts: &TarOptions) -> Result<()> {
.components()
.skip(opts.strip_components)
.filter(|c| c.as_os_str() != ".")
.collect();
let path = dest.join(path);
.collect::<PathBuf>()
.absolutize_virtually(dest)?
.to_path_buf();
create_dir_all(path.parent().unwrap()).wrap_err_with(err)?;
trace!("extracting {}", display_path(&path));
entry.unpack(&path).wrap_err_with(err)?;
Expand Down
Loading