Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/rust-app-block-asset-paths.md
Original file line number Diff line number Diff line change
@@ -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.
10 changes: 9 additions & 1 deletion crates/theme-check/src/checks/asset_size_app_block.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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(());
Expand Down
14 changes: 13 additions & 1 deletion crates/theme-check/src/checks/file_utils.rs
Original file line number Diff line number Diff line change
@@ -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))
Expand Down
Loading