From 41f11363dfa510d9e9771325406d539c3053db8f Mon Sep 17 00:00:00 2001 From: Nathan Ferguson Date: Mon, 16 Nov 2026 15:09:40 -0500 Subject: [PATCH] Port app block asset path validation to Rust --- .changeset/rust-app-block-asset-paths.md | 5 +++++ .../theme-check/src/checks/asset_size_app_block.rs | 10 +++++++++- crates/theme-check/src/checks/file_utils.rs | 14 +++++++++++++- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .changeset/rust-app-block-asset-paths.md diff --git a/.changeset/rust-app-block-asset-paths.md b/.changeset/rust-app-block-asset-paths.md new file mode 100644 index 000000000..4cf3b293a --- /dev/null +++ b/.changeset/rust-app-block-asset-paths.md @@ -0,0 +1,5 @@ +--- +'theme-check-rs': patch +--- + +Keep app block asset size checks inside the assets directory, matching TypeScript. Reject paths and encoded paths before checking whether a file exists or reading its size. diff --git a/crates/theme-check/src/checks/asset_size_app_block.rs b/crates/theme-check/src/checks/asset_size_app_block.rs index d2fb45cc3..556b3031d 100644 --- a/crates/theme-check/src/checks/asset_size_app_block.rs +++ b/crates/theme-check/src/checks/asset_size_app_block.rs @@ -1,7 +1,7 @@ //! AssetSizeAppBlockCSS and AssetSizeAppBlockJavaScript: the same check on the schema's //! `stylesheet` / `javascript` asset. -use super::file_utils::{does_file_exceed_threshold, does_file_exist}; +use super::file_utils::{does_file_exceed_threshold, does_file_exist, is_asset_file_name}; use super::liquid_html_syntax_error::utils::add16; use crate::context::{CheckDef, CheckError, CheckResult, Context, Create, LiquidCheck, Severity}; use crate::js; @@ -91,6 +91,14 @@ impl<'a> LiquidCheck<'a> for Check { .map_or(body.span.start - 1, |i| body.span.start + i); let end = add16(cx.source(), start, length); + if !is_asset_file_name(cx, &name) { + cx.report( + format!("'{name}' must be the name of a file in the assets directory."), + Span::new(start, end), + ); + return Ok(()); + } + if !does_file_exist(cx, &relative_path) { cx.report(format!("'{name}' does not exist."), Span::new(start, end)); return Ok(()); diff --git a/crates/theme-check/src/checks/file_utils.rs b/crates/theme-check/src/checks/file_utils.rs index a50116d57..b85749686 100644 --- a/crates/theme-check/src/checks/file_utils.rs +++ b/crates/theme-check/src/checks/file_utils.rs @@ -1,9 +1,21 @@ //! `utils/file-utils.ts` use crate::context::{CheckError, Context}; -use crate::js; +use crate::{js, path}; use serde_json::{json, Value}; +/// `isAssetFileName(context, fileName)`: only files directly in `assets`, both as written +/// and after the file system decodes the URI. +pub fn is_asset_file_name(cx: &Context, file_name: &str) -> bool { + let uri = cx.to_uri(&format!("assets/{file_name}")); + let base_name = path::basename(&uri, None); + !file_name.contains(['/', '\\']) + && !base_name.contains(['/', '\\']) + && base_name != "." + && base_name != ".." + && path::dirname(&uri) == cx.to_uri("assets") +} + /// `doesFileExist(context, relativePath)` pub fn does_file_exist(cx: &Context, relative_path: &str) -> bool { cx.file_exists(&cx.to_uri(relative_path))