Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix HTTP server buffer #609

Merged
merged 4 commits into from
Apr 5, 2024
Merged

Fix HTTP server buffer #609

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f349a1
Refactor index code
vinc Apr 2, 2024
a5a6bb2
Fix chunked receive buffer
vinc Apr 2, 2024
6990de9
Fix join_path
vinc Apr 3, 2024
5983f41
Fix relative path
vinc Apr 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 72 additions & 39 deletions src/usr/httpd.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ use smoltcp::wire::IpAddress;

const MAX_CONNECTIONS: usize = 32;
const POLL_DELAY_DIV: usize = 128;
const INDEX: [&str; 4] = ["", "/index.html", "/index.htm", "/index.txt"];

#[derive(Clone)]
struct Request {
Expand Down Expand Up @@ -212,10 +213,8 @@ fn get(req: &Request, res: &mut Response) {
res.body.extend_from_slice(b"<h1>Moved Permanently</h1>\r\n");
} else {
let mut not_found = true;
for autocomplete in
&["", "/index.html", "/index.htm", "/index.txt"]
{
let real_path = format!("{}{}", res.real_path, autocomplete);
for index in INDEX {
let real_path = format!("{}{}", res.real_path, index);
if fs::is_dir(&real_path) {
continue;
}
Expand Down Expand Up @@ -338,6 +337,9 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
i += 1;
}

// NOTE: This specific format is needed by `join_path`
let dir = format!("/{}", fs::realpath(&dir).trim_matches('/'));

if let Some((ref mut iface, ref mut device)) = *sys::net::NET.lock() {
let mut sockets = SocketSet::new(vec![]);

Expand Down Expand Up @@ -381,45 +383,57 @@ pub fn main(args: &[&str]) -> Result<(), ExitCode> {
None => continue,
};
if socket.may_recv() {
let res = socket.recv(|buf| {
if let Some(req) = Request::from(endpoint.addr, buf) {
let mut res = Response::new(req.clone());
let sep = if req.path == "/" { "" } else { "/" };
res.real_path = format!(
"{}{}{}",
dir,
sep,
req.path.strip_suffix('/').unwrap_or(&req.path)
).replace("//", "/");
// The amount of octets queued in the receive buffer may be
// larger than the contiguous slice returned by `recv` so
// we need to loop over chunks of it until it is empty.
let recv_queue = socket.recv_queue();
let mut receiving = true;
let mut buf = vec![];
while receiving {
let res = socket.recv(|chunk| {
buf.extend_from_slice(chunk);
if buf.len() < recv_queue {
return (chunk.len(), None);
}
receiving = false;

match req.verb.as_str() {
"GET" => {
get(&req, &mut res)
}
"PUT" if !read_only => {
put(&req, &mut res)
}
"DELETE" if !read_only => {
delete(&req, &mut res)
}
_ => {
let s = b"<h1>Bad Request</h1>\r\n";
res.body.extend_from_slice(s);
res.code = 400;
res.mime = "text/html".to_string();
let addr = endpoint.addr;
if let Some(req) = Request::from(addr, &buf) {
let mut res = Response::new(req.clone());
res.real_path = join_path(&dir, &req.path);

match req.verb.as_str() {
"GET" => {
get(&req, &mut res)
}
"PUT" if !read_only => {
put(&req, &mut res)
}
"DELETE" if !read_only => {
delete(&req, &mut res)
}
_ => {
let s = b"<h1>Bad Request</h1>\r\n";
res.body.extend_from_slice(s);
res.code = 400;
res.mime = "text/html".to_string();
}
}
res.end();
println!("{}", res);
(chunk.len(), Some(res))
} else {
(0, None)
}
res.end();
println!("{}", res);
(buf.len(), Some(res))
} else {
(0, None)
});
if receiving {
continue;
}
});
if let Ok(Some(res)) = res {
*keep_alive = res.is_persistent();
for chunk in res.buf.chunks(buf_len) {
send_queue.push_back(chunk.to_vec());
if let Ok(Some(res)) = res {
*keep_alive = res.is_persistent();
for chunk in res.buf.chunks(buf_len) {
send_queue.push_back(chunk.to_vec());
}
}
}
if socket.can_send() {
Expand Down Expand Up @@ -468,6 +482,15 @@ fn content_type(path: &str) -> String {
}.to_string()
}

// Join the requested file path to the root dir of the server
fn join_path(dir: &str, path: &str) -> String {
debug_assert!(dir.starts_with('/'));
debug_assert!(path.starts_with('/'));
let path = path.trim_matches('/');
let sep = if dir == "/" || path == "" { "" } else { "/" };
format!("{}{}{}", dir, sep, path)
}

fn usage() {
let csi_option = Style::color("LightCyan");
let csi_title = Style::color("Yellow");
Expand All @@ -491,3 +514,13 @@ fn usage() {
csi_option, csi_reset
);
}

#[test_case]
fn test_join_path() {
assert_eq!(join_path("/foo", "/bar/"), "/foo/bar");
assert_eq!(join_path("/foo", "/bar"), "/foo/bar");
assert_eq!(join_path("/foo", "/"), "/foo");
assert_eq!(join_path("/", "/bar/"), "/bar");
assert_eq!(join_path("/", "/bar"), "/bar");
assert_eq!(join_path("/", "/"), "/");
}
Loading