Compare commits

...

2 Commits

Author SHA1 Message Date
1f467994f7 start of internal html files 2025-03-28 10:53:38 +01:00
7853b4d2df compare mime-type with accept header 2025-03-28 10:21:32 +01:00
3 changed files with 98 additions and 37 deletions

View File

@ -29,6 +29,7 @@ FROM scratch
# copy the build artifact from the build stage # copy the build artifact from the build stage
COPY --from=build /http_server/target/x86_64-unknown-linux-musl/release/http_server / COPY --from=build /http_server/target/x86_64-unknown-linux-musl/release/http_server /
COPY ./www /www COPY ./www /www
COPY ./internal /internal
EXPOSE 8080 EXPOSE 8080

13
internal/server-info.html Normal file
View File

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>server-info</title>
</head>
<body>
<h1>Server written by AustrianToast</h1>
<a href="https://gitea.hopeless-cloud.xyz/AustrianToast/http_server">Source code</a>
<br>
<a href="mailto:austriantoast@hopeless-cloud.xyz">AustrianToasts e-mail</a>
</body>
</html>

View File

@ -125,11 +125,11 @@ fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
.for_each(|byte| response_body.push(*byte)); .for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Type"), String::from("content-type"),
vec![String::from("text/plain")], vec![String::from("text/plain")],
); );
@ -168,11 +168,11 @@ fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
.for_each(|byte| response_body.push(*byte)); .for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Type"), String::from("content-type"),
vec![String::from("text/plain")], vec![String::from("text/plain")],
); );
@ -204,13 +204,13 @@ fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
Ok(start_line) Ok(start_line)
} }
//TODO: Be able to parse this // Example -> Accept: text/html, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8
// Accept: text/html, application/xhtml+xml, application/xml;q=0.9, */*;q=0.8 // Be careful of optional whitespace (OWS) and CRLF
// Be careful of optional whitespace (OWS) // q=x.yyy is basically a value which says, what the client wants most.
// q=x.yyy is basically a which I want most value the closer to 1 the better. If no q=x.yyy was specified, then q=1 is implied. // The closer to 1 the better. If no q=x.yyy was specified, then q=1 is implied.
// This basically mean I should sort the vector by qvalue. So that the one it wants most, is at the beginning. // This basically mean I should sort the vector by qvalue. So that the one it wants most, is at the beginning.
fn parse_field_line(field_line: (&str, &str)) -> (String, Vec<String>) { fn parse_field_line(field_line: (&str, &str)) -> (String, Vec<String>) {
let field_name = field_line.0.to_owned(); let field_name = field_line.0.to_ascii_lowercase();
let mut fuck: HashMap<String, Vec<String>> = HashMap::new(); let mut fuck: HashMap<String, Vec<String>> = HashMap::new();
if !field_line.1.contains(",") { if !field_line.1.contains(",") {
@ -290,11 +290,11 @@ fn parse_field_lines(
.for_each(|byte| response_body.push(*byte)); .for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Type"), String::from("content-type"),
vec![String::from("text/plain")], vec![String::from("text/plain")],
); );
@ -319,11 +319,11 @@ fn parse_field_lines(
.for_each(|byte| response_body.push(*byte)); .for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Type"), String::from("content-type"),
vec![String::from("text/plain")], vec![String::from("text/plain")],
); );
@ -339,18 +339,18 @@ fn parse_field_lines(
field_lines.insert(field_line.0, field_line.1); field_lines.insert(field_line.0, field_line.1);
} }
if !field_lines.contains_key(&String::from("Host")) { if !field_lines.contains_key(&String::from("host")) {
"field-line with key HOST is missing" "field-line with field-name -> host is missing"
.as_bytes() .as_bytes()
.iter() .iter()
.for_each(|byte| response_body.push(*byte)); .for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Type"), String::from("content-type"),
vec![String::from("text/plain")], vec![String::from("text/plain")],
); );
@ -415,37 +415,84 @@ fn response_builder(
response response
} }
fn try_get_file(start_line: &StartLine, _field_lines: &HashMap<String, Vec<String>>) -> Vec<u8> { fn try_get_file(start_line: &StartLine, field_lines: &HashMap<String, Vec<String>>) -> Vec<u8> {
let mut response_field_lines: HashMap<String, Vec<String>> = HashMap::new(); let mut response_field_lines: HashMap<String, Vec<String>> = HashMap::new();
let mut response_body: Vec<u8> = vec![]; let mut response_body: Vec<u8> = vec![];
let path: PathBuf = match start_line.target.as_str() { let path: PathBuf = match start_line.target.as_str() {
"/" => PathBuf::from("/www/index.html"), "/" => PathBuf::from("/www/index.html"),
_ => PathBuf::from(format!("/www{}", start_line.target)), _ => PathBuf::from(format!("/www{}", start_line.target)),
}; };
// TODO: Check if wanted file is contained in the optional Accept field-line
// https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/Accept for reference
// let mime_type = match MimeGuess::from_path(&path).first_raw() {
// Some(val) => val,
// _ => {
// return response_builder(RequestMethods::HEAD, "HTTP/1.1 500 ", None, None);
// }
// }
match fs::read(&path) { match fs::read(&path) {
Ok(val) => { Ok(val) => {
val.iter().for_each(|byte| response_body.push(*byte)); val.iter().for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
let mime_type = mime_guess::from_path(&path) let mime_type = mime_guess::from_path(&path)
.first_raw() .first()
.expect("Could not guess mime-type from path"); .expect("Could not guess mime-type from path");
response_field_lines.insert(String::from("Content-Type"), vec![mime_type.to_string()]);
if let Some(vector) = field_lines.get("accept") {
for value in vector {
if mime_type.to_string() == *value {
response_field_lines
.insert(String::from("content-type"), vec![mime_type.to_string()]);
}
if format!("{}/*", mime_type.type_()) == *value {
response_field_lines
.insert(String::from("content-type"), vec![mime_type.to_string()]);
}
if "*/*" == *value {
response_field_lines
.insert(String::from("content-type"), vec![mime_type.to_string()]);
}
}
} else {
response_field_lines
.insert(String::from("content-type"), vec![mime_type.to_string()]);
}
if !response_field_lines.contains_key("content-type") {
// TODO: make better according to https://datatracker.ietf.org/doc/html/rfc9110#status.406
return response_builder(start_line.method, "HTTP/1.1 406 ", None, None);
}
response_builder(
start_line.method,
"HTTP/1.1 200 ",
Some(response_field_lines),
Some(response_body),
)
}
Err(_) => response_builder(start_line.method, "HTTP/1.1 404 ", None, None),
}
}
fn try_get_file_internal(start_line: &StartLine) -> Vec<u8> {
let mut response_field_lines: HashMap<String, Vec<String>> = HashMap::new();
let mut response_body: Vec<u8> = vec![];
let path: PathBuf = PathBuf::from(format!("/internal{}.html", start_line.target));
match fs::read(&path) {
Ok(val) => {
val.iter().for_each(|byte| response_body.push(*byte));
response_field_lines.insert(
String::from("content-length"),
vec![response_body.len().to_string()],
);
let mime_type = mime_guess::from_path(&path)
.first()
.expect("Could not guess mime-type from path");
response_field_lines.insert(String::from("content-type"), vec![mime_type.to_string()]);
response_builder( response_builder(
start_line.method, start_line.method,
@ -478,11 +525,11 @@ fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> {
.for_each(|byte| response_body.push(*byte)); .for_each(|byte| response_body.push(*byte));
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("content-length"),
vec![response_body.len().to_string()], vec![response_body.len().to_string()],
); );
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Type"), String::from("content-type"),
vec![String::from("text/plain")], vec![String::from("text/plain")],
); );
@ -503,7 +550,7 @@ fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> {
return Ok(()); return Ok(());
} }
}; };
dbg!(&start_line); // dbg!(&start_line);
let field_lines = match parse_field_lines(&mut reader) { let field_lines = match parse_field_lines(&mut reader) {
Ok(val) => val, Ok(val) => val,
@ -512,7 +559,7 @@ fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> {
return Ok(()); return Ok(());
} }
}; };
dbg!(&field_lines); // dbg!(&field_lines);
// let mut request_body: Vec<u8> = vec![]; // let mut request_body: Vec<u8> = vec![];
// reader.read_to_end(&mut request_body)?; // reader.read_to_end(&mut request_body)?;
@ -520,8 +567,8 @@ fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> {
let response = match start_line.target.as_str() { let response = match start_line.target.as_str() {
// For docker healtcheck. If the server can properly respond, then it must be healthy. // For docker healtcheck. If the server can properly respond, then it must be healthy.
"/server-health" => response_builder(RequestMethods::Head, "HTTP/1.1 200 ", None, None), "/server-health" => response_builder(RequestMethods::Head, "HTTP/1.1 200 ", None, None),
// "/server-stats" => response_builder(start_line.method, "HTTP/1.1 404 ", None, None), "/server-stats" => try_get_file_internal(&start_line),
// "/server-info" => response_builder(start_line.method, "HTTP/1.1 404 ", None, None), "/server-info" => try_get_file_internal(&start_line),
_ => try_get_file(&start_line, &field_lines), _ => try_get_file(&start_line, &field_lines),
}; };
stream.write_all(&response)?; stream.write_all(&response)?;