sigoden/dufs
1
0
Fork 0
mirror of https://github.com/sigoden/dufs.git synced 2026-04-09 00:59:02 +03:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

fix: escape path-prefix/url-prefix different

Browse Source
This commit is contained in:
sigoden
2022-06-06 08:00:26 +08:00
parent ce154d9ebc
commit b0cc901416
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/server.rs
View File

@@ -1,5 +1,5 @@
use crate::auth::{generate_www_auth, valid_digest};
use crate::{encode_uri, Args, BoxResult};
use crate::{Args, BoxResult};
use xml::escape::escape_str_pcdata;
use async_walkdir::WalkDir;
@@ -822,7 +822,7 @@ impl PathItem {
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>"#,
prefix,
escape_str_pcdata(prefix),
escape_str_pcdata(&self.name),
escape_str_pcdata(&self.base_name),
mtime
@@ -840,7 +840,7 @@ impl PathItem {
<D:status>HTTP/1.1 200 OK</D:status>
</D:propstat>
</D:response>"#,
prefix,
escape_str_pcdata(prefix),
escape_str_pcdata(&self.name),
escape_str_pcdata(&self.base_name),
self.size.unwrap_or_default(),
@@ -975,7 +975,7 @@ fn to_content_range(range: &Range, complete_length: u64) -> Option<ContentRange>
}
fn print_listening(address: &str, port: u16, prefix: &str, tls: bool) {
let prefix = prefix.trim_end_matches('/');
let prefix = encode_uri(prefix.trim_end_matches('/'));
let addrs = retrieve_listening_addrs(address);
let protocol = if tls { "https" } else { "http" };
if addrs.len() == 1 {
@@ -1006,3 +1006,8 @@ fn retrieve_listening_addrs(address: &str) -> Vec<String> {
}
vec![address.to_owned()]
}
fn encode_uri(v: &str) -> String {
let parts: Vec<_> = v.split('/').map(urlencoding::encode).collect();
parts.join("/")
}