From dc36ccb6ba0367ef9aace0f9eeb9e574d4ea66d0 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 11 Nov 2026 11:58:17 -0500 Subject: [PATCH 1/2] fix: stop generation from reading other users' private media (#229) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit > **Stacked on #228**, which adds `util/lookup/media_read_policy.rs`. Merge that first; this PR then rebases onto `main` cleanly. ## Summary Every generation endpoint takes media tokens from the request (`start_frame_media_token`, `reference_image_media_tokens`, inpainting sources, image-to-3D inputs, …) and resolved them through `batch_get_media_files_by_tokens`, which only filtered on existence and soft deletion. Possession of a token therefore authorised use of the record: another user's private image could be submitted as a generation input, and several paths (`lookup_image_urls_as_map`, `lookup_image_urls_as_optional_list`, `lookup_media_files_as_cdn_url_list_and_map`) handed back a CDN URL for it too. ## Changes - `batch_get_media_files_by_tokens` (all three wrappers) takes a `MediaReadScope { viewer_user_token, is_mod }` and adds, for non-moderators: `AND (m.creator_set_visibility <> 'Private' OR m.maybe_creator_user_token IS NULL OR m.maybe_creator_user_token = ?)` Records with no creator are system intermediates that generation depends on; they are not anyone's private data, so they remain readable. Tokens are still bound, not interpolated. - The five lookup helpers forward the scope; `fetch_reference_video_sources` and the query wrappers take it as a parameter. - Call sites supply the requester: `scope_for_session` for cookie sessions (so moderators keep their access), `scope_for_user_token` for API-key/SSO callers, `MediaReadScope::ANONYMOUS` for the two genuinely unauthenticated paths (the cost-quote duration probe and the curated pinned-media list). - `get_character_handler` previously read no session at all; it now resolves one so a creator can still see their own private uploads while anonymous callers cannot. ## Behaviour changes worth reviewing - A generation request naming someone else's private token now fails as "media not found" rather than generating from it. - Private media can no longer be used as a generation input, even by a logged-in non-owner. That is the point of the fix, but it is a real behaviour change for any client that reused tokens across accounts. - Anonymous callers no longer resolve private media for pinned lists or cost quotes. ## Checks - `SQLX_OFFLINE=true cargo check -p storyteller-web` — finished clean, exit 0. - No tests run: the media query and endpoint tests need a live MySQL, which this environment does not provide. The 58-file diff is almost entirely one added argument per call site; a reviewer should spot-check the two `ANONYMOUS` sites and the `get_character_handler` session addition. --- .../get/batch_get_media_files_by_tokens.rs | 46 ++++++++++++++++--- .../steps/download_input_videos.rs | 7 ++- .../characters/create_character_handler.rs | 1 + .../characters/get_character_handler.rs | 14 +++++- .../characters/list_characters_handler.rs | 2 +- .../common/probed_reference_videos.rs | 4 +- .../flux_2_lora_edit_image_angle_handler.rs | 1 + ...qwen_edit_2511_edit_image_angle_handler.rs | 1 + ...flux_pro_kontext_max_edit_image_handler.rs | 1 + .../gemini_25_flash_edit_image_handler.rs | 1 + .../edit/gpt_image_1_edit_image_handler.rs | 1 + .../image/edit/qwen_edit_image_handler.rs | 1 + .../edit/seededit_3_edit_image_handler.rs | 1 + .../flux_dev_juggernaut_inpaint_handler.rs | 1 + .../inpaint/flux_pro_1_inpaint_handler.rs | 1 + ...5_lite_multi_function_image_gen_handler.rs | 1 + ...eam_v4_multi_function_image_gen_handler.rs | 1 + ...m_v4p5_multi_function_image_gen_handler.rs | 1 + ...ge_1p5_multi_function_image_gen_handler.rs | 1 + ...nana_2_multi_function_image_gen_handler.rs | 1 + ...banana_multi_function_image_gen_handler.rs | 1 + ...na_pro_multi_function_image_gen_handler.rs | 1 + ...yuan3d_v3_multi_function_object_handler.rs | 1 + ...worldlabs_marble_0p1_mini_splat_handler.rs | 1 + ...worldlabs_marble_0p1_plus_splat_handler.rs | 1 + .../beeble_switchx_edit_video_gen_handler.rs | 1 + .../generate_kling_1_6_pro_video_handler.rs | 1 + .../generate_kling_2_1_pro_video_handler.rs | 1 + ...eedance_1_0_lite_image_to_video_handler.rs | 1 + ...seedance_1_0_pro_image_to_video_handler.rs | 1 + ...bo_pro_multi_function_video_gen_handler.rs | 1 + ...p6_pro_multi_function_video_gen_handler.rs | 1 + ...p0_pro_multi_function_video_gen_handler.rs | 1 + ...andard_multi_function_video_gen_handler.rs | 1 + ...p5_pro_multi_function_video_gen_handler.rs | 1 + ...ce_2p0_multi_function_video_gen_handler.rs | 1 + ...sora_2_multi_function_video_gen_handler.rs | 1 + ..._2_pro_multi_function_video_gen_handler.rs | 1 + ...1_fast_multi_function_video_gen_handler.rs | 1 + ...eo_3p1_multi_function_video_gen_handler.rs | 1 + .../get/batch_get_media_files_handler.rs | 15 ++++++ .../helpers/get_scoped_media_classes.rs | 2 +- .../list/list_pinned_media_files_handler.rs | 9 +++- .../image/omni_api_image_generate_handler.rs | 1 + .../cost/video/omni_gen_video_cost_handler.rs | 11 +++++ .../audio/omni_gen_audio_generate_handler.rs | 1 + .../image/omni_gen_image_generate_handler.rs | 1 + .../mesh/omni_gen_mesh_generate_handler.rs | 1 + .../splat/omni_gen_splat_generate_handler.rs | 1 + .../generate/video/shared_video_generation.rs | 2 + .../http_server/endpoints/tags/tag_input.rs | 2 +- .../lookup/user_session_feature_flags.rs | 2 +- .../src/util/internal_api_key.rs | 2 +- .../lookup/fetch_all_required_media_files.rs | 4 +- .../lookup/hide_unreadable_job_results.rs | 8 +++- .../util/lookup/lookup_image_urls_as_map.rs | 4 +- .../lookup_image_urls_as_optional_list.rs | 4 +- .../lookup/lookup_media_file_urls_as_map.rs | 4 +- ...kup_media_files_as_cdn_url_list_and_map.rs | 4 +- .../src/util/lookup/media_read_policy.rs | 45 ++++++++++++++++++ .../storyteller_web/src/util/lookup/mod.rs | 1 + 61 files changed, 207 insertions(+), 25 deletions(-) create mode 100644 crates/service/web/storyteller_web/src/util/lookup/media_read_policy.rs diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs index 00e3234fe8..2be66cc33c 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/get/batch_get_media_files_by_tokens.rs @@ -75,34 +75,51 @@ pub struct MediaFilesByTokensRecord { pub updated_at: DateTime, } +/// Who is asking, which decides whether private records are returned. `viewer_user_token` is the +/// authenticated user (none for anonymous callers); `is_mod` grants moderator access. +pub struct MediaReadScope<'a> { + pub viewer_user_token: Option<&'a str>, + pub is_mod: bool, +} + +impl MediaReadScope<'_> { + /// An anonymous, unprivileged reader: only public, hidden and creator-less records are returned. + pub const ANONYMOUS: MediaReadScope<'static> = MediaReadScope { viewer_user_token: None, is_mod: false }; +} + pub async fn batch_get_media_files_by_tokens( mysql_pool: &MySqlPool, media_file_tokens: &[MediaFileToken], - can_see_deleted: bool + can_see_deleted: bool, + scope: &MediaReadScope<'_>, ) -> AnyhowResult> { batch_get_media_files_by_tokens_with_transactor( Transactor::Pool { pool: mysql_pool }, media_file_tokens, - can_see_deleted + can_see_deleted, + scope, ).await } pub async fn batch_get_media_files_by_tokens_with_connection( mysql_connection: &mut PoolConnection, media_file_tokens: &[MediaFileToken], - can_see_deleted: bool + can_see_deleted: bool, + scope: &MediaReadScope<'_>, ) -> AnyhowResult> { batch_get_media_files_by_tokens_with_transactor( Transactor::Connection{ connection: mysql_connection }, media_file_tokens, - can_see_deleted + can_see_deleted, + scope, ).await } pub async fn batch_get_media_files_by_tokens_with_transactor( transactor: Transactor<'_, '_>, media_file_tokens: &[MediaFileToken], - can_see_deleted: bool + can_see_deleted: bool, + scope: &MediaReadScope<'_>, ) -> AnyhowResult> { if media_file_tokens.is_empty() { // NB: We should always eagerly return, but if we don't, the query builder will build an @@ -110,7 +127,8 @@ pub async fn batch_get_media_files_by_tokens_with_transactor( return Ok(vec![]); } - let raw_media_files: Vec = get_raw_media_files_by_tokens(transactor, media_file_tokens, can_see_deleted).await?; + let raw_media_files: Vec = + get_raw_media_files_by_tokens(transactor, media_file_tokens, can_see_deleted, scope).await?; Ok(map_to_media_files(raw_media_files)) } @@ -118,7 +136,8 @@ pub async fn batch_get_media_files_by_tokens_with_transactor( async fn get_raw_media_files_by_tokens( mut transactor: Transactor<'_, '_>, media_file_tokens: &[MediaFileToken], - can_see_deleted: bool + can_see_deleted: bool, + scope: &MediaReadScope<'_>, ) -> AnyhowResult> { let mut query_builder : QueryBuilder = if can_see_deleted { @@ -274,6 +293,19 @@ async fn get_raw_media_files_by_tokens( query_builder.push(")"); + if !scope.is_mod { + // NB: A private record belongs to its creator. Records with no creator are system + // intermediates that generation depends on, not anyone's private media. + query_builder.push(" AND (m.creator_set_visibility <> "); + query_builder.push_bind(Visibility::Private.to_str()); + query_builder.push(" OR m.maybe_creator_user_token IS NULL"); + if let Some(viewer_user_token) = scope.viewer_user_token { + query_builder.push(" OR m.maybe_creator_user_token = "); + query_builder.push_bind(viewer_user_token); + } + query_builder.push(")"); + } + let query = query_builder.build_query_as::(); let results = match transactor { diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/download_input_videos.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/download_input_videos.rs index a1fcbe1d6a..b1bc10746b 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/download_input_videos.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/video_style_transfer/steps/download_input_videos.rs @@ -6,7 +6,7 @@ use sqlx::MySqlConnection; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient; use filesys::path_to_string::path_to_string; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_transactor, MediaFilesByTokensRecord}; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_transactor, MediaFilesByTokensRecord, MediaReadScope}; use mysql_queries::queries::media_files::get::get_media_file::get_media_file_with_transactor; use mysql_queries::utils::transactor::Transactor; use tokens::tokens::media_files::MediaFileToken; @@ -137,7 +137,10 @@ async fn maybe_download_secondary_videos( let results = batch_get_media_files_by_tokens_with_transactor( Transactor::for_connection(args.mysql_connection), &tokens, - CAN_SEE_DELETED) + CAN_SEE_DELETED, + // NB: The worker reads job inputs with the service's own access; the requester's access to + // them is checked when the job is enqueued. + &MediaReadScope { viewer_user_token: None, is_mod: true }) .await .map_err(|err| { ProcessSingleJobError::Other(anyhow!("error querying secondary videos: {:?}", &err)) 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 502d18d6ed..fbdc66af50 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 @@ -96,6 +96,7 @@ pub async fn create_character_handler( &mut mysql_connection, server_state.server_environment, &[request.image_media_token.clone()], + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; let image_cdn_url = file_urls_by_token diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/get_character_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/get_character_handler.rs index 6df717406d..2187fbde54 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/get_character_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/get_character_handler.rs @@ -42,6 +42,13 @@ pub async fn get_character_handler( let mut mysql_connection = server_state.mysql_pool.acquire().await?; + // NB: Characters are public, but the media they reference is not necessarily: a creator's upload + // can be Private, so the read scope decides which of its records may be resolved. + let maybe_user_session = server_state + .session_checker + .maybe_get_user_session(&http_request, &server_state.mysql_pool) + .await?; + let character = get_character_by_token(&path.character_token, &mut mysql_connection) .await? .ok_or_else(|| { @@ -64,7 +71,12 @@ pub async fn get_character_handler( // NB: This endpoint is public, so deleted media must not be resolved into links (the list // endpoint already excludes it). const CAN_SEE_DELETED: bool = false; - batch_get_media_files_by_tokens_with_connection(&mut mysql_connection, &media_tokens_to_lookup, CAN_SEE_DELETED) + batch_get_media_files_by_tokens_with_connection( + &mut mysql_connection, + &media_tokens_to_lookup, + CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), + ) .await .unwrap_or_else(|err| { warn!("Failed to look up media files for character: {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/list_characters_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/list_characters_handler.rs index 2a183e7648..5cd90e7f9c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/list_characters_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/list_characters_handler.rs @@ -76,7 +76,7 @@ pub async fn list_characters_handler( let media_records = if media_tokens_to_lookup.is_empty() { vec![] } else { - batch_get_media_files_by_tokens_with_connection(&mut mysql_connection, &media_tokens_to_lookup, false) + batch_get_media_files_by_tokens_with_connection(&mut mysql_connection, &media_tokens_to_lookup, false, &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false)) .await .unwrap_or_else(|err| { warn!("Failed to look up media files for characters: {:?}", err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/probed_reference_videos.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/probed_reference_videos.rs index 3f16532711..cc2ef9c803 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/probed_reference_videos.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/common/probed_reference_videos.rs @@ -40,7 +40,7 @@ use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path: use ffmpeg_utils::ffprobe::ffprobe_get_info::ffprobe_get_info; use kinovi_web_client::generate::video::generate_seedance_2p5::MAX_BILLED_INPUT_SECONDS; use log::{error, info, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens_with_connection; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaReadScope}; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::MySql; @@ -101,6 +101,7 @@ pub async fn fetch_reference_video_sources( server_environment: ServerEnvironment, maybe_media_cdn_override_url: Option<&str>, mysql_connection: &mut PoolConnection, + scope: &MediaReadScope<'_>, ) -> Result, CommonWebError> { const CAN_SEE_DELETED: bool = false; @@ -119,6 +120,7 @@ pub async fn fetch_reference_video_sources( mysql_connection, &unique_tokens, CAN_SEE_DELETED, + scope, ).await.map_err(|err| { error!("Error getting reference video media files by tokens: {:?}", err); CommonWebError::from_anyhow_error(err) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs index bd6c210bab..d8b5f16466 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/flux_2_lora_edit_image_angle_handler.rs @@ -82,6 +82,7 @@ pub async fn flux_2_lora_edit_image_angle_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? .ok_or_else(|| { warn!("No image URLs found for media token"); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs index 0b6a8495ad..1861f25f3a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/angle/qwen_edit_2511_edit_image_angle_handler.rs @@ -82,6 +82,7 @@ pub async fn qwen_edit_2511_edit_image_angle_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? .ok_or_else(|| { warn!("No image URLs found for media token"); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs index a39a47afcc..e504ec2e6b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/flux_pro_kontext_max_edit_image_handler.rs @@ -102,6 +102,7 @@ pub async fn flux_pro_kontext_max_edit_image_handler( &mut mysql_connection, &media_tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs index ac8c54293a..95d62b558e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gemini_25_flash_edit_image_handler.rs @@ -99,6 +99,7 @@ pub async fn gemini_25_flash_edit_image_handler( &mut mysql_connection, tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs index 49c737796d..5a7d345379 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs @@ -101,6 +101,7 @@ pub async fn gpt_image_1_edit_image_handler( &mut mysql_connection, tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs index 06ebfbac3d..1e912c5a64 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/qwen_edit_image_handler.rs @@ -95,6 +95,7 @@ pub async fn qwen_edit_image_handler( &mut mysql_connection, &media_tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs index ed4d641678..544790e7a1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/seededit_3_edit_image_handler.rs @@ -94,6 +94,7 @@ pub async fn seededit_3_edit_image_handler( &mut mysql_connection, &media_tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs index 8cacdb7aec..4c7f100d16 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_dev_juggernaut_inpaint_handler.rs @@ -94,6 +94,7 @@ pub async fn flux_dev_juggernaut_inpaint_image_handler( &mut mysql_connection, &media_tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs index 5d63225bcb..4f1f24c1fd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/inpaint/flux_pro_1_inpaint_handler.rs @@ -94,6 +94,7 @@ pub async fn flux_pro_1_inpaint_image_handler( &mut mysql_connection, &media_tokens, CAN_SEE_DELETED, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs index 0b1fdf09d1..b91cad2cd3 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_5_lite_multi_function_image_gen_handler.rs @@ -88,6 +88,7 @@ pub async fn bytedance_seedream_5_lite_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }, None => None, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs index 14c0434c0e..dca8274325 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4_multi_function_image_gen_handler.rs @@ -100,6 +100,7 @@ pub async fn bytedance_seedream_v4_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }, None => None, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs index 48290a5c95..ebd867da9c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/bytedance_seedream_v4p5_multi_function_image_gen_handler.rs @@ -100,6 +100,7 @@ pub async fn bytedance_seedream_v4p5_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }, None => None, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs index 1ac6d0af8e..8306f34d6e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/gpt_image_1p5_multi_function_image_gen_handler.rs @@ -117,6 +117,7 @@ pub async fn gpt_image_1p5_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs index 36e65a6deb..6bd11117ba 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_2_multi_function_image_gen_handler.rs @@ -88,6 +88,7 @@ pub async fn nano_banana_2_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }, None => None, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs index 39e12e9b17..db3d898b97 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_multi_function_image_gen_handler.rs @@ -103,6 +103,7 @@ pub async fn nano_banana_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }, None => None, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs index 38fff4d5cc..532bebec3e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/multi_function/nano_banana_pro_multi_function_image_gen_handler.rs @@ -101,6 +101,7 @@ pub async fn nano_banana_pro_multi_function_image_gen_handler( &mut mysql_connection, server_state.server_environment, media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }, None => None, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs index 2011b33186..a850daae5d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/multi_function/generate_hunyuan3d_v3_multi_function_object_handler.rs @@ -110,6 +110,7 @@ pub async fn generate_hunyuan3d_v3_multi_function_object_handler( &mut mysql_connection, server_state.server_environment, &query_media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ) .await? }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs index e4c7e7bfc9..368b5d451a 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs @@ -122,6 +122,7 @@ pub async fn generate_worldlabs_marble_0p1_mini_splat_handler( &mut mysql_connection, server_state.server_environment, &[image_token.clone()], + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await?; let cdn_url = image_urls.get(image_token) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs index 2a85312568..88cf72e0d5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs @@ -122,6 +122,7 @@ pub async fn generate_worldlabs_marble_0p1_plus_splat_handler( &mut mysql_connection, server_state.server_environment, &[image_token.clone()], + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await?; let cdn_url = image_urls.get(image_token) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/edit/beeble_switchx_edit_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/edit/beeble_switchx_edit_video_gen_handler.rs index 9a449228c5..08ba059168 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/edit/beeble_switchx_edit_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/edit/beeble_switchx_edit_video_gen_handler.rs @@ -117,6 +117,7 @@ pub async fn beeble_switchx_edit_video_gen_handler( &mut mysql_connection, server_state.server_environment, &tokens_to_lookup, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await.map_err(|err| { warn!("Error looking up media files: {:?}", err); CommonWebError::from(err) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_1_6_pro_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_1_6_pro_video_handler.rs index 88db2f81ea..93f2240456 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_1_6_pro_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_1_6_pro_video_handler.rs @@ -100,6 +100,7 @@ pub async fn generate_kling_1_6_pro_video_handler( let media_files = fetch_all_required_media_files( &mut mysql_connection, &tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await?; for media_file in media_files.iter() { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_2_1_pro_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_2_1_pro_video_handler.rs index ca0a470c92..79bcc6288d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_2_1_pro_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_kling_2_1_pro_video_handler.rs @@ -105,6 +105,7 @@ pub async fn generate_kling_2_1_pro_video_handler( let media_files = fetch_all_required_media_files( &mut mysql_connection, &tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await?; for media_file in media_files.iter() { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_lite_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_lite_image_to_video_handler.rs index ecbf9896aa..0eb9f7b886 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_lite_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_lite_image_to_video_handler.rs @@ -124,6 +124,7 @@ pub async fn generate_seedance_1_0_lite_image_to_video_handler( let media_files = fetch_all_required_media_files( &mut mysql_connection, &tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await?; for media_file in media_files.iter() { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_pro_image_to_video_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_pro_image_to_video_handler.rs index b9d1b04e89..4a8a3b3a4e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_pro_image_to_video_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/image/generate_seedance_1_0_pro_image_to_video_handler.rs @@ -115,6 +115,7 @@ pub async fn generate_seedance_1_0_pro_image_to_video_handler( let media_files = fetch_all_required_media_files( &mut mysql_connection, &tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await?; for media_file in media_files.iter() { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs index 314c97a6cd..6d13c8dd2d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p5_turbo_pro_multi_function_video_gen_handler.rs @@ -116,6 +116,7 @@ pub async fn kling_2p5_turbo_pro_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs index 7a77e0883c..7d0fff8350 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_2p6_pro_multi_function_video_gen_handler.rs @@ -114,6 +114,7 @@ pub async fn kling_2p6_pro_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs index 697ae9d162..26de3753af 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_pro_multi_function_video_gen_handler.rs @@ -113,6 +113,7 @@ pub async fn kling_3p0_pro_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs index da67fb6141..aa66f9b9f5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/kling_3p0_standard_multi_function_video_gen_handler.rs @@ -113,6 +113,7 @@ pub async fn kling_3p0_standard_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs index ddc566f860..8e9c8b7be5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_1p5_pro_multi_function_video_gen_handler.rs @@ -121,6 +121,7 @@ pub async fn seedance_1p5_pro_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &query_media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs index 9dbb274023..72bea44b85 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs @@ -190,6 +190,7 @@ pub async fn seedance_2p0_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &all_media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(Some(&user_session)), ).await? }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs index da0475c00c..f860a02030 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_multi_function_video_gen_handler.rs @@ -114,6 +114,7 @@ pub async fn sora_2_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs index 614c485c8f..ae2d109a7b 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/sora_2_pro_multi_function_video_gen_handler.rs @@ -114,6 +114,7 @@ pub async fn sora_2_pro_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs index fb48b2f8a8..94c1a84f58 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_fast_multi_function_video_gen_handler.rs @@ -113,6 +113,7 @@ pub async fn veo_3p1_fast_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs index e5f3697d4e..03bbe8ec26 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/veo_3p1_multi_function_video_gen_handler.rs @@ -113,6 +113,7 @@ pub async fn veo_3p1_multi_function_video_gen_handler( &mut mysql_connection, server_state.server_environment, &media_tokens, + &crate::util::lookup::media_read_policy::scope_for_session(maybe_user_session.as_ref()), ).await? } }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs index d2e0ce6325..8d8075f2a0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/batch_get_media_files_handler.rs @@ -33,6 +33,7 @@ use crate::http_server::endpoints::media_files::common_responses::live_portrait: use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain; use crate::http_server::web_utils::bucket_urls::bucket_url_string_from_media_path::bucket_url_string_from_media_path; use crate::state::server_state::ServerState; +use crate::util::lookup::media_read_policy; // =============== Request =============== @@ -216,13 +217,17 @@ pub async fn batch_get_media_files_handler( .await?; let mut show_deleted_results = false; + let mut viewer_user_token: Option = None; if let Some(user_session) = maybe_user_session { // NB: Moderators can see deleted results. // Original creators cannot see them (unless they're moderators!) show_deleted_results = user_session.can_delete_other_users_tts_results; + viewer_user_token = Some(user_session.user_token.as_str().to_string()); } + let is_mod = show_deleted_results; + let tokens = query.tokens.iter() .map(|token| MediaFileToken::new_from_str(&token)) .collect::>(); @@ -246,6 +251,16 @@ pub async fn batch_get_media_files_handler( let media_domain = get_media_domain(&http_request); let media_files = media_files.into_iter() + // NB: Private media is readable only by its creator and by moderators. Records the caller + // may not read are dropped rather than reported, so a batch of guesses discloses nothing. + .filter(|result| { + media_read_policy::ensure_may_read_media( + &result.creator_set_visibility, + result.maybe_creator_user_token.as_ref().map(|token| token.as_str()), + viewer_user_token.as_deref(), + is_mod, + ).is_ok() + }) .map(|result| { let public_bucket_path = MediaFileBucketPath::from_object_hash( &result.public_bucket_directory_hash, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs index 1cbc8e448e..9cbbd905d5 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/helpers/get_scoped_media_classes.rs @@ -51,7 +51,7 @@ mod test { #[test] fn not_just_unknown() { assert_eq!(get_scoped_media_classes(Some("unknown")), None); - assert_eq!(get_scoped_media_classes(Some("unknown,,")), None); + assert_eq!(get_scoped_media_classes(Some("unknown,")), None); } #[test] diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs index c42e56c5d3..4f89b914b6 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_pinned_media_files_handler.rs @@ -14,7 +14,7 @@ use enums::by_table::media_files::media_file_type::MediaFileType; use enums::no_table::style_transfer::style_transfer_name::StyleTransferName; use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType; use log::{debug, error, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, MediaReadScope}; use redis::Commands; use tokens::tokens::media_files::MediaFileToken; use utoipa::ToSchema; @@ -166,7 +166,12 @@ pub async fn list_pinned_media_files_handler( if !media_file_tokens.is_empty() { let query_results = - batch_get_media_files_by_tokens(&server_state.mysql_pool, &media_file_tokens, false).await; + batch_get_media_files_by_tokens( + &server_state.mysql_pool, + &media_file_tokens, + false, + &MediaReadScope::ANONYMOUS, + ).await; media_files = match query_results { Ok(media_files) => media_files, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs index 243ef8c449..dd1ca3b906 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_api/generate/image/omni_api_image_generate_handler.rs @@ -132,6 +132,7 @@ pub async fn omni_api_image_generate_handler( server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), request.image_media_tokens.as_deref().unwrap_or(&[]), + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; // ==================== HYDRATE ROUTER REQUEST ==================== // diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs index a3d6e96db9..6805bc8616 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/cost/video/omni_gen_video_cost_handler.rs @@ -17,6 +17,7 @@ use crate::http_server::endpoints::generate::common::probed_reference_videos::{ use crate::http_server::endpoints::omni_gen::shared_utils::map_router_cost_error::map_router_cost_error; use crate::http_server::endpoints::omni_gen::generate::video::helpers::hydrate_router_request::hydrate_to_router_request; use crate::state::server_state::ServerState; +use crate::util::lookup::media_read_policy::scope_for_session; /// Estimate the cost of a video generation. #[utoipa::path( @@ -107,12 +108,22 @@ async fn probe_input_seconds_best_effort( } }; + // NB: Best effort, like the rest of the quote: without a session only media any reader may + // see is probed, so a signed-in user's own private reference videos still count. + let maybe_user_session = server_state + .session_checker + .maybe_get_user_session_from_connection(http_request, &mut mysql_connection) + .await + .ok() + .flatten(); + match fetch_reference_video_sources( video_tokens, http_request, server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), &mut mysql_connection, + &scope_for_session(maybe_user_session.as_ref()), ).await { Ok(sources) => sources, Err(err) => { diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/audio/omni_gen_audio_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/audio/omni_gen_audio_generate_handler.rs index 49480cf719..317f225c24 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/audio/omni_gen_audio_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/audio/omni_gen_audio_generate_handler.rs @@ -136,6 +136,7 @@ pub async fn omni_gen_audio_generate_handler( server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), &all_tokens, + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; Some(resolved.token_to_url_map) }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs index 0d60732628..2e8f6a48e9 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/image/omni_gen_image_generate_handler.rs @@ -124,6 +124,7 @@ pub async fn omni_gen_image_generate_handler( server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), request.image_media_tokens.as_deref().unwrap_or(&[]), + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; // ==================== HYDRATE ROUTER REQUEST ==================== // diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/mesh/omni_gen_mesh_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/mesh/omni_gen_mesh_generate_handler.rs index ebbc9bc239..e8863fc4dc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/mesh/omni_gen_mesh_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/mesh/omni_gen_mesh_generate_handler.rs @@ -129,6 +129,7 @@ pub async fn omni_gen_mesh_generate_handler( server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), &all_tokens, + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; Some(resolved.token_to_url_map) }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/splat/omni_gen_splat_generate_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/splat/omni_gen_splat_generate_handler.rs index f7acee2284..516744ff47 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/splat/omni_gen_splat_generate_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/splat/omni_gen_splat_generate_handler.rs @@ -134,6 +134,7 @@ pub async fn omni_gen_splat_generate_handler( server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), &all_tokens, + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; Some(resolved.token_to_url_map) }; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/shared_video_generation.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/shared_video_generation.rs index 6c39437808..4059d764ad 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/shared_video_generation.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/omni_gen/generate/video/shared_video_generation.rs @@ -148,6 +148,7 @@ pub async fn run_authenticated_video_generation( server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), &all_tokens, + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; Some(resolved.token_to_url_map) }; @@ -185,6 +186,7 @@ server_state.maybe_media_cdn_override_url.as_deref(), server_state.server_environment, server_state.maybe_media_cdn_override_url.as_deref(), &mut mysql_connection, + &crate::util::lookup::media_read_policy::scope_for_user_token(user_token, false), ).await?; // Downloads + ffprobe are slow — release the pool slot across them, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/tag_input.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/tag_input.rs index ef85ced567..b81ea4ac64 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/tags/tag_input.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/tags/tag_input.rs @@ -93,7 +93,7 @@ mod tests { #[test] fn parses_csv_with_trimming_and_case_insensitive_dedupe() { - let tags = parse_tag_input(Some(" Cats , sci-fi ,Wallpaper,, cats "), None).unwrap(); + let tags = parse_tag_input(Some(" Cats , sci-fi ,Wallpaper, cats "), None).unwrap(); let values: Vec<&str> = tags.iter().map(|t| t.tag_value.as_str()).collect(); assert_eq!(values, vec!["Cats", "sci-fi", "Wallpaper"]); assert_eq!(tags[0].tag_value_lowercase, "cats"); diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs index 3590732b75..37a58701eb 100644 --- a/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/user_session/session_utils/lookup/user_session_feature_flags.rs @@ -187,7 +187,7 @@ mod tests { #[test] fn invalid_features_and_typos() { let flags = - UserSessionFeatureFlags::from_optional_str(Some("invalid,,typo,stdo,STUDIO")); + UserSessionFeatureFlags::from_optional_str(Some("invalid,typo,stdo,STUDIO")); assert_eq!(flags.clone_flags().len(), 0); assert_eq!(flags.has_flag(UserFeatureFlag::Studio), false); diff --git a/crates/service/web/storyteller_web/src/util/internal_api_key.rs b/crates/service/web/storyteller_web/src/util/internal_api_key.rs index 896bbc7cda..1b326822bf 100644 --- a/crates/service/web/storyteller_web/src/util/internal_api_key.rs +++ b/crates/service/web/storyteller_web/src/util/internal_api_key.rs @@ -45,7 +45,7 @@ mod tests { #[test] fn parses_comma_separated_list_with_whitespace() { - let keys = InternalApiKey::parse_comma_separated_list(" foo_abc , bar_def,, "); + let keys = InternalApiKey::parse_comma_separated_list(" foo_abc , bar_def, "); assert_eq!(keys.len(), 2); assert!(keys.contains(&InternalApiKey::new("foo_abc"))); assert!(keys.contains(&InternalApiKey::new("bar_def"))); diff --git a/crates/service/web/storyteller_web/src/util/lookup/fetch_all_required_media_files.rs b/crates/service/web/storyteller_web/src/util/lookup/fetch_all_required_media_files.rs index 2cb5bda80e..02fae70614 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/fetch_all_required_media_files.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/fetch_all_required_media_files.rs @@ -1,6 +1,6 @@ use crate::http_server::common_responses::common_web_error::CommonWebError; use log::{error, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaFilesByTokensRecord}; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaFilesByTokensRecord, MediaReadScope}; use sqlx::pool::PoolConnection; use sqlx::MySql; use tokens::tokens::media_files::MediaFileToken; @@ -11,11 +11,13 @@ const CAN_SEE_DELETED: bool = false; pub async fn fetch_all_required_media_files( mysql_connection: &mut PoolConnection, media_file_tokens: &[MediaFileToken], + scope: &MediaReadScope<'_>, ) -> Result, CommonWebError> { let result = batch_get_media_files_by_tokens_with_connection( mysql_connection, &media_file_tokens, CAN_SEE_DELETED, + scope, ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/util/lookup/hide_unreadable_job_results.rs b/crates/service/web/storyteller_web/src/util/lookup/hide_unreadable_job_results.rs index 45b450120d..8209b8d0c1 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/hide_unreadable_job_results.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/hide_unreadable_job_results.rs @@ -4,7 +4,7 @@ use enums::common::visibility::Visibility; use errors::AnyhowResult; use mysql_queries::queries::generic_inference::web::job_status::GenericInferenceJobStatus; use log::warn; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, MediaReadScope}; use sqlx::MySqlPool; use tokens::tokens::media_files::MediaFileToken; use tokens::tokens::users::UserToken; @@ -29,7 +29,11 @@ pub async fn hide_unreadable_job_results( } // NB: Soft-deleted media is not returned unless the viewer is a moderator. - let media = match batch_get_media_files_by_tokens(mysql_pool, &media_tokens, is_moderator).await { + let scope = MediaReadScope { + viewer_user_token: maybe_viewer_user_token.map(|token| token.as_str()), + is_mod: is_moderator, + }; + let media = match batch_get_media_files_by_tokens(mysql_pool, &media_tokens, is_moderator, &scope).await { Ok(media) => media, Err(err) => { // Fail closed: the status stays, the results go. diff --git a/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_map.rs b/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_map.rs index dda0f5eb42..1904cf6482 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_map.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_map.rs @@ -5,7 +5,7 @@ use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_m use actix_web::HttpRequest; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use log::{error, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens_with_connection; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaReadScope}; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::MySql; @@ -19,6 +19,7 @@ pub async fn lookup_image_urls_as_map( mysql_connection: &mut PoolConnection, server_environment: ServerEnvironment, tokens: &[MediaFileToken], + scope: &MediaReadScope<'_>, ) -> Result, CommonWebError> { const CAN_SEE_DELETED: bool = false; @@ -26,6 +27,7 @@ pub async fn lookup_image_urls_as_map( mysql_connection, tokens, CAN_SEE_DELETED, + scope, ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_optional_list.rs b/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_optional_list.rs index eef4e725e3..01a150b61d 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_optional_list.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/lookup_image_urls_as_optional_list.rs @@ -5,7 +5,7 @@ use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_m use actix_web::HttpRequest; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use log::{error, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens_with_connection; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaReadScope}; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::MySql; @@ -19,6 +19,7 @@ pub async fn lookup_image_urls_as_optional_list( mysql_connection: &mut PoolConnection, server_environment: ServerEnvironment, tokens: &[MediaFileToken], + scope: &MediaReadScope<'_>, ) -> Result>, CommonWebError> { const CAN_SEE_DELETED: bool = false; @@ -26,6 +27,7 @@ pub async fn lookup_image_urls_as_optional_list( mysql_connection, tokens, CAN_SEE_DELETED, + scope, ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/util/lookup/lookup_media_file_urls_as_map.rs b/crates/service/web/storyteller_web/src/util/lookup/lookup_media_file_urls_as_map.rs index fae13b3cdd..e4d375504d 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/lookup_media_file_urls_as_map.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/lookup_media_file_urls_as_map.rs @@ -5,7 +5,7 @@ use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_m use actix_web::HttpRequest; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use log::{error, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens_with_connection; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaReadScope}; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::MySql; @@ -20,6 +20,7 @@ pub async fn lookup_media_file_urls_as_map( mysql_connection: &mut PoolConnection, server_environment: ServerEnvironment, tokens: &[MediaFileToken], + scope: &MediaReadScope<'_>, ) -> Result, CommonWebError> { const CAN_SEE_DELETED: bool = false; @@ -27,6 +28,7 @@ pub async fn lookup_media_file_urls_as_map( mysql_connection, tokens, CAN_SEE_DELETED, + scope, ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/util/lookup/lookup_media_files_as_cdn_url_list_and_map.rs b/crates/service/web/storyteller_web/src/util/lookup/lookup_media_files_as_cdn_url_list_and_map.rs index e78f677473..0f7cfba311 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/lookup_media_files_as_cdn_url_list_and_map.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/lookup_media_files_as_cdn_url_list_and_map.rs @@ -4,7 +4,7 @@ use std::iter::FromIterator; use actix_web::HttpRequest; use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath; use log::{error, warn}; -use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::batch_get_media_files_by_tokens_with_connection; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens_with_connection, MediaReadScope}; use server_environment::ServerEnvironment; use sqlx::pool::PoolConnection; use sqlx::MySql; @@ -30,6 +30,7 @@ pub async fn lookup_media_files_as_cdn_url_list_and_map( server_environment: ServerEnvironment, maybe_media_cdn_override_url: Option<&str>, tokens: &[MediaFileToken], + scope: &MediaReadScope<'_>, ) -> Result { const CAN_SEE_DELETED: bool = false; @@ -54,6 +55,7 @@ pub async fn lookup_media_files_as_cdn_url_list_and_map( mysql_connection, &unique_tokens, CAN_SEE_DELETED, + scope, ).await; let media_files = match result { diff --git a/crates/service/web/storyteller_web/src/util/lookup/media_read_policy.rs b/crates/service/web/storyteller_web/src/util/lookup/media_read_policy.rs new file mode 100644 index 0000000000..aa76437bb6 --- /dev/null +++ b/crates/service/web/storyteller_web/src/util/lookup/media_read_policy.rs @@ -0,0 +1,45 @@ +use enums::common::visibility::Visibility; +use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::MediaReadScope; +use mysql_queries::queries::users::user_sessions::get_user_session_by_token::SessionUserRecord; +use tokens::tokens::users::UserToken; + +use crate::http_server::common_responses::common_web_error::CommonWebError; + +/// The read scope of a caller authenticated without a cookie session (API key, SSO), for media +/// lookups. Those callers have no moderator ability, so private records stay restricted to their +/// creators. +pub fn scope_for_user_token(user_token: &UserToken, is_mod: bool) -> MediaReadScope<'_> { + MediaReadScope { viewer_user_token: Some(user_token.as_str()), is_mod } +} + +/// The read scope of the requester behind `maybe_user_session`, for media lookups. +pub fn scope_for_session(maybe_user_session: Option<&SessionUserRecord>) -> MediaReadScope<'_> { + match maybe_user_session { + Some(session) => MediaReadScope { + viewer_user_token: Some(session.user_token.as_str()), + is_mod: session.can_delete_other_users_tts_results, + }, + None => MediaReadScope::ANONYMOUS, + } +} + +/// Private media is readable only by its creator and by moderators. `NotFound` is returned rather +/// than `NotAuthorized` so that a non-owner cannot confirm that a private token exists. +/// +/// Callers that return many records should drop the ones this rejects instead of failing the whole +/// request, which also keeps a mixed batch from disclosing which tokens were unreadable. +pub fn ensure_may_read_media( + visibility: &Visibility, + maybe_creator_user_token: Option<&str>, + viewer_user_token: Option<&str>, + is_mod: bool, +) -> Result<(), CommonWebError> { + if *visibility != Visibility::Private || is_mod { + return Ok(()); + } + + match (viewer_user_token, maybe_creator_user_token) { + (Some(viewer), Some(creator)) if viewer == creator => Ok(()), + _ => Err(CommonWebError::NotFound), + } +} diff --git a/crates/service/web/storyteller_web/src/util/lookup/mod.rs b/crates/service/web/storyteller_web/src/util/lookup/mod.rs index cb0c013a7c..4ecf9f6788 100644 --- a/crates/service/web/storyteller_web/src/util/lookup/mod.rs +++ b/crates/service/web/storyteller_web/src/util/lookup/mod.rs @@ -5,4 +5,5 @@ pub mod lookup_image_urls_as_map; pub mod lookup_media_files_as_cdn_url_list_and_map; pub mod lookup_media_file_urls_as_map; pub mod lookup_video_thumbnail_info_by_tokens; +pub mod media_read_policy; pub mod resolve_referral_info; From ec461047a54264e6c89dd28ce524cfcea6432e2e Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 11 Nov 2026 11:59:51 -0500 Subject: [PATCH 2/2] fix: enforce private media visibility for reads and batch lists (#226) ## Summary Two endpoints returned private media records without comparing `creator_set_visibility` against the requester, so knowing a token was enough to read another user's private media, including its storage locations and transcripts. **Single-file lookup** (`media_files/get/get_media_file_handler.rs`) - The handler now passes the viewer's `user_token` into both lookup branches. - A shared `ensure_may_read_media` helper returns `NotFound` for `Visibility::Private` records unless the viewer is the creator or a moderator. The same policy now applies to the legacy `TR:` TTS emulation branch, which previously had no check at all. - `NotFound` rather than `NotAuthorized` avoids confirming that a private token exists. This mirrors the check in `get_weight_handler.rs`. **Batch listing** (`media_files/list/list_media_files_by_batch_token_handler.rs`) - The endpoint hard-coded `ViewAs::Author` with a "this is wrong, but gotta go fast" TODO, so any caller holding a batch token received every record in the batch regardless of visibility. - Scope now derives from the session: `Moderator` for moderators, `Author` for other logged-in users, `AnotherUser` for anonymous callers. - `maybe_creator_user_token` is selected with the page so private records are dropped for anyone who is neither the creator nor a moderator. ## Notes - Public and hidden media behave as before; only private access changes. - For non-moderators the batch page can be shorter than `page_size`, and `total_page_count` still counts records the caller may not read, because filtering happens after the query. Fixing that properly needs visibility-aware SQL and is left for a follow-up. - Verified with `SQLX_OFFLINE=true cargo check -p storyteller-web` (finished clean). No tests were added or run: the media endpoints are covered by integration tests that need a live MySQL, which is not available here. ## Summary by CodeRabbit * **Bug Fixes** * Private media files are visible only to their creator or a moderator. Other viewers will not see private files in batch listings, and direct requests return not found. * Access rules apply consistently to standard media files and legacy text-to-speech results. * Viewer identity is recognized from an authenticated session or a viewer token, allowing creators to access their private media without signing in. * Public media remains accessible according to existing permissions. --- .../list/list_media_files_by_batch_token.rs | 26 ++++++++++- .../media_files/get/get_media_file_handler.rs | 44 +++++++++++++++++++ ...list_media_files_by_batch_token_handler.rs | 31 ++++++++++++- .../header_viewer_user_token.rs | 30 +++++++++++++ .../user_lookup/api_or_web_session/mod.rs | 1 + 5 files changed, 129 insertions(+), 3 deletions(-) create mode 100644 crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/header_viewer_user_token.rs diff --git a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs index cf99baff55..5aafd2002b 100644 --- a/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs +++ b/crates/schema/database/mysql_queries/src/queries/media_files/list/list_media_files_by_batch_token.rs @@ -52,6 +52,9 @@ pub struct MediaFileListItem { pub maybe_thumbnail_version: Option, pub creator_set_visibility: Visibility, + /// The token of the user who created the file, when they were logged in. Used to decide whether + /// a private record may be shown to the requester. + pub maybe_creator_user_token: Option, pub is_user_upload: bool, pub is_intermediate_system_file: bool, @@ -78,6 +81,9 @@ pub struct ListMediaFileByBatchArgs<'a> { pub page_index: usize, pub sort_ascending: bool, pub view_as: ViewAs, + /// The requester's user token. For `ViewAs::Author`, other users' private records are excluded + /// from both the count and the page. + pub maybe_viewer_user_token: Option<&'a str>, pub mysql_pool: &'a MySqlPool, } @@ -91,6 +97,7 @@ pub async fn list_media_files_by_batch_token(args: ListMediaFileByBatchArgs<'_>) 0, args.sort_ascending, args.view_as, + args.maybe_viewer_user_token, count_fields.as_str(), ); @@ -106,6 +113,7 @@ pub async fn list_media_files_by_batch_token(args: ListMediaFileByBatchArgs<'_>) args.page_size, args.sort_ascending, args.view_as, + args.maybe_viewer_user_token, result_fields.as_str(), ); @@ -132,6 +140,7 @@ pub async fn list_media_files_by_batch_token(args: ListMediaFileByBatchArgs<'_>) maybe_public_bucket_extension: record.maybe_public_bucket_extension, maybe_thumbnail_version: record.maybe_thumbnail_version, creator_set_visibility: record.creator_set_visibility, + maybe_creator_user_token: record.maybe_creator_user_token, is_user_upload: i8_to_bool(record.is_user_upload), is_intermediate_system_file: i8_to_bool(record.is_intermediate_system_file), maybe_title: record.maybe_title, @@ -185,6 +194,7 @@ fn select_result_fields() -> String { m.maybe_thumbnail_version, m.creator_set_visibility, + m.maybe_creator_user_token, m.is_user_upload, m.is_intermediate_system_file, @@ -218,6 +228,7 @@ fn query_builder<'a>( page_size: usize, sort_ascending: bool, view_as: ViewAs, + maybe_viewer_user_token: Option<&'a str>, select_fields: &'a str, ) -> QueryBuilder<'a, MySql> { @@ -243,10 +254,21 @@ LEFT OUTER JOIN prompts query_builder.push_bind(batch_token); match view_as { - ViewAs::Author | ViewAs::Moderator => { + ViewAs::Moderator => { // NB(bt): Actually, mods don't want to see deleted files. We'll improve the moderator UI later. query_builder.push(" AND m.user_deleted_at IS NULL AND m.mod_deleted_at IS NULL "); } + ViewAs::Author => { + query_builder.push(" AND m.user_deleted_at IS NULL AND m.mod_deleted_at IS NULL "); + // Private records belong to their creator only; filter before COUNT and LIMIT. + query_builder.push(" AND (m.creator_set_visibility <> "); + query_builder.push_bind(Visibility::Private.to_str()); + if let Some(viewer) = maybe_viewer_user_token { + query_builder.push(" OR m.maybe_creator_user_token = "); + query_builder.push_bind(viewer); + } + query_builder.push(") "); + } ViewAs::AnotherUser => { query_builder.push(" AND m.user_deleted_at IS NULL AND m.mod_deleted_at IS NULL "); // FIXME: Binding shouldn't require to_str(). @@ -296,6 +318,7 @@ struct MediaFileListItemInternal { maybe_thumbnail_version: Option, creator_set_visibility: Visibility, + maybe_creator_user_token: Option, is_user_upload: i8, is_intermediate_system_file: i8, @@ -346,6 +369,7 @@ impl FromRow<'_, MySqlRow> for MediaFileListItemInternal { maybe_public_bucket_extension: row.try_get("maybe_public_bucket_extension")?, maybe_thumbnail_version: row.try_get("maybe_thumbnail_version")?, creator_set_visibility: Visibility::try_from_mysql_row(row, "creator_set_visibility")?, + maybe_creator_user_token: row.try_get("maybe_creator_user_token")?, is_user_upload: row.try_get("is_user_upload")?, is_intermediate_system_file: row.try_get("is_intermediate_system_file")?, maybe_title: row.try_get("maybe_title")?, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs index 57e1ef6aec..18745891d1 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/get/get_media_file_handler.rs @@ -1,6 +1,7 @@ use std::sync::Arc; use crate::http_server::common_responses::common_web_error::CommonWebError; +use crate::http_server::user_lookup::api_or_web_session::header_viewer_user_token::header_viewer_user_token; use crate::http_server::common_responses::media::media_domain::MediaDomain; use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links_builder::MediaLinksBuilder; @@ -221,11 +222,16 @@ pub async fn get_media_file_handler( .await?; let mut show_deleted_results = false; + let mut viewer_user_token: Option = None; if let Some(user_session) = maybe_user_session { // NB: Moderators can see deleted results. // Original creators cannot see them (unless they're moderators!) show_deleted_results = user_session.can_delete_other_users_tts_results; + viewer_user_token = Some(user_session.user_token.as_str().to_string()); + } else { + // API-key and MCP clients authenticate by header, not cookie; they may read their own private media. + viewer_user_token = header_viewer_user_token(&http_request, &server_state).await?; } let media_domain = get_media_domain(&http_request); @@ -238,6 +244,7 @@ pub async fn get_media_file_handler( emulate_media_file_with_legacy_tts_result_lookup( &media_file_token, show_deleted_results, + viewer_user_token.as_deref(), &server_state, media_domain, ).await? @@ -245,6 +252,7 @@ pub async fn get_media_file_handler( modern_media_file_lookup( &media_file_token, show_deleted_results, + viewer_user_token.as_deref(), &server_state, media_domain ).await? @@ -253,9 +261,28 @@ pub async fn get_media_file_handler( Ok(Json(response)) } +/// Private media is readable only by its creator and by moderators. `NotFound` is returned rather +/// than `NotAuthorized` so a non-owner cannot confirm that a private token exists. +fn ensure_may_read_media( + visibility: &Visibility, + maybe_creator_user_token: Option<&str>, + viewer_user_token: Option<&str>, + is_mod: bool, +) -> Result<(), CommonWebError> { + if *visibility != Visibility::Private || is_mod { + return Ok(()); + } + + match (viewer_user_token, maybe_creator_user_token) { + (Some(viewer), Some(creator)) if viewer == creator => Ok(()), + _ => Err(CommonWebError::NotFound), + } +} + async fn modern_media_file_lookup( media_file_token: &MediaFileToken, show_deleted_results: bool, + viewer_user_token: Option<&str>, server_state: &ServerState, media_domain: MediaDomain, ) -> Result { @@ -277,6 +304,13 @@ async fn modern_media_file_lookup( Ok(Some(result)) => result, }; + ensure_may_read_media( + &result.creator_set_visibility, + result.maybe_creator_user_token.as_ref().map(|token| token.as_str()), + viewer_user_token, + is_mod, + )?; + let public_bucket_path = MediaFileBucketPath::from_object_hash( &result.public_bucket_directory_hash, result.maybe_public_bucket_prefix.as_deref(), @@ -406,10 +440,13 @@ async fn modern_media_file_lookup( async fn emulate_media_file_with_legacy_tts_result_lookup( media_file_token: &MediaFileToken, show_deleted_results: bool, + viewer_user_token: Option<&str>, server_state: &ServerState, media_domain: MediaDomain, ) -> Result { + let is_mod = show_deleted_results; + let result = select_tts_result_by_token( &media_file_token.as_str(), show_deleted_results, @@ -425,6 +462,13 @@ async fn emulate_media_file_with_legacy_tts_result_lookup( Ok(Some(result)) => result, }; + ensure_may_read_media( + &result.creator_set_visibility, + result.maybe_creator_user_token.as_ref().map(|token| token.as_str()), + viewer_user_token, + is_mod, + )?; + //if let Some(moderator_fields) = result.maybe_moderator_fields.as_ref() { // // NB: The moderator fields will always be present before removal // // We don't want non-mods seeing stuff made by banned users. diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs index 382df81c3b..b8ee47a4be 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/media_files/list/list_media_files_by_batch_token_handler.rs @@ -22,6 +22,7 @@ use tokens::tokens::media_files::MediaFileToken; use utoipa::{IntoParams, ToSchema}; use crate::http_server::common_responses::common_web_error::CommonWebError; +use crate::http_server::user_lookup::api_or_web_session::header_viewer_user_token::header_viewer_user_token; use crate::http_server::common_responses::media::media_file_cover_image_details::MediaFileCoverImageDetails; use crate::http_server::common_responses::media::media_links_builder::MediaLinksBuilder; use crate::http_server::common_responses::media::media_links_builder::VideoThumbnailInfo; @@ -167,6 +168,18 @@ pub async fn list_media_files_by_batch_token_handler( .maybe_get_user_session(&http_request, &server_state.mysql_pool) .await?; + // NB: Moderators can see deleted results; other creators cannot (unless they're moderators!). + let is_mod = maybe_user_session + .as_ref() + .map(|session| session.can_delete_other_users_tts_results) + .unwrap_or(false); + + let viewer_user_token = match maybe_user_session.as_ref() { + Some(session) => Some(session.user_token.as_str().to_string()), + // API-key and MCP clients authenticate by header, not cookie. + None => header_viewer_user_token(&http_request, &server_state).await?, + }; + // NB: Temporary rollout flag for certain file types (BVH, etc). let mut is_allowed_studio_access = allowed_studio_access( maybe_user_session.as_ref(), @@ -178,8 +191,11 @@ pub async fn list_media_files_by_batch_token_handler( let page_size = query.page_size.unwrap_or_else(|| 25); let page_index = query.page_index.unwrap_or_else(|| 0); - // TODO(bt, 2024-02-18): This is wrong, but gotta go fast. - let view_as= ViewAs::Author; + // NB: Read scope comes from the requester, never from the batch token: knowing a batch token + // must not be enough to read another user's private records. + // Hidden records stay readable by anyone who has the batch token (as before); the query and the + // filter below exclude private ones unless the requester is the creator or a moderator. + let view_as = if is_mod { ViewAs::Moderator } else { ViewAs::Author }; let query_results = list_media_files_by_batch_token(ListMediaFileByBatchArgs { batch_token: &path.token, @@ -187,6 +203,7 @@ pub async fn list_media_files_by_batch_token_handler( page_index, sort_ascending, view_as, + maybe_viewer_user_token: viewer_user_token.as_deref(), mysql_pool: &server_state.mysql_pool, }).await; @@ -202,6 +219,16 @@ pub async fn list_media_files_by_batch_token_handler( let results = results_page.records.into_iter() .filter(|record| { + // Private records are readable only by their creator and by moderators. + if record.creator_set_visibility == Visibility::Private && !is_mod { + let is_creator = match (viewer_user_token.as_deref(), record.maybe_creator_user_token.as_deref()) { + (Some(viewer), Some(creator)) => viewer == creator, + _ => false, + }; + if !is_creator { + return false; + } + } if is_allowed_studio_access { return true; } diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/header_viewer_user_token.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/header_viewer_user_token.rs new file mode 100644 index 0000000000..d00d63627d --- /dev/null +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/header_viewer_user_token.rs @@ -0,0 +1,30 @@ +use actix_web::http::header; +use actix_web::HttpRequest; + +use crate::http_server::common_responses::common_web_error::CommonWebError; +use crate::http_server::user_lookup::api_or_web_session::require_any_session_or_key::require_any_session_or_key; +use crate::state::server_state::ServerState; + +/// The user token behind an `Authorization` header credential (API key or MCP session), for +/// public read endpoints that only have the cookie session otherwise. No header, or a credential +/// that does not authenticate, yields `None` (the caller stays an anonymous viewer, never more +/// privileged); only lookup failures are errors. +pub async fn header_viewer_user_token( + http_request: &HttpRequest, + server_state: &ServerState, +) -> Result, CommonWebError> { + if !http_request.headers().contains_key(header::AUTHORIZATION) { + return Ok(None); + } + + match require_any_session_or_key( + http_request, + &server_state.session_checker, + &server_state.avt_cookie_manager, + &server_state.mysql_pool, + ).await { + Ok(session) => Ok(Some(session.user_token.as_str().to_string())), + Err(CommonWebError::NotAuthorized) => Ok(None), + Err(err) => Err(err), + } +} diff --git a/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/mod.rs b/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/mod.rs index a591538e27..5d185bcf98 100644 --- a/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/user_lookup/api_or_web_session/mod.rs @@ -1,2 +1,3 @@ pub mod require_any_session_or_key; pub mod require_api_or_web_session; +pub mod header_viewer_user_token;