mirror of
https://github.com/openai/codex.git
synced 2026-04-28 16:45:54 +00:00
Changes the `writable_roots` field of the `WorkspaceWrite` variant of the `SandboxPolicy` enum from `Vec<PathBuf>` to `Vec<AbsolutePathBuf>`. This is helpful because now callers can be sure the value is an absolute path rather than a relative one. (Though when using an absolute path in a Seatbelt config policy, we still have to _canonicalize_ it first.) Because `writable_roots` can be read from a config file, it is important that we are able to resolve relative paths properly using the parent folder of the config file as the base path.
191 lines
5.4 KiB
Rust
191 lines
5.4 KiB
Rust
use path_absolutize::Absolutize;
|
|
use schemars::JsonSchema;
|
|
use serde::Deserialize;
|
|
use serde::Deserializer;
|
|
use serde::Serialize;
|
|
use serde::de::Error as SerdeError;
|
|
use std::cell::RefCell;
|
|
use std::path::Display;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use ts_rs::TS;
|
|
|
|
/// A path that is guaranteed to be absolute and normalized (though it is not
|
|
/// guaranteed to be canonicalized or exist on the filesystem).
|
|
///
|
|
/// IMPORTANT: When deserializing an `AbsolutePathBuf`, a base path must be set
|
|
/// using `AbsolutePathBufGuard::new(base_path)`. If no base path is set, the
|
|
/// deserialization will fail unless the path being deserialized is already
|
|
/// absolute.
|
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, JsonSchema, TS)]
|
|
pub struct AbsolutePathBuf(PathBuf);
|
|
|
|
impl AbsolutePathBuf {
|
|
pub fn resolve_path_against_base<P: AsRef<Path>, B: AsRef<Path>>(
|
|
path: P,
|
|
base_path: B,
|
|
) -> std::io::Result<Self> {
|
|
let absolute_path = path.as_ref().absolutize_from(base_path.as_ref())?;
|
|
Ok(Self(absolute_path.into_owned()))
|
|
}
|
|
|
|
pub fn from_absolute_path<P: AsRef<Path>>(path: P) -> std::io::Result<Self> {
|
|
let absolute_path = path.as_ref().absolutize()?;
|
|
Ok(Self(absolute_path.into_owned()))
|
|
}
|
|
|
|
pub fn join<P: AsRef<Path>>(&self, path: P) -> std::io::Result<Self> {
|
|
Self::resolve_path_against_base(path, &self.0)
|
|
}
|
|
|
|
pub fn as_path(&self) -> &Path {
|
|
&self.0
|
|
}
|
|
|
|
pub fn into_path_buf(self) -> PathBuf {
|
|
self.0
|
|
}
|
|
|
|
pub fn to_path_buf(&self) -> PathBuf {
|
|
self.0.clone()
|
|
}
|
|
|
|
pub fn to_string_lossy(&self) -> std::borrow::Cow<'_, str> {
|
|
self.0.to_string_lossy()
|
|
}
|
|
|
|
pub fn display(&self) -> Display<'_> {
|
|
self.0.display()
|
|
}
|
|
}
|
|
|
|
impl AsRef<Path> for AbsolutePathBuf {
|
|
fn as_ref(&self) -> &Path {
|
|
&self.0
|
|
}
|
|
}
|
|
|
|
impl From<AbsolutePathBuf> for PathBuf {
|
|
fn from(path: AbsolutePathBuf) -> Self {
|
|
path.into_path_buf()
|
|
}
|
|
}
|
|
|
|
impl TryFrom<&Path> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: &Path) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<PathBuf> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: PathBuf) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<&str> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: &str) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
impl TryFrom<String> for AbsolutePathBuf {
|
|
type Error = std::io::Error;
|
|
|
|
fn try_from(value: String) -> Result<Self, Self::Error> {
|
|
Self::from_absolute_path(value)
|
|
}
|
|
}
|
|
|
|
thread_local! {
|
|
static ABSOLUTE_PATH_BASE: RefCell<Option<PathBuf>> = const { RefCell::new(None) };
|
|
}
|
|
|
|
pub struct AbsolutePathBufGuard;
|
|
|
|
impl AbsolutePathBufGuard {
|
|
pub fn new(base_path: &Path) -> Self {
|
|
ABSOLUTE_PATH_BASE.with(|cell| {
|
|
*cell.borrow_mut() = Some(base_path.to_path_buf());
|
|
});
|
|
Self
|
|
}
|
|
}
|
|
|
|
impl Drop for AbsolutePathBufGuard {
|
|
fn drop(&mut self) {
|
|
ABSOLUTE_PATH_BASE.with(|cell| {
|
|
*cell.borrow_mut() = None;
|
|
});
|
|
}
|
|
}
|
|
|
|
impl<'de> Deserialize<'de> for AbsolutePathBuf {
|
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
let path = PathBuf::deserialize(deserializer)?;
|
|
ABSOLUTE_PATH_BASE.with(|cell| match cell.borrow().as_deref() {
|
|
Some(base) => {
|
|
Ok(Self::resolve_path_against_base(path, base).map_err(SerdeError::custom)?)
|
|
}
|
|
None if path.is_absolute() => {
|
|
Self::from_absolute_path(path).map_err(SerdeError::custom)
|
|
}
|
|
None => Err(SerdeError::custom(
|
|
"AbsolutePathBuf deserialized without a base path",
|
|
)),
|
|
})
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use tempfile::tempdir;
|
|
|
|
#[test]
|
|
fn create_with_absolute_path_ignores_base_path() {
|
|
let base_dir = tempdir().expect("base dir");
|
|
let absolute_dir = tempdir().expect("absolute dir");
|
|
let base_path = base_dir.path();
|
|
let absolute_path = absolute_dir.path().join("file.txt");
|
|
let abs_path_buf =
|
|
AbsolutePathBuf::resolve_path_against_base(absolute_path.clone(), base_path)
|
|
.expect("failed to create");
|
|
assert_eq!(abs_path_buf.as_path(), absolute_path.as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn relative_path_is_resolved_against_base_path() {
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let base_dir = temp_dir.path();
|
|
let abs_path_buf = AbsolutePathBuf::resolve_path_against_base("file.txt", base_dir)
|
|
.expect("failed to create");
|
|
assert_eq!(abs_path_buf.as_path(), base_dir.join("file.txt").as_path());
|
|
}
|
|
|
|
#[test]
|
|
fn guard_used_in_deserialization() {
|
|
let temp_dir = tempdir().expect("base dir");
|
|
let base_dir = temp_dir.path();
|
|
let relative_path = "subdir/file.txt";
|
|
let abs_path_buf = {
|
|
let _guard = AbsolutePathBufGuard::new(base_dir);
|
|
serde_json::from_str::<AbsolutePathBuf>(&format!(r#""{relative_path}""#))
|
|
.expect("failed to deserialize")
|
|
};
|
|
assert_eq!(
|
|
abs_path_buf.as_path(),
|
|
base_dir.join(relative_path).as_path()
|
|
);
|
|
}
|
|
}
|