fixes PR004
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use prometeu_system::fs::{FsBackend, FsEntry, FsError};
|
||||
use std::fs;
|
||||
use std::path::PathBuf;
|
||||
use std::path::{Component, Path, PathBuf};
|
||||
|
||||
pub struct HostDirBackend {
|
||||
root: PathBuf,
|
||||
@@ -11,9 +11,41 @@ impl HostDirBackend {
|
||||
Self { root: root.into() }
|
||||
}
|
||||
|
||||
fn resolve(&self, path: &str) -> PathBuf {
|
||||
let path = path.trim_start_matches('/');
|
||||
self.root.join(path)
|
||||
fn resolve(&self, path: &str) -> Result<PathBuf, FsError> {
|
||||
let normalized = path.replace('\\', "/");
|
||||
let relative = normalized.strip_prefix('/').unwrap_or(&normalized);
|
||||
let mut resolved = self.root.clone();
|
||||
|
||||
for component in Path::new(relative).components() {
|
||||
match component {
|
||||
Component::Normal(segment) => resolved.push(segment),
|
||||
Component::ParentDir => {
|
||||
return Err(FsError::InvalidPath(
|
||||
"parent traversal '..' is not allowed".to_string(),
|
||||
));
|
||||
}
|
||||
Component::CurDir => {
|
||||
return Err(FsError::InvalidPath(
|
||||
"current directory '.' is not allowed".to_string(),
|
||||
));
|
||||
}
|
||||
Component::RootDir => {
|
||||
return Err(FsError::InvalidPath("unexpected root component".to_string()));
|
||||
}
|
||||
Component::Prefix(prefix) => {
|
||||
return Err(FsError::InvalidPath(format!(
|
||||
"unexpected platform path prefix: {:?}",
|
||||
prefix
|
||||
)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !resolved.starts_with(&self.root) {
|
||||
return Err(FsError::InvalidPath("resolved path escaped the mounted root".to_string()));
|
||||
}
|
||||
|
||||
Ok(resolved)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -36,7 +68,7 @@ impl FsBackend for HostDirBackend {
|
||||
fn unmount(&mut self) {}
|
||||
|
||||
fn list_dir(&self, path: &str) -> Result<Vec<FsEntry>, FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
let full_path = self.resolve(path)?;
|
||||
let entries = fs::read_dir(full_path).map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
|
||||
let mut result = Vec::new();
|
||||
@@ -53,7 +85,7 @@ impl FsBackend for HostDirBackend {
|
||||
}
|
||||
|
||||
fn read_file(&self, path: &str) -> Result<Vec<u8>, FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
let full_path = self.resolve(path)?;
|
||||
fs::read(full_path).map_err(|e| match e.kind() {
|
||||
std::io::ErrorKind::NotFound => FsError::NotFound,
|
||||
_ => FsError::IOError(e.to_string()),
|
||||
@@ -61,7 +93,7 @@ impl FsBackend for HostDirBackend {
|
||||
}
|
||||
|
||||
fn write_file(&mut self, path: &str, data: &[u8]) -> Result<(), FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
let full_path = self.resolve(path)?;
|
||||
if let Some(parent) = full_path.parent() {
|
||||
fs::create_dir_all(parent).map_err(|e| FsError::IOError(e.to_string()))?;
|
||||
}
|
||||
@@ -69,7 +101,10 @@ impl FsBackend for HostDirBackend {
|
||||
}
|
||||
|
||||
fn delete(&mut self, path: &str) -> Result<(), FsError> {
|
||||
let full_path = self.resolve(path);
|
||||
let full_path = self.resolve(path)?;
|
||||
if full_path == self.root {
|
||||
return Err(FsError::PermissionDenied);
|
||||
}
|
||||
if full_path.is_dir() {
|
||||
fs::remove_dir_all(full_path).map_err(|e| FsError::IOError(e.to_string()))
|
||||
} else {
|
||||
@@ -78,7 +113,7 @@ impl FsBackend for HostDirBackend {
|
||||
}
|
||||
|
||||
fn exists(&self, path: &str) -> bool {
|
||||
self.resolve(path).exists()
|
||||
self.resolve(path).map(|resolved| resolved.exists()).unwrap_or(false)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -113,4 +148,72 @@ mod tests {
|
||||
|
||||
let _ = fs::remove_dir_all(root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_host_dir_backend_round_trip() {
|
||||
let root = get_temp_dir("round_trip");
|
||||
let mut backend = HostDirBackend::new(root.clone());
|
||||
backend.mount().unwrap();
|
||||
|
||||
let path = "/user/test.txt";
|
||||
let content = b"hello world";
|
||||
|
||||
backend.write_file(path, content).unwrap();
|
||||
assert!(backend.exists(path));
|
||||
assert_eq!(backend.read_file(path).unwrap(), content);
|
||||
|
||||
backend.delete(path).unwrap();
|
||||
assert!(!backend.exists(path));
|
||||
|
||||
let _ = fs::remove_dir_all(root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_host_dir_backend_rejects_traversal_write_and_read() {
|
||||
let root = get_temp_dir("rejects_traversal");
|
||||
let mut backend = HostDirBackend::new(root.clone());
|
||||
backend.mount().unwrap();
|
||||
|
||||
let outside_name = format!(
|
||||
"outside_{}.txt",
|
||||
std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).unwrap().as_nanos()
|
||||
);
|
||||
let traversal_path = format!("/user/../../{}", outside_name);
|
||||
let outside_path = root.parent().unwrap().join(&outside_name);
|
||||
|
||||
assert!(matches!(
|
||||
backend.write_file(&traversal_path, b"escape"),
|
||||
Err(FsError::InvalidPath(_))
|
||||
));
|
||||
assert!(matches!(backend.read_file(&traversal_path), Err(FsError::InvalidPath(_))));
|
||||
assert!(!outside_path.exists());
|
||||
|
||||
let _ = fs::remove_dir_all(root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_host_dir_backend_rejects_traversal_for_exists_and_list_dir() {
|
||||
let root = get_temp_dir("rejects_bool_and_list");
|
||||
let mut backend = HostDirBackend::new(root.clone());
|
||||
backend.mount().unwrap();
|
||||
|
||||
let traversal_path = "/user/../../outside";
|
||||
|
||||
assert!(!backend.exists(traversal_path));
|
||||
assert!(matches!(backend.list_dir(traversal_path), Err(FsError::InvalidPath(_))));
|
||||
|
||||
let _ = fs::remove_dir_all(root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_host_dir_backend_rejects_delete_root() {
|
||||
let root = get_temp_dir("rejects_delete_root");
|
||||
let mut backend = HostDirBackend::new(root.clone());
|
||||
backend.mount().unwrap();
|
||||
|
||||
assert!(matches!(backend.delete("/"), Err(FsError::PermissionDenied)));
|
||||
assert!(root.exists());
|
||||
|
||||
let _ = fs::remove_dir_all(root);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user