From e89229896f5372ab911238b72d4e3cbed10f8adb Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 4 Apr 2026 16:50:44 -0400 Subject: [PATCH] character descriptions max length (#1302) --- .../endpoints/characters/common.rs | 1 + .../characters/create_character_handler.rs | 11 ++++++++++- .../characters/edit_character_handler.rs | 19 +++++++++++++------ .../http_server/endpoints/characters/mod.rs | 1 + 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 crates/service/web/storyteller_web/src/http_server/endpoints/characters/common.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/common.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/common.rs new file mode 100644 index 0000000000..9e59f9a29e --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/common.rs @@ -0,0 +1 @@ +pub const CHARACTER_MAX_DESCRIPTION_LENGTH: usize = 500; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs index fa8fd2d40e..17fc02a514 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs @@ -29,8 +29,9 @@ use crate::state::server_state::ServerState; use crate::util::http_download_url_to_bytes::http_download_url_to_bytes; use crate::util::lookup::lookup_media_file_urls_as_map::lookup_media_file_urls_as_map; +use super::common::CHARACTER_MAX_DESCRIPTION_LENGTH; + const MAX_NAME_LENGTH: usize = 255; -const MAX_DESCRIPTION_LENGTH: usize = 512; /// Create a new character. #[utoipa::path( @@ -86,6 +87,14 @@ pub async fn create_character_handler( let character_description = request.character_description.as_deref() .map(|desc| desc.trim()); + if let Some(desc) = character_description { + if desc.len() > CHARACTER_MAX_DESCRIPTION_LENGTH { + return Err(AdvancedCommonWebError::BadInputWithSimpleMessage( + format!("Description exceeds maximum length of {} characters.", CHARACTER_MAX_DESCRIPTION_LENGTH), + )); + } + } + // --- Look up the image media file --- let file_urls_by_token = lookup_media_file_urls_as_map( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/edit_character_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/edit_character_handler.rs index 8f93b83ce4..2934dfb624 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/edit_character_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/edit_character_handler.rs @@ -71,7 +71,7 @@ pub async fn edit_character_handler( // --- Determine what to update --- let new_name = resolve_name_update(&request.updated_name); - let description_update = resolve_description_update(&request.updated_description); + let description_update = resolve_description_update(&request.updated_description)?; let has_name_change = new_name.is_some(); let has_description_change = !matches!(description_update, DescriptionUpdateType::NoUpdate); @@ -138,8 +138,9 @@ pub async fn edit_character_handler( // =============== Private helpers =============== +use super::common::CHARACTER_MAX_DESCRIPTION_LENGTH; + const MAX_NAME_LENGTH: usize = 50; -const MAX_DESCRIPTION_LENGTH: usize = 500; enum DescriptionUpdateType { NoUpdate, @@ -160,17 +161,23 @@ fn resolve_name_update(updated_name: &Option) -> Option { } /// Determine the description update type. -fn resolve_description_update(updated_description: &Option) -> DescriptionUpdateType { +fn resolve_description_update( + updated_description: &Option, +) -> Result { let desc = match updated_description.as_ref() { - None => return DescriptionUpdateType::NoUpdate, + None => return Ok(DescriptionUpdateType::NoUpdate), Some(d) => d, }; let trimmed = desc.trim(); if trimmed.is_empty() { - DescriptionUpdateType::Nullify + Ok(DescriptionUpdateType::Nullify) + } else if trimmed.len() > CHARACTER_MAX_DESCRIPTION_LENGTH { + Err(AdvancedCommonWebError::BadInputWithSimpleMessage( + format!("Description exceeds maximum length of {} characters.", CHARACTER_MAX_DESCRIPTION_LENGTH), + )) } else { - DescriptionUpdateType::Update(truncate(trimmed, MAX_DESCRIPTION_LENGTH)) + Ok(DescriptionUpdateType::Update(trimmed.to_string())) } } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/mod.rs index 3bad866c7d..0a8af51498 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/mod.rs @@ -1,3 +1,4 @@ +pub mod common; pub mod create_character_handler; pub mod delete_character_handler; pub mod edit_character_handler;