threeoh6000/herb
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

Handle filesystem errors by presuming 404.

Browse source
This commit is contained in:
abbie 2021-08-30 17:32:44 +01:00
parent 9d99683f3a
commit 1e377125f8
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main.rs
View file

@ -4,23 +4,25 @@ use std::fs;
use std::string::{String}; use std::string::{String};
use std::str; use std::str;
fn get_page() -> String { fn get_page(request: String) -> String {
// To-do: Make this able to load other pages // To-do: Make this able to load other pages
// //
// The loaded page should be left immutable as it does // The loaded page should be left immutable as it does
// not need to be modified by the server. // not need to be modified by the server.
let filename = "index.html"; // BAD!!! let mut filename = "index.html";
let page = fs::read_to_string(filename)
.expect("Page read failed!");
return page; let page = fs::read_to_string(filename);
match page {
Ok(i) => i.to_string(),
Err(e) => "<!DOCTYPE HTML><html><body><h1>404 Not Found</h1><p>The resource you are trying to locate cannot be accessed!</p></body></html>".to_string(),
}
} }
fn read_stream(mut stream: TcpStream) -> Result<TcpStream> { fn read_stream(mut stream: TcpStream) {
let mut buffer = BufReader::new(stream.try_clone()?); // To-do: move streaming reading here
Ok(stream) return;
} }
fn serve(mut stream: TcpStream) { fn serve(mut stream: TcpStream) {
@ -30,11 +32,11 @@ fn serve(mut stream: TcpStream) {
let mut reader = BufReader::new(&mut stream); let mut reader = BufReader::new(&mut stream);
reader reader
.read_until(b'\n', &mut request) .read_until(b'\n', &mut request)
.expect("Failed to read from stream"); .expect("Failed to read from stream!");
println!("{}", String::from_utf8_lossy(&request)); // println!("{}", String::from_utf8_lossy(&request));
let contents = get_page(); let contents = get_page(String::from_utf8_lossy(&request).to_string());
let header = "HTTP/1.1 200 OK\r\n\r\n"; let header = "HTTP/1.1 200 OK\r\n\r\n";
let response = format!("{}{}", header, contents); let response = format!("{}{}", header, contents);