Skip to content
Open
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
1 change: 1 addition & 0 deletions src/archive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ impl<'a> EntriesFields<'a> {
long_linkname: None,
pax_extensions: None,
mask: self.archive.inner.mask,
mode: None,
unpack_xattrs: self.archive.inner.unpack_xattrs,
preserve_permissions: self.archive.inner.preserve_permissions,
preserve_mtime: self.archive.inner.preserve_mtime,
Expand Down
16 changes: 15 additions & 1 deletion src/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ pub struct EntryFields<'a> {
pub long_linkname: Option<Vec<u8>>,
pub pax_extensions: Option<Vec<u8>>,
pub mask: u32,
pub mode: Option<u32>,
pub header: Header,
pub size: u64,
pub header_pos: u64,
Expand Down Expand Up @@ -246,6 +247,13 @@ impl<'a, R: Read> Entry<'a, R> {
self.fields.mask = mask;
}

/// Set the permission bits when unpacking this entry.
///
/// The mode is unchanged by default.
pub fn set_mode(&mut self, mode: u32) {
self.fields.mode = Some(mode);
}

/// Indicate whether extended file attributes (xattrs on Unix) are preserved
/// when unpacking this entry.
///
Expand Down Expand Up @@ -467,13 +475,16 @@ impl<'a> EntryFields<'a> {
mask: u32,
perms: bool,
ownerships: bool,
mode: Option<u32>,
) -> io::Result<()> {
// ownerships need to be set first to avoid stripping SUID bits in the permissions ...
if ownerships {
set_ownerships(dst, &f, header.uid()?, header.gid()?)?;
}
// ... then set permissions, SUID bits set here is kept
if let Ok(mode) = header.mode() {
if let Some(mode) = mode {
set_perms(dst, f, mode, mask, perms)?;
} else if let Ok(mode) = header.mode() {
set_perms(dst, f, mode, mask, perms)?;
}

Expand Down Expand Up @@ -504,6 +515,7 @@ impl<'a> EntryFields<'a> {
self.mask,
self.preserve_permissions,
self.preserve_ownerships,
self.mode,
)?;
return Ok(Unpacked::__Nonexhaustive);
} else if kind.is_hard_link() || kind.is_symlink() {
Expand Down Expand Up @@ -627,6 +639,7 @@ impl<'a> EntryFields<'a> {
self.mask,
self.preserve_permissions,
self.preserve_ownerships,
self.mode,
)?;
return Ok(Unpacked::__Nonexhaustive);
}
Expand Down Expand Up @@ -703,6 +716,7 @@ impl<'a> EntryFields<'a> {
self.mask,
self.preserve_permissions,
self.preserve_ownerships,
self.mode,
)?;
if self.unpack_xattrs {
set_xattrs(self, dst)?;
Expand Down
Loading