lywsvip/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-05-06 22:28:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(webdav): decode URL-encoded filenames in path parsing (#2722)

Browse Source 
Signed-off-by: giter <giter@users.noreply.github.com>
This commit is contained in:
giter
2026-04-28 22:06:05 +08:00
committed by GitHub
parent c4d5c5c5ec
commit 90ce72122b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/protocols/Cargo.toml
View File

@@ -53,7 +53,7 @@ swift = [
"dep:base64",
"dep:async-compression",
]
webdav = ["dep:dav-server", "dep:hyper", "dep:hyper-util", "dep:http-body-util", "dep:tokio-rustls", "dep:base64", "dep:rustls"]
webdav = ["dep:dav-server", "dep:hyper", "dep:hyper-util", "dep:http-body-util", "dep:tokio-rustls", "dep:base64", "dep:rustls", "dep:percent-encoding"]
[dependencies]
# Core RustFS dependencies

6
crates/protocols/src/webdav/driver.rs
View File

@@ -21,6 +21,7 @@ use dav_server::fs::{
DavDirEntry, DavFile, DavFileSystem, DavMetaData, FsError, FsFuture, FsResult, FsStream, OpenOptions, ReadDirMeta,
};
use futures_util::{FutureExt, StreamExt, stream};
use percent_encoding::percent_decode_str;
use rustfs_utils::path;
use s3s::dto::*;
use std::fmt::Debug;
@@ -432,7 +433,10 @@ where
/// Parse WebDAV path to bucket and object key
fn parse_path(&self, path: &DavPath) -> Result<(String, Option<String>), FsError> {
let path_str = path.as_url_string();
let cleaned_path = path::clean(&path_str);
let decoded_path = percent_decode_str(&path_str)
.decode_utf8()
.map_err(|_| FsError::GeneralFailure)?;
let cleaned_path = path::clean(&decoded_path);
let (bucket, object) = path::path_to_bucket_object(&cleaned_path);
if bucket.is_empty() {