mirror of
https://github.com/openai/codex.git
synced 2026-11-13 22:47:20 +00:00
Harden Windows file URI conversion (#40423)
## What changed - Recognize percent-encoded drive colons when inferring Windows paths, rendering native path strings, and resolving same-drive relative joins. - Reject Windows file URIs with percent-encoded `/` or `\` separators before converting them to native absolute paths, so decoding cannot reinterpret URI segment boundaries. ## Testing - Cover uppercase and lowercase encodings for drive colons and path separators, including local-drive and UNC file URIs. GitOrigin-RevId: ecb6c92f4ef1af73f85e57a135abf6bc5bb968dc
This commit is contained in:
1 parent
09609ba414
commit
0d9bb6c34c
2 files changed
+49
-4
No files matched your search
@@ -432,7 +432,8 @@ impl PathUri {
|
||||
.path_segments()
|
||||
.and_then(|mut segments| segments.find(|segment| !segment.is_empty()))
|
||||
.is_some_and(|segment| {
|
||||
matches!(segment.as_bytes(), [drive, b':'] if drive.eq_ignore_ascii_case(&path_bytes[0]))
|
||||
is_windows_drive_uri_segment(segment)
|
||||
&& segment.as_bytes()[0].eq_ignore_ascii_case(&path_bytes[0])
|
||||
});
|
||||
if !same_drive {
|
||||
return Err(PathUriParseError::InvalidFileUriPath {
|
||||
@@ -497,9 +498,13 @@ impl PathUri {
|
||||
/// The URI's inferred path convention must match the current host. Conversion should succeed
|
||||
/// when the URI was created from an [`AbsolutePathBuf`] on the current host, including fallback
|
||||
/// URIs created by [`Self::from_abs_path`]. Foreign conventions are rejected rather than being
|
||||
/// projected onto a syntactically valid but unrelated host path.
|
||||
/// projected onto a syntactically valid but unrelated host path. Encoded Windows path
|
||||
/// separators are rejected before native conversion can reinterpret URI segment boundaries.
|
||||
pub fn to_abs_path(&self) -> io::Result<AbsolutePathBuf> {
|
||||
if self.infer_path_convention() != Some(PathConvention::native()) {
|
||||
if self.infer_path_convention() != Some(PathConvention::native())
|
||||
|| (PathConvention::native() == PathConvention::Windows
|
||||
&& containment_path_segments(&self.0, PathConvention::Windows).is_none())
|
||||
{
|
||||
return Err(io::Error::new(
|
||||
io::ErrorKind::InvalidInput,
|
||||
PathUriParseError::InvalidFileUriPath {
|
||||
@@ -700,7 +705,10 @@ fn decode_bad_path_uri(url: &Url) -> Option<Vec<u8>> {
|
||||
}
|
||||
|
||||
fn is_windows_drive_uri_segment(segment: &str) -> bool {
|
||||
matches!(segment.as_bytes(), [drive, b':'] if drive.is_ascii_alphabetic())
|
||||
matches!(
|
||||
segment.as_bytes(),
|
||||
[drive, b':'] | [drive, b'%', b'3', b'A' | b'a'] if drive.is_ascii_alphabetic()
|
||||
)
|
||||
}
|
||||
|
||||
fn containment_path_segments(url: &Url, convention: PathConvention) -> Option<Vec<&str>> {
|
||||
|
||||
Reference in new issue
Block a user