Fix #2033: Web Chat id Path Traversal

Author: glaziermag

mistralrs-cli/src/ui/handlers/api.rs

@@ -21,7 +21,7 @@ use crate::ui::types::{
     AppState, ChatFile, DeleteChatRequest, LoadChatRequest, NewChatRequest, RenameChatRequest,
     SelectRequest,
 };
-use crate::ui::utils::get_cache_dir;
+use crate::ui::utils::{get_cache_dir, is_chat_id_safe};
 
 fn validate_image_upload(
     filename: Option<&str>,
@@ -373,6 +373,9 @@ pub async fn delete_chat(
     Extension(app): Extension<Arc<AppState>>,
     Json(req): Json<DeleteChatRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     let path = format!("{}/{}.json", app.chats_dir, req.id);
     match fs::remove_file(&path).await {
         Ok(_) => (StatusCode::OK, "Deleted").into_response(),
@@ -384,6 +387,9 @@ pub async fn load_chat(
     Extension(app): Extension<Arc<AppState>>,
     Json(req): Json<LoadChatRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     let path = format!("{}/{}.json", app.chats_dir, req.id);
     if let Ok(bytes) = fs::read(&path).await {
         if let Ok(chat) = serde_json::from_slice::<ChatFile>(&bytes) {
@@ -399,6 +405,9 @@ pub async fn rename_chat(
     Extension(app): Extension<Arc<AppState>>,
     Json(req): Json<RenameChatRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     let path = format!("{}/{}.json", app.chats_dir, req.id);
     if let Ok(bytes) = fs::read(&path).await {
         if let Ok(mut chat) = serde_json::from_slice::<ChatFile>(&bytes) {
@@ -427,6 +436,9 @@ pub async fn append_message(
     Extension(app): Extension<Arc<AppState>>,
     Json(req): Json<AppendMessageRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     if let Err(e) = append_chat_message(&app, &req.id, &req.role, &req.content, req.images).await {
         error!("append message error: {}", e);
         return (StatusCode::INTERNAL_SERVER_ERROR, "append failed").into_response();

mistralrs-cli/src/ui/utils.rs

@@ -12,3 +12,29 @@ pub fn get_cache_dir() -> PathBuf {
         });
     cache_home.join("mistralrs")
 }
+
+/// Check if a chat ID is safe to use in a filename.
+pub fn is_chat_id_safe(id: &str) -> bool {
+    if id.is_empty() {
+        return false;
+    }
+    id.chars().all(|c| c.is_alphanumeric() || c == '_' || c == '-')
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_chat_id_safe() {
+        assert!(is_chat_id_safe("chat_1"));
+        assert!(is_chat_id_safe("chat-2"));
+        assert!(is_chat_id_safe("chat_3-4"));
+        assert!(!is_chat_id_safe("../etc/passwd"));
+        assert!(!is_chat_id_safe("..\\windows\\system32"));
+        assert!(!is_chat_id_safe("chat.json"));
+        assert!(!is_chat_id_safe("chat 1"));
+        assert!(!is_chat_id_safe("chat/1"));
+        assert!(!is_chat_id_safe(""));
+    }
+}

mistralrs-web-chat/src/handlers/api.rs

@@ -27,7 +27,7 @@ use crate::types::{
     // Append partial assistant messages
     // (defined below)
 };
-use crate::utils::get_cache_dir;
+use crate::utils::{get_cache_dir, is_chat_id_safe};
 use serde::Deserialize;
 
 fn validate_image_upload(
@@ -458,6 +458,9 @@ pub async fn delete_chat(
     State(app): State<Arc<AppState>>,
     Json(req): Json<DeleteChatRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     let path = format!("{}/{}.json", app.chats_dir, req.id);
     if let Err(e) = tokio::fs::remove_file(&path).await {
         error!("delete chat error: {}", e);
@@ -478,6 +481,9 @@ pub async fn load_chat(
     State(app): State<Arc<AppState>>,
     Json(req): Json<LoadChatRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     let path = format!("{}/{}.json", app.chats_dir, req.id);
     match fs::read(&path).await {
         Ok(data) => match serde_json::from_slice::<ChatFile>(&data) {
@@ -510,6 +516,9 @@ pub async fn rename_chat(
     State(app): State<Arc<AppState>>,
     Json(req): Json<RenameChatRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     let path = format!("{}/{}.json", app.chats_dir, req.id);
     if let Ok(data) = fs::read(&path).await {
         if let Ok(mut chat) = serde_json::from_slice::<ChatFile>(&data) {
@@ -538,6 +547,9 @@ pub async fn append_message(
     State(app): State<Arc<AppState>>,
     Json(req): Json<AppendMessageRequest>,
 ) -> impl IntoResponse {
+    if !is_chat_id_safe(&req.id) {
+        return (StatusCode::BAD_REQUEST, "invalid chat id").into_response();
+    }
     if let Err(e) =
         crate::chat::append_chat_message(&app, &req.id, &req.role, &req.content, req.images).await
     {

mistralrs-web-chat/src/utils.rs

@@ -13,3 +13,29 @@ pub fn get_cache_dir() -> PathBuf {
         });
     cache_home.join("mistralrs-web-chat")
 }
+
+/// Check if a chat ID is safe to use in a filename.
+pub fn is_chat_id_safe(id: &str) -> bool {
+    if id.is_empty() {
+        return false;
+    }
+    id.chars().all(|c| c.is_alphanumeric() || c == '_' || c == '-')
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_is_chat_id_safe() {
+        assert!(is_chat_id_safe("chat_1"));
+        assert!(is_chat_id_safe("chat-2"));
+        assert!(is_chat_id_safe("chat_3-4"));
+        assert!(!is_chat_id_safe("../etc/passwd"));
+        assert!(!is_chat_id_safe("..\\windows\\system32"));
+        assert!(!is_chat_id_safe("chat.json"));
+        assert!(!is_chat_id_safe("chat 1"));
+        assert!(!is_chat_id_safe("chat/1"));
+        assert!(!is_chat_id_safe(""));
+    }
+}