marcoallegretti/karapace
1
0
Fork 0
mirror of https://github.com/marcoallegretti/karapace.git synced 2026-03-26 21:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(server): avoid panics in HTTP server

Browse source
This commit is contained in:
Marco Allegretti 2026-02-25 12:32:00 +01:00
parent 06b8889d27
commit 9ad61cbf0c
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
crates/karapace-server/src/lib.rs
View file

@ -81,13 +81,19 @@ impl Store {
let reg_path = self.data_dir.join("registry.json"); let reg_path = self.data_dir.join("registry.json");
fs::create_dir_all(&self.data_dir)?; fs::create_dir_all(&self.data_dir)?;
fs::write(&reg_path, data)?; fs::write(&reg_path, data)?;
let mut reg = self.registry.write().expect("registry lock poisoned"); let mut reg = match self.registry.write() {
Ok(g) => g,
Err(e) => e.into_inner(),
};
*reg = Some(data.to_vec()); *reg = Some(data.to_vec());
Ok(()) Ok(())
} }
pub fn get_registry(&self) -> Option<Vec<u8>> { pub fn get_registry(&self) -> Option<Vec<u8>> {
let reg = self.registry.read().expect("registry lock poisoned"); let reg = match self.registry.read() {
Ok(g) => g,
Err(e) => e.into_inner(),
};
reg.clone() reg.clone()
} }
} }
@ -152,14 +158,19 @@ fn respond_err(req: tiny_http::Request, code: u16, msg: &str) {
} }
fn respond_octet(req: tiny_http::Request, data: Vec<u8>) { fn respond_octet(req: tiny_http::Request, data: Vec<u8>) {
let header = let mut resp = Response::from_data(data);
Header::from_bytes("Content-Type", "application/octet-stream").expect("valid header"); if let Ok(header) = Header::from_bytes("Content-Type", "application/octet-stream") {
let _ = req.respond(Response::from_data(data).with_header(header)); resp = resp.with_header(header);
}
let _ = req.respond(resp);
} }
fn respond_json(req: tiny_http::Request, json: impl Into<Vec<u8>>) { fn respond_json(req: tiny_http::Request, json: impl Into<Vec<u8>>) {
let header = Header::from_bytes("Content-Type", "application/json").expect("valid header"); let mut resp = Response::from_data(json.into());
let _ = req.respond(Response::from_data(json.into()).with_header(header)); if let Ok(header) = Header::from_bytes("Content-Type", "application/json") {
resp = resp.with_header(header);
}
let _ = req.respond(resp);
} }
fn read_body(req: &mut tiny_http::Request) -> Option<Vec<u8>> { fn read_body(req: &mut tiny_http::Request) -> Option<Vec<u8>> {
@ -262,7 +273,13 @@ pub fn handle_request(store: &Store, req: tiny_http::Request) {
/// Start the server loop, blocking the current thread. /// Start the server loop, blocking the current thread.
pub fn run_server(store: &Arc<Store>, addr: &str) { pub fn run_server(store: &Arc<Store>, addr: &str) {
let server = Server::http(addr).expect("failed to bind HTTP server"); let server = match Server::http(addr) {
Ok(s) => s,
Err(e) => {
error!("failed to bind HTTP server on {addr}: {e}");
return;
}
};
for request in server.incoming_requests() { for request in server.incoming_requests() {
handle_request(store, request); handle_request(store, request);
} }