Skip to content
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

Jump to bottom

Make local-sandbox output capture symlink oblivious #15211

Closed
wants to merge 1 commit into from
Closed

Make local-sandbox output capture symlink oblivious #15211

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
28 changes: 18 additions & 10 deletions src/rust/engine/process_execution/src/local.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ use async_trait::async_trait;
use bytes::{Bytes, BytesMut};
use fs::{
self, safe_create_dir_all_ioerror, DirectoryDigest, GlobExpansionConjunction, GlobMatching,
PathGlobs, Permissions, RelativePath, StrictGlobMatching, EMPTY_DIRECTORY_DIGEST,
PathGlobs, Permissions, RelativePath, StrictGlobMatching, SymlinkBehavior,
EMPTY_DIRECTORY_DIGEST,
};
use futures::future::{BoxFuture, FutureExt, TryFutureExt};
use futures::stream::{BoxStream, StreamExt, TryStreamExt};
Expand Down Expand Up @@ -504,16 +505,23 @@ pub trait CapturedWorkdir {
} else {
workdir_path.clone()
};
// Use no ignore patterns, because we are looking for explicitly listed paths.
// Use no ignore patterns, because we are looking for explicitly listed paths. Additionally,
// since we do not currently (and likely don't intend to ever) support capturing symlinks
// inside a Digest as symlinks, we set SymlinkBehavior::Oblivious to skip extra syscalls
// related to symlink awareness.
let posix_fs = Arc::new(
fs::PosixFS::new(root, fs::GitignoreStyleExcludes::empty(), executor.clone()).map_err(
|err| {
format!(
"Error making posix_fs to fetch local process execution output files: {}",
err
)
},
)?,
fs::PosixFS::new_with_symlink_behavior(
root,
fs::GitignoreStyleExcludes::empty(),
executor.clone(),
SymlinkBehavior::Oblivious,
)
.map_err(|err| {
format!(
"Error making posix_fs to fetch local process execution output files: {}",
err
)
})?,
);
CommandRunner::construct_output_snapshot(
store.clone(),
Expand Down