simon/tiny_httpd
1
0
Fork 0
mirror of https://github.com/c-cube/tiny_httpd.git synced 2025-12-06 03:05:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: improved percent encoding of paths

Browse source
This commit is contained in:
Simon Cruanes 2019-11-22 13:45:37 -06:00
parent 4aaf77b261
commit 2b95c181b8
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Tiny_httpd_util.ml
View file

@ -1,7 +1,8 @@
let percent_encode s = let percent_encode ?(skip=fun _->false) s =
let buf = Buffer.create (String.length s) in let buf = Buffer.create (String.length s) in
String.iter String.iter
(function (function
| c when skip c -> Buffer.add_char buf c
| ' ' -> Buffer.add_string buf "%20" | ' ' -> Buffer.add_string buf "%20"
| '!' -> Buffer.add_string buf "%21" | '!' -> Buffer.add_string buf "%21"
| '"' -> Buffer.add_string buf "%22" | '"' -> Buffer.add_string buf "%22"

3
src/Tiny_httpd_util.mli
View file

@ -3,9 +3,10 @@
@since NEXT_RELEASE @since NEXT_RELEASE
*) *)
val percent_encode : string -> string val percent_encode : ?skip:(char -> bool) -> string -> string
(** Encode the string into a valid path following (** Encode the string into a valid path following
https://tools.ietf.org/html/rfc3986#section-2.1 https://tools.ietf.org/html/rfc3986#section-2.1
@param skip if provided, allows to preserve some characters, e.g. '/' in a path.
*) *)
val percent_decode : string -> string option val percent_decode : string -> string option

6
src/bin/http_of_dir.ml
View file

@ -39,10 +39,14 @@ let human_size (x:int) : string =
let header_html = "Content-Type", "text/html" let header_html = "Content-Type", "text/html"
let (//) = Filename.concat let (//) = Filename.concat
let encode_path s =
U.percent_encode ~skip:(fun c -> c='/') s
let html_list_dir ~top ~parent d : string = let html_list_dir ~top ~parent d : string =
let entries = Sys.readdir @@ (top // d) in let entries = Sys.readdir @@ (top // d) in
Array.sort compare entries; Array.sort compare entries;
let body = Buffer.create 256 in let body = Buffer.create 256 in
(* TODO: breadcrumbs for the path, each element a link to the given ancestor dir *)
Printf.bprintf body {|<head><title> http_of_dir %S</title> Printf.bprintf body {|<head><title> http_of_dir %S</title>
</head><body> </head><body>
<h2> Index of %S</h2> <h2> Index of %S</h2>
@ -65,7 +69,7 @@ let html_list_dir ~top ~parent d : string =
with _ -> "" with _ -> ""
in in
Printf.bprintf body " <li> <a href=\"/%s\"> %s </a> %s%s </li>\n" Printf.bprintf body " <li> <a href=\"/%s\"> %s </a> %s%s </li>\n"
(U.percent_encode (d // f)) f (if Sys.is_directory fpath then "[dir]" else "") size (encode_path (d // f)) f (if Sys.is_directory fpath then "[dir]" else "") size
); );
) )
) )