fs_mistrust/dir.rs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637
//! Implement a wrapper for access to the members of a directory whose status
//! we've checked.
use std::{
fs::{File, Metadata, OpenOptions},
io::{self, Read, Write},
path::{Path, PathBuf},
};
use crate::{walk::PathType, Error, Mistrust, Result, Verifier};
#[cfg(target_family = "unix")]
use std::os::unix::fs::OpenOptionsExt;
/// A directory whose access properties we have verified, along with accessor
/// functions to access members of that directory.
///
/// The accessor functions will enforce that whatever security properties we
/// checked on the directory also apply to all of the members that we access
/// within the directory.
///
/// ## Limitations
///
/// Having a `CheckedDir` means only that, at the time it was created, we were
/// confident that no _untrusted_ user could access it inappropriately. It is
/// still possible, after the `CheckedDir` is created, that a _trusted_ user can
/// alter its permissions, make its path point somewhere else, or so forth.
///
/// If this kind of time-of-use/time-of-check issue is unacceptable, you may
/// wish to look at other solutions, possibly involving `openat()` or related
/// APIs.
///
/// See also the crate-level [Limitations](crate#limitations) section.
#[derive(Debug, Clone)]
pub struct CheckedDir {
/// The `Mistrust` object whose rules we apply to members of this directory.
mistrust: Mistrust,
/// The location of this directory, in its original form.
location: PathBuf,
/// The "readable_okay" flag that we used to create this CheckedDir.
readable_okay: bool,
}
impl CheckedDir {
/// Create a CheckedDir.
pub(crate) fn new(verifier: &Verifier<'_>, path: &Path) -> Result<Self> {
let mut mistrust = verifier.mistrust.clone();
// Ignore the path that we already verified. Since ignore_prefix
// canonicalizes the path, we _will_ recheck the directory if it starts
// pointing to a new canonical location. That's probably a feature.
//
// TODO:
// * If `path` is a prefix of the original ignored path, this will
// make us ignore _less_.
mistrust.ignore_prefix = crate::canonicalize_opt_prefix(&Some(Some(path.to_path_buf())))?;
Ok(CheckedDir {
mistrust,
location: path.to_path_buf(),
readable_okay: verifier.readable_okay,
})
}
/// Construct a new directory within this CheckedDir, if it does not already
/// exist.
///
/// `path` must be a relative path to the new directory, containing no `..`
/// components.
pub fn make_directory<P: AsRef<Path>>(&self, path: P) -> Result<()> {
let path = path.as_ref();
self.check_path(path)?;
self.verifier().make_directory(self.location.join(path))
}
/// Construct a new `CheckedDir` within this `CheckedDir`
///
/// Creates the directory if it does not already exist.
///
/// `path` must be a relative path to the new directory, containing no `..`
/// components.
pub fn make_secure_directory<P: AsRef<Path>>(&self, path: P) -> Result<CheckedDir> {
let path = path.as_ref();
self.make_directory(path)?;
// TODO I think this rechecks parents, but it need not, since we already did that.
self.verifier().secure_dir(self.location.join(path))
}
/// Open a file within this CheckedDir, using a set of [`OpenOptions`].
///
/// `path` must be a relative path to the new directory, containing no `..`
/// components. We check, but do not create, the file's parent directories.
/// We check the file's permissions after opening it. If the file already
/// exists, it must not be a symlink.
///
/// If the file is created (and this is a unix-like operating system), we
/// always create it with mode `600`, regardless of any mode options set in
/// `options`.
pub fn open<P: AsRef<Path>>(&self, path: P, options: &OpenOptions) -> Result<File> {
let path = path.as_ref();
self.check_path(path)?;
let path = self.location.join(path);
if let Some(parent) = path.parent() {
self.verifier().check(parent)?;
}
#[allow(unused_mut)]
let mut options = options.clone();
#[cfg(target_family = "unix")]
{
// By default, create all files mode 600, no matter what
// OpenOptions said.
// TODO: Give some way to override this to 640 or 0644 if you
// really want to.
options.mode(0o600);
// Don't follow symlinks out of the secured directory.
options.custom_flags(libc::O_NOFOLLOW);
}
let file = options
.open(&path)
.map_err(|e| Error::io(e, &path, "open file"))?;
let meta = file.metadata().map_err(|e| Error::inspecting(e, &path))?;
if let Some(error) = self
.verifier()
.check_one(path.as_path(), PathType::Content, &meta)
.into_iter()
.next()
{
Err(error)
} else {
Ok(file)
}
}
/// List the contents of a directory within this [`CheckedDir`].
///
/// `path` must be a relative path, containing no `..` components. Before
/// listing the directory, we verify that that no untrusted user is able
/// change its contents or make it point somewhere else.
///
/// The return value is an iterator as returned by [`std::fs::ReadDir`]. We
/// _do not_ check any properties of the elements of this iterator.
pub fn read_directory<P: AsRef<Path>>(&self, path: P) -> Result<std::fs::ReadDir> {
let path = path.as_ref();
self.check_path(path)?;
let path = self.location.join(path);
self.verifier().check(&path)?;
std::fs::read_dir(&path).map_err(|e| Error::io(e, path, "read directory"))
}
/// Remove a file within this [`CheckedDir`].
///
/// `path` must be a relative path, containing no `..` components.
///
/// Note that we ensure that the _parent_ of the file to be removed is
/// unmodifiable by any untrusted user, but we do not check any permissions
/// on the file itself, since those are irrelevant to removing it.
pub fn remove_file<P: AsRef<Path>>(&self, path: P) -> Result<()> {
let path = path.as_ref();
self.check_path(path)?;
let path = self.location.join(path);
// We insist that the ownership and permissions on everything up to and
// including the _parent_ of the path that we are removing have to be
// correct. (If it were otherwise, we could be tricked into removing
// the wrong thing.) But we don't care about the permissions on file we
// are removing.
if let Some(parent) = path.parent() {
self.verifier().check(parent)?;
}
std::fs::remove_file(&path).map_err(|e| Error::io(e, path, "remove file"))
}
/// Return a reference to this directory as a [`Path`].
///
/// Note that this function lets you work with a broader collection of
/// functions, including functions that might let you access or create a
/// file that is accessible by non-trusted users. Be careful!
pub fn as_path(&self) -> &Path {
self.location.as_path()
}
/// Return a new [`PathBuf`] containing this directory's path, with `path`
/// appended to it.
///
/// Return an error if `path` has any components that could take us outside
/// of this directory.
pub fn join<P: AsRef<Path>>(&self, path: P) -> Result<PathBuf> {
let path = path.as_ref();
self.check_path(path)?;
Ok(self.location.join(path))
}
/// Read the contents of the file at `path` within this directory, as a
/// String, if possible.
///
/// Return an error if `path` is absent, if its permissions are incorrect,
/// if it has any components that could take us outside of this directory,
/// or if its contents are not UTF-8.
pub fn read_to_string<P: AsRef<Path>>(&self, path: P) -> Result<String> {
let path = path.as_ref();
let mut file = self.open(path, OpenOptions::new().read(true))?;
let mut result = String::new();
file.read_to_string(&mut result)
.map_err(|e| Error::io(e, path, "read file"))?;
Ok(result)
}
/// Read the contents of the file at `path` within this directory, as a
/// vector of bytes, if possible.
///
/// Return an error if `path` is absent, if its permissions are incorrect,
/// or if it has any components that could take us outside of this
/// directory.
pub fn read<P: AsRef<Path>>(&self, path: P) -> Result<Vec<u8>> {
let path = path.as_ref();
let mut file = self.open(path, OpenOptions::new().read(true))?;
let mut result = Vec::new();
file.read_to_end(&mut result)
.map_err(|e| Error::io(e, path, "read file"))?;
Ok(result)
}
/// Store `contents` into the file located at `path` within this directory.
///
/// We won't write to `path` directly: instead, we'll write to a temporary
/// file in the same directory as `path`, and then replace `path` with that
/// temporary file if we were successful. (This isn't truly atomic on all
/// file systems, but it's closer than many alternatives.)
///
/// # Limitations
///
/// This function will clobber any existing files with the same name as
/// `path` but with the extension `tmp`. (That is, if you are writing to
/// "foo.txt", it will replace "foo.tmp" in the same directory.)
///
/// This function may give incorrect behavior if multiple threads or
/// processes are writing to the same file at the same time: it is the
/// programmer's responsibility to use appropriate locking to avoid this.
pub fn write_and_replace<P: AsRef<Path>, C: AsRef<[u8]>>(
&self,
path: P,
contents: C,
) -> Result<()> {
let path = path.as_ref();
self.check_path(path)?;
let tmp_name = path.with_extension("tmp");
let mut tmp_file = self.open(
&tmp_name,
OpenOptions::new().create(true).truncate(true).write(true),
)?;
// Write the data.
tmp_file
.write_all(contents.as_ref())
.map_err(|e| Error::io(e, &tmp_name, "write to file"))?;
// Flush and close.
drop(tmp_file);
// Replace the old file.
std::fs::rename(self.location.join(tmp_name), self.location.join(path))
.map_err(|e| Error::io(e, path, "replace file"))?;
Ok(())
}
/// Return the [`Metadata`] of the file located at `path`.
///
/// `path` must be a relative path, containing no `..` components.
/// We check the file's parent directories,
/// and the file's permissions.
/// If the file exists, it must not be a symlink.
///
/// Returns [`Error::NotFound`] if the file does not exist.
///
/// Return an error if `path` is absent, if its permissions are incorrect[^1],
/// if the permissions of any of its the parent directories are incorrect,
/// or if it has any components that could take us outside of this directory.
///
/// [^1]: the permissions are incorrect if the path is readable or writable by untrusted users
pub fn metadata<P: AsRef<Path>>(&self, path: P) -> Result<Metadata> {
let path = path.as_ref();
self.check_path(path)?;
let path = self.location.join(path);
if let Some(parent) = path.parent() {
self.verifier().check(parent)?;
}
let meta = path
.symlink_metadata()
.map_err(|e| Error::inspecting(e, &path))?;
if meta.is_symlink() {
// TODO: this is inconsistent with CheckedDir::open()'s behavior, which returns a
// FilesystemLoop io error in this case (we can't construct such an error here, because
// ErrorKind::FilesystemLoop is only available on nightly)
let err = io::Error::new(
io::ErrorKind::Other,
format!("Path {:?} is a symlink", path),
);
return Err(Error::io(err, &path, "metadata"));
}
if let Some(error) = self
.verifier()
.check_one(path.as_path(), PathType::Content, &meta)
.into_iter()
.next()
{
Err(error)
} else {
Ok(meta)
}
}
/// Create a [`Verifier`] with the appropriate rules for this
/// `CheckedDir`.
pub fn verifier(&self) -> Verifier<'_> {
let mut v = self.mistrust.verifier();
if self.readable_okay {
v = v.permit_readable();
}
v
}
/// Helper: Make sure that the path `p` is a relative path that can be
/// guaranteed to stay within this directory.
fn check_path(&self, p: &Path) -> Result<()> {
use std::path::Component;
// This check should be redundant, but let's be certain.
if p.is_absolute() {
return Err(Error::InvalidSubdirectory);
}
for component in p.components() {
match component {
Component::Prefix(_) | Component::RootDir | Component::ParentDir => {
return Err(Error::InvalidSubdirectory)
}
Component::CurDir | Component::Normal(_) => {}
}
}
Ok(())
}
}
#[cfg(test)]
mod test {
// @@ begin test lint list maintained by maint/add_warning @@
#![allow(clippy::bool_assert_comparison)]
#![allow(clippy::clone_on_copy)]
#![allow(clippy::dbg_macro)]
#![allow(clippy::mixed_attributes_style)]
#![allow(clippy::print_stderr)]
#![allow(clippy::print_stdout)]
#![allow(clippy::single_char_pattern)]
#![allow(clippy::unwrap_used)]
#![allow(clippy::unchecked_duration_subtraction)]
#![allow(clippy::useless_vec)]
#![allow(clippy::needless_pass_by_value)]
//! <!-- @@ end test lint list maintained by maint/add_warning @@ -->
use super::*;
use crate::testing::Dir;
use std::io::Write;
#[test]
fn easy_case() {
let d = Dir::new();
d.dir("a/b/c");
d.dir("a/b/d");
d.file("a/b/c/f1");
d.file("a/b/c/f2");
d.file("a/b/d/f3");
d.chmod("a", 0o755);
d.chmod("a/b", 0o700);
d.chmod("a/b/c", 0o700);
d.chmod("a/b/d", 0o777);
d.chmod("a/b/c/f1", 0o600);
d.chmod("a/b/c/f2", 0o666);
d.chmod("a/b/d/f3", 0o600);
let m = Mistrust::builder()
.ignore_prefix(d.canonical_root())
.build()
.unwrap();
let sd = m.verifier().secure_dir(d.path("a/b")).unwrap();
// Try make_directory.
sd.make_directory("c/sub1").unwrap();
#[cfg(target_family = "unix")]
{
let e = sd.make_directory("d/sub2").unwrap_err();
assert!(matches!(e, Error::BadPermission(..)));
}
// Try opening a file that exists.
let f1 = sd.open("c/f1", OpenOptions::new().read(true)).unwrap();
drop(f1);
#[cfg(target_family = "unix")]
{
let e = sd.open("c/f2", OpenOptions::new().read(true)).unwrap_err();
assert!(matches!(e, Error::BadPermission(..)));
let e = sd.open("d/f3", OpenOptions::new().read(true)).unwrap_err();
assert!(matches!(e, Error::BadPermission(..)));
}
// Try creating a file.
let mut f3 = sd
.open("c/f-new", OpenOptions::new().write(true).create(true))
.unwrap();
f3.write_all(b"Hello world").unwrap();
drop(f3);
#[cfg(target_family = "unix")]
{
let e = sd
.open("d/f-new", OpenOptions::new().write(true).create(true))
.unwrap_err();
assert!(matches!(e, Error::BadPermission(..)));
}
}
#[test]
fn bad_paths() {
let d = Dir::new();
d.dir("a");
d.chmod("a", 0o700);
let m = Mistrust::builder()
.ignore_prefix(d.canonical_root())
.build()
.unwrap();
let sd = m.verifier().secure_dir(d.path("a")).unwrap();
let e = sd.make_directory("hello/../world").unwrap_err();
assert!(matches!(e, Error::InvalidSubdirectory));
let e = sd.metadata("hello/../world").unwrap_err();
assert!(matches!(e, Error::InvalidSubdirectory));
let e = sd.make_directory("/hello").unwrap_err();
assert!(matches!(e, Error::InvalidSubdirectory));
let e = sd.metadata("/hello").unwrap_err();
assert!(matches!(e, Error::InvalidSubdirectory));
sd.make_directory("hello/world").unwrap();
}
#[test]
fn read_and_write() {
let d = Dir::new();
d.dir("a");
d.chmod("a", 0o700);
let m = Mistrust::builder()
.ignore_prefix(d.canonical_root())
.build()
.unwrap();
let checked = m.verifier().secure_dir(d.path("a")).unwrap();
// Simple case: write and read.
checked
.write_and_replace("foo.txt", "this is incredibly silly")
.unwrap();
let s1 = checked.read_to_string("foo.txt").unwrap();
let s2 = checked.read("foo.txt").unwrap();
assert_eq!(s1, "this is incredibly silly");
assert_eq!(s1.as_bytes(), &s2[..]);
// Checked subdirectory
let sub = "sub";
let sub_checked = checked.make_secure_directory(sub).unwrap();
assert_eq!(sub_checked.as_path(), checked.as_path().join(sub));
// Trickier: write when the preferred temporary already has content.
checked
.open("bar.tmp", OpenOptions::new().create(true).write(true))
.unwrap()
.write_all("be the other guy".as_bytes())
.unwrap();
assert!(checked.join("bar.tmp").unwrap().try_exists().unwrap());
checked
.write_and_replace("bar.txt", "its hard and nobody understands")
.unwrap();
// Temp file should be gone.
assert!(!checked.join("bar.tmp").unwrap().try_exists().unwrap());
let s4 = checked.read_to_string("bar.txt").unwrap();
assert_eq!(s4, "its hard and nobody understands");
}
#[test]
fn read_directory() {
let d = Dir::new();
d.dir("a");
d.chmod("a", 0o700);
d.dir("a/b");
d.file("a/b/f");
d.file("a/c.d");
d.dir("a/x");
d.chmod("a", 0o700);
d.chmod("a/b", 0o700);
d.chmod("a/x", 0o777);
let m = Mistrust::builder()
.ignore_prefix(d.canonical_root())
.build()
.unwrap();
let checked = m.verifier().secure_dir(d.path("a")).unwrap();
assert!(matches!(
checked.read_directory("/"),
Err(Error::InvalidSubdirectory)
));
assert!(matches!(
checked.read_directory("b/.."),
Err(Error::InvalidSubdirectory)
));
let mut members: Vec<String> = checked
.read_directory(".")
.unwrap()
.map(|ent| ent.unwrap().file_name().to_string_lossy().to_string())
.collect();
members.sort();
assert_eq!(members, vec!["b", "c.d", "x"]);
let members: Vec<String> = checked
.read_directory("b")
.unwrap()
.map(|ent| ent.unwrap().file_name().to_string_lossy().to_string())
.collect();
assert_eq!(members, vec!["f"]);
#[cfg(target_family = "unix")]
{
assert!(matches!(
checked.read_directory("x"),
Err(Error::BadPermission(_, _, _))
));
}
}
#[test]
fn remove_file() {
let d = Dir::new();
d.dir("a");
d.chmod("a", 0o700);
d.dir("a/b");
d.file("a/b/f");
d.dir("a/b/d");
d.dir("a/x");
d.dir("a/x/y");
d.file("a/x/y/z");
d.chmod("a", 0o700);
d.chmod("a/b", 0o700);
d.chmod("a/x", 0o777);
let m = Mistrust::builder()
.ignore_prefix(d.canonical_root())
.build()
.unwrap();
let checked = m.verifier().secure_dir(d.path("a")).unwrap();
// Remove a file that is there, and then make sure it is gone.
assert!(checked.read_to_string("b/f").is_ok());
assert!(checked.metadata("b/f").unwrap().is_file());
checked.remove_file("b/f").unwrap();
assert!(matches!(
checked.read_to_string("b/f"),
Err(Error::NotFound(_))
));
assert!(matches!(checked.metadata("b/f"), Err(Error::NotFound(_))));
assert!(matches!(
checked.remove_file("b/f"),
Err(Error::NotFound(_))
));
// Remove a file in a nonexistent subdirectory
assert!(matches!(
checked.remove_file("b/xyzzy/fred"),
Err(Error::NotFound(_))
));
// Remove a file in a directory whose permissions are too open.
#[cfg(target_family = "unix")]
{
assert!(matches!(
checked.remove_file("x/y/z"),
Err(Error::BadPermission(_, _, _))
));
assert!(matches!(
checked.metadata("x/y/z"),
Err(Error::BadPermission(_, _, _))
));
}
}
#[test]
#[cfg(target_family = "unix")]
fn metadata_symlink() {
use crate::testing::LinkType;
let d = Dir::new();
d.dir("a/b");
d.file("a/b/f1");
d.chmod("a/b", 0o700);
d.chmod("a/b/f1", 0o600);
d.link_rel(LinkType::File, "f1", "a/b/f1-link");
let m = Mistrust::builder()
.ignore_prefix(d.canonical_root())
.build()
.unwrap();
let sd = m.verifier().secure_dir(d.path("a/b")).unwrap();
assert!(sd.open("f1", OpenOptions::new().read(true)).is_ok());
// Metadata returns an error if called on a symlink
let e = sd.metadata("f1-link").unwrap_err();
assert!(
matches!(e, Error::Io { ref err, .. } if err.to_string().contains("is a symlink")),
"{e:?}"
);
}
}