Skip to content

fix: replace panic-prone .unwrap() calls with proper error handling i… #264

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

Open
jmanhype wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: replace panic-prone .unwrap() calls with proper error handling i… #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions forge-app/src/router.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,9 +1069,14 @@ async fn handle_forge_tasks_ws(
"path": "/tasks",
"value": filtered_tasks
}]);
return Some(Ok(LogMsg::JsonPatch(
serde_json::from_value(filtered_patch).unwrap(),
)));
match serde_json::from_value(filtered_patch) {
Ok(patch) => return Some(Ok(LogMsg::JsonPatch(patch))),
Err(e) => {
tracing::error!("Failed to deserialize filtered JSON patch: {}. Skipping patch to prevent data leak.", e);
// Skip this patch entirely rather than falling back to unfiltered data
return None;
}
}
}
}
// Pass through non-task patches
Expand Down Expand Up @@ -1501,10 +1506,11 @@ async fn serve_static_file<T: RustEmbed>(path: &str) -> Response {
let mime = mime_guess::from_path(path).first_or_octet_stream();

let mut response = Response::new(content.data.into());
response.headers_mut().insert(
header::CONTENT_TYPE,
HeaderValue::from_str(mime.as_ref()).unwrap(),
);
let content_type = HeaderValue::from_str(mime.as_ref()).unwrap_or_else(|e| {
tracing::warn!("Invalid MIME type for path '{}': {}, falling back to application/octet-stream", path, e);
HeaderValue::from_static("application/octet-stream")
});
response.headers_mut().insert(header::CONTENT_TYPE, content_type);
response
}
None => {
Expand Down