Skip to content

Commit

Permalink
Auto merge of rust-lang#116127 - onur-ozkan:sanity-checks-on-install,…
Browse files Browse the repository at this point in the history
… r=Mark-Simulacrum

add sanity checks for user write access on `x install`

Resolves rust-lang#113580
  • Loading branch information
bors committed Sep 30, 2023
2 parents 05c6221 + 350ead8 commit bb6c66b
Showing 1 changed file with 31 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/bootstrap/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,23 @@ fn sanitize_sh(path: &Path) -> String {
}
}

fn is_dir_writable_for_user(dir: &PathBuf) -> bool {
let tmp_file = dir.join(".tmp");
match fs::File::create(&tmp_file) {
Ok(_) => {
fs::remove_file(tmp_file).unwrap();
true
}
Err(e) => {
if e.kind() == std::io::ErrorKind::PermissionDenied {
false
} else {
panic!("Failed the write access check for the current user. {}", e);
}
}
}
}

fn install_sh(
builder: &Builder<'_>,
package: &str,
Expand All @@ -56,6 +73,17 @@ fn install_sh(

let prefix = default_path(&builder.config.prefix, "/usr/local");
let sysconfdir = prefix.join(default_path(&builder.config.sysconfdir, "/etc"));

// Sanity check for the user write access on prefix and sysconfdir
assert!(
is_dir_writable_for_user(&prefix),
"User doesn't have write access on `install.prefix` path in the `config.toml`.",
);
assert!(
is_dir_writable_for_user(&sysconfdir),
"User doesn't have write access on `install.sysconfdir` path in `config.toml`."
);

let datadir = prefix.join(default_path(&builder.config.datadir, "share"));
let docdir = prefix.join(default_path(&builder.config.docdir, "share/doc/rust"));
let mandir = prefix.join(default_path(&builder.config.mandir, "share/man"));
Expand Down Expand Up @@ -92,6 +120,9 @@ fn prepare_dir(mut path: PathBuf) -> String {
// More information on the environment variable is available here:
// https://www.gnu.org/prep/standards/html_node/DESTDIR.html
if let Some(destdir) = env::var_os("DESTDIR").map(PathBuf::from) {
// Sanity check for the user write access on DESTDIR
assert!(is_dir_writable_for_user(&destdir), "User doesn't have write access on DESTDIR.");

let without_destdir = path.clone();
path = destdir;
// Custom .join() which ignores disk roots.
Expand Down

0 comments on commit bb6c66b

Please sign in to comment.