serv/dufs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: filename xml escaping

Browse source
This commit is contained in:
Joe Koop 2022-06-05 18:54:12 -05:00 committed by GitHub
parent 7c4c264206
commit ce154d9ebc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Cargo.lock generated
View file

@ -313,6 +313,7 @@ dependencies = [
"tokio-util", "tokio-util",
"urlencoding", "urlencoding",
"uuid", "uuid",
"xml-rs",
] ]
[[package]] [[package]]
@ -1368,6 +1369,12 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
[[package]]
name = "xml-rs"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
[[package]] [[package]]
name = "xz2" name = "xz2"
version = "0.1.6" version = "0.1.6"

1
Cargo.toml
View file

@ -35,6 +35,7 @@ md5 = "0.7.0"
lazy_static = "1.4.0" lazy_static = "1.4.0"
uuid = { version = "1.1.1", features = ["v4", "fast-rng"] } uuid = { version = "1.1.1", features = ["v4", "fast-rng"] }
urlencoding = "2.1.0" urlencoding = "2.1.0"
xml-rs = "0.8"
env_logger = { version = "0.9.0", default-features = false, features = ["humantime"] } env_logger = { version = "0.9.0", default-features = false, features = ["humantime"] }
log = "0.4.17" log = "0.4.17"

9
src/server.rs
View file

@ -1,5 +1,6 @@
use crate::auth::{generate_www_auth, valid_digest}; use crate::auth::{generate_www_auth, valid_digest};
use crate::{encode_uri, Args, BoxResult}; use crate::{encode_uri, Args, BoxResult};
use xml::escape::escape_str_pcdata;
use async_walkdir::WalkDir; use async_walkdir::WalkDir;
use async_zip::write::{EntryOptions, ZipFileWriter}; use async_zip::write::{EntryOptions, ZipFileWriter};
@ -822,8 +823,8 @@ impl PathItem {
</D:propstat> </D:propstat>
</D:response>"#, </D:response>"#,
prefix, prefix,
encode_uri(&self.name), escape_str_pcdata(&self.name),
urlencoding::encode(&self.base_name), escape_str_pcdata(&self.base_name),
mtime mtime
), ),
PathType::File | PathType::SymlinkFile => format!( PathType::File | PathType::SymlinkFile => format!(
@ -840,8 +841,8 @@ impl PathItem {
</D:propstat> </D:propstat>
</D:response>"#, </D:response>"#,
prefix, prefix,
encode_uri(&self.name), escape_str_pcdata(&self.name),
urlencoding::encode(&self.base_name), escape_str_pcdata(&self.base_name),
self.size.unwrap_or_default(), self.size.unwrap_or_default(),
mtime mtime
), ),