AustrianToast/http_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change signature of Hashmap

Browse Source
This commit is contained in:
AustrianToast
2025-03-27 09:51:44 +01:00
parent 0fd7795ace
commit d5b4dcedd6
1 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/main.rs
View File

@ -110,7 +110,7 @@ impl StartLine {
} }
fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> { fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
let mut response_field_lines: HashMap<String, 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 mut start_line = StartLine::new(); let mut start_line = StartLine::new();
let vec = input.trim().split_ascii_whitespace().collect::<Vec<&str>>(); let vec = input.trim().split_ascii_whitespace().collect::<Vec<&str>>();
@ -126,9 +126,12 @@ fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
response_body.len().to_string(), vec![response_body.len().to_string()],
);
response_field_lines.insert(
String::from("Content-Type"),
vec![String::from("text/plain")],
); );
response_field_lines.insert(String::from("Content-Type"), String::from("text/plain"));
return Err(response_builder( return Err(response_builder(
RequestMethods::Get, RequestMethods::Get,
@ -166,9 +169,12 @@ fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
response_body.len().to_string(), vec![response_body.len().to_string()],
);
response_field_lines.insert(
String::from("Content-Type"),
vec![String::from("text/plain")],
); );
response_field_lines.insert(String::from("Content-Type"), String::from("text/plain"));
return Err(response_builder( return Err(response_builder(
RequestMethods::Head, RequestMethods::Head,
@ -200,10 +206,10 @@ fn parse_start_line(input: &str) -> Result<StartLine, Vec<u8>> {
fn parse_field_lines( fn parse_field_lines(
reader: &mut BufReader<&mut TcpStream>, reader: &mut BufReader<&mut TcpStream>,
) -> Result<HashMap<String, String>, Vec<u8>> { ) -> Result<HashMap<String, Vec<String>>, Vec<u8>> {
let mut response_field_lines: HashMap<String, 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 mut field_lines: HashMap<String, String> = HashMap::new(); let mut field_lines: HashMap<String, Vec<String>> = HashMap::new();
// Read field-lines till I hit an empty line // Read field-lines till I hit an empty line
loop { loop {
@ -218,9 +224,12 @@ fn parse_field_lines(
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
response_body.len().to_string(), vec![response_body.len().to_string()],
);
response_field_lines.insert(
String::from("Content-Type"),
vec![String::from("text/plain")],
); );
response_field_lines.insert(String::from("Content-Type"), String::from("text/plain"));
return Err(response_builder( return Err(response_builder(
RequestMethods::Get, RequestMethods::Get,
@ -244,10 +253,12 @@ fn parse_field_lines(
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
response_body.len().to_string(), vec![response_body.len().to_string()],
);
response_field_lines.insert(
String::from("Content-Type"),
vec![String::from("text/plain")],
); );
response_field_lines
.insert(String::from("Content-Type"), String::from("text/plain"));
return Err(response_builder( return Err(response_builder(
RequestMethods::Get, RequestMethods::Get,
@ -258,7 +269,10 @@ fn parse_field_lines(
} }
}; };
field_lines.insert(field_line.0.to_owned(), field_line.1.trim().to_owned()); field_lines.insert(
field_line.0.to_owned(),
vec![field_line.1.trim().to_owned()],
);
} }
if !field_lines.contains_key(&String::from("Host")) { if !field_lines.contains_key(&String::from("Host")) {
@ -269,9 +283,12 @@ fn parse_field_lines(
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
response_body.len().to_string(), vec![response_body.len().to_string()],
);
response_field_lines.insert(
String::from("Content-Type"),
vec![String::from("text/plain")],
); );
response_field_lines.insert(String::from("Content-Type"), String::from("text/plain"));
return Err(response_builder( return Err(response_builder(
RequestMethods::Get, RequestMethods::Get,
@ -287,7 +304,7 @@ fn parse_field_lines(
fn response_builder( fn response_builder(
method: RequestMethods, method: RequestMethods,
status_line: &str, status_line: &str,
field_lines: Option<HashMap<String, String>>, field_lines: Option<HashMap<String, Vec<String>>>,
body: Option<Vec<u8>>, body: Option<Vec<u8>>,
) -> Vec<u8> { ) -> Vec<u8> {
let mut response: Vec<u8> = vec![]; let mut response: Vec<u8> = vec![];
@ -310,11 +327,9 @@ fn response_builder(
response.push(b':'); response.push(b':');
response.push(b' '); response.push(b' ');
field_line for val in field_line.1 {
.1 val.as_bytes().iter().for_each(|byte| response.push(*byte));
.as_bytes() }
.iter()
.for_each(|byte| response.push(*byte));
response.push(b'\r'); response.push(b'\r');
response.push(b'\n'); response.push(b'\n');
@ -336,8 +351,8 @@ fn response_builder(
response response
} }
fn try_get_file(start_line: &StartLine, _field_lines: &HashMap<String, 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, 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() {
@ -360,13 +375,13 @@ fn try_get_file(start_line: &StartLine, _field_lines: &HashMap<String, String>)
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
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_raw()
.expect("Could not guess mime-type from path"); .expect("Could not guess mime-type from path");
response_field_lines.insert(String::from("Content-Type"), mime_type.to_string()); response_field_lines.insert(String::from("Content-Type"), vec![mime_type.to_string()]);
response_builder( response_builder(
start_line.method, start_line.method,
@ -382,7 +397,7 @@ fn try_get_file(start_line: &StartLine, _field_lines: &HashMap<String, String>)
fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> { fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> {
let mut line = String::new(); let mut line = String::new();
let mut reader = BufReader::new(&mut stream); let mut reader = BufReader::new(&mut stream);
let mut response_field_lines: HashMap<String, 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![];
// Request can have one or many empty lines preceding the start-line and I will ignore these // Request can have one or many empty lines preceding the start-line and I will ignore these
@ -400,9 +415,12 @@ fn handle_request(mut stream: TcpStream) -> Result<(), Box<dyn Error>> {
response_field_lines.insert( response_field_lines.insert(
String::from("Content-Length"), String::from("Content-Length"),
response_body.len().to_string(), vec![response_body.len().to_string()],
);
response_field_lines.insert(
String::from("Content-Type"),
vec![String::from("text/plain")],
); );
response_field_lines.insert(String::from("Content-Type"), String::from("text/plain"));
let response = response_builder( let response = response_builder(
RequestMethods::Get, RequestMethods::Get,
@ -438,8 +456,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" => response_builder(start_line.method, "HTTP/1.1 404 ", None, None),
"/server-info" => response_builder(start_line.method, "HTTP/1.1 404 ", None, None), // "/server-info" => response_builder(start_line.method, "HTTP/1.1 404 ", None, None),
_ => try_get_file(&start_line, &field_lines), _ => try_get_file(&start_line, &field_lines),
}; };
stream.write_all(&response)?; stream.write_all(&response)?;