actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 06:39:22 +02:00
Code Issues Releases Wiki Activity

deprecate Path::path (#2590)

Browse Source
This commit is contained in:
Rob Ede
2022-01-19 20:26:33 +00:00
committed by GitHub
parent 3dd98c308c
commit 1cc3e7b24c
7 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actix-files/src/path_buf.rs
View File

@ -85,7 +85,7 @@ impl FromRequest for PathBufWrap {
type Future = Ready<Result<Self, Self::Error>>;
fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
ready(req.match_info().path().parse())
ready(req.match_info().unprocessed().parse())
}
}

16
actix-files/src/service.rs
View File

@ -120,14 +120,16 @@ impl Service<ServiceRequest> for FilesService {
));
}
let real_path =
match PathBufWrap::parse_path(req.match_info().path(), this.hidden_files) {
Ok(item) => item,
Err(err) => return Ok(req.error_response(err)),
};
let path_on_disk = match PathBufWrap::parse_path(
req.match_info().unprocessed(),
this.hidden_files,
) {
Ok(item) => item,
Err(err) => return Ok(req.error_response(err)),
};
if let Some(filter) = &this.path_filter {
if !filter(real_path.as_ref(), req.head()) {
if !filter(path_on_disk.as_ref(), req.head()) {
if let Some(ref default) = this.default {
return default.call(req).await;
} else {
@ -137,7 +139,7 @@ impl Service<ServiceRequest> for FilesService {
}
// full file path
let path = this.directory.join(&real_path);
let path = this.directory.join(&path_on_disk);
if let Err(err) = path.canonicalize() {
return this.handle_err(err, req).await;
}