minhttpd/server
1
0
Fork 0
Code Issues Pull requests Wiki Activity

update percent-encoding and htmlescape

Browse source 
* percent-encoding 1.0 to 2.0
* actualy move from htmlescape to v_htmlescape

code updated for some api changes too
This commit is contained in:
Дамјан Георгиевски 2019-08-28 19:43:42 +02:00
parent 6cdc2b2ada
commit 6fbe1b22ea
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.toml
View file

@ -16,8 +16,8 @@ env_logger = "*"
log = "*" log = "*"
futures = "0.1" futures = "0.1"
tar = "0.4" tar = "0.4"
percent-encoding = "1.0" percent-encoding = "2.0"
htmlescape = "0.3" v_htmlescape = "0.4"
[profile.release] [profile.release]
opt-level = 'z' opt-level = 'z'

15
src/web.rs
View file

@ -2,8 +2,8 @@ use actix_web::{App, middleware, error, HttpServer, HttpRequest, HttpResponse, R
use actix_web::dev::ServiceResponse; use actix_web::dev::ServiceResponse;
use actix_files as fs; use actix_files as fs;
use futures::Stream; use futures::Stream;
use percent_encoding::{utf8_percent_encode, DEFAULT_ENCODE_SET}; use percent_encoding::{utf8_percent_encode, NON_ALPHANUMERIC};
use htmlescape::encode_minimal as escape_html_entity; use v_htmlescape::escape as escape_html_entity;
use crate::channel; use crate::channel;
@ -48,19 +48,18 @@ fn handle_directory<'a, 'b>(
paths.sort_by_key(|entry| (!optimistic_is_dir(entry), entry.file_name())); paths.sort_by_key(|entry| (!optimistic_is_dir(entry), entry.file_name()));
let dir_tar_path = String::from(req.path().trim_end_matches('/')) + ".tar"; let tar_url = req.path().trim_end_matches('/'); // this is already encoded
let tar_url = utf8_percent_encode(&dir_tar_path, DEFAULT_ENCODE_SET).to_string();
let mut body = String::new(); let mut body = String::new();
writeln!(body, "<h1>Index of {}</h1>", req.path()).unwrap(); writeln!(body, "<h1>Index of {}</h1>", req.path()).unwrap(); // FIXME: decode from url, escape for html
writeln!(body, r#"<small>[<a href="{}">.tar</a> of whole directory]</small>"#, tar_url).unwrap(); writeln!(body, r#"<small>[<a href="{}.tar">.tar</a> of whole directory]</small>"#, tar_url).unwrap();
writeln!(body, "<table>").unwrap(); writeln!(body, "<table>").unwrap();
writeln!(body, "<tr><td>📁 <a href='../'>../</a></td><td>Size</td></tr>").unwrap(); writeln!(body, "<tr><td>📁 <a href='../'>../</a></td><td>Size</td></tr>").unwrap();
for entry in paths { for entry in paths {
let meta = entry.metadata()?; let meta = entry.metadata()?;
let file_url = utf8_percent_encode(&entry.file_name().to_string_lossy(), DEFAULT_ENCODE_SET).to_string(); let file_url = utf8_percent_encode(&entry.file_name().to_string_lossy(), NON_ALPHANUMERIC).to_string();
let file_name = escape_html_entity(&entry.file_name().to_string_lossy()); let file_name = escape_html_entity(&entry.file_name().to_string_lossy()).to_string();
let size = meta.len(); let size = meta.len();
write!(body, "<tr>").unwrap(); write!(body, "<tr>").unwrap();