Compare commits
4 Commits
fix/video-
...
fix/keepsa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bac30404e3 | ||
|
|
5d0c7cd949 | ||
|
|
a20b96d893 | ||
|
|
24ac862f81 |
@@ -20,6 +20,29 @@ use crate::state::SseEvent;
|
|||||||
|
|
||||||
static VIEWER_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/static/export-viewer");
|
static VIEWER_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/static/export-viewer");
|
||||||
|
|
||||||
|
// ── Shared visibility filter ─────────────────────────────────────────────────
|
||||||
|
|
||||||
|
/// The predicate that decides what lands in a keepsake, as ONE definition.
|
||||||
|
///
|
||||||
|
/// Two queries have to agree on it: [`query_uploads`], which selects the rows the archives are
|
||||||
|
/// built from, and [`estimate_export_bytes`], which sizes them for the disk preflight. They used
|
||||||
|
/// to state it separately, and the direction of drift matters — an estimate that misses rows the
|
||||||
|
/// archive writes UNDER-reserves, which is the exact ENOSPC the preflight exists to prevent.
|
||||||
|
///
|
||||||
|
/// A `SRC:`-marked copy in the integration tests cannot catch that: drift means production moved
|
||||||
|
/// and the copy didn't, so both sides of such a test sit still and it keeps passing. Sharing the
|
||||||
|
/// fragment removes the failure by construction instead, and leaves the test doing what it is
|
||||||
|
/// actually good at — pinning the behaviour.
|
||||||
|
///
|
||||||
|
/// CONTRACT: callers must alias `upload` as `u` and join `"user"` as `usr`, and bind the event id
|
||||||
|
/// as `$1`.
|
||||||
|
macro_rules! export_visibility_where {
|
||||||
|
() => {
|
||||||
|
"WHERE u.event_id = $1 AND u.deleted_at IS NULL
|
||||||
|
AND usr.uploads_hidden = FALSE AND usr.is_banned = FALSE"
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// ── DB query rows ────────────────────────────────────────────────────────────
|
// ── DB query rows ────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
#[derive(sqlx::FromRow)]
|
#[derive(sqlx::FromRow)]
|
||||||
@@ -557,7 +580,7 @@ async fn run_zip_export_inner(
|
|||||||
};
|
};
|
||||||
let entry_name = format!("{folder}/{date}_{name_safe}_{}.{ext}", row.id);
|
let entry_name = format!("{folder}/{date}_{name_safe}_{}.{ext}", row.id);
|
||||||
|
|
||||||
let builder = ZipEntryBuilder::new(entry_name.into(), Compression::Stored);
|
let builder = keepsake_entry(entry_name, Compression::Stored);
|
||||||
|
|
||||||
// Open BEFORE writing the entry header. A missing source is skipped (the media file
|
// Open BEFORE writing the entry header. A missing source is skipped (the media file
|
||||||
// was deleted, or its processing failed) — but it must be skipped without aborting the
|
// was deleted, or its processing failed) — but it must be skipped without aborting the
|
||||||
@@ -950,7 +973,7 @@ async fn run_html_export_inner(
|
|||||||
|
|
||||||
// Write data.json
|
// Write data.json
|
||||||
{
|
{
|
||||||
let builder = ZipEntryBuilder::new("data.json".into(), Compression::Deflate);
|
let builder = keepsake_entry("data.json".into(), Compression::Deflate);
|
||||||
let mut entry = zip.write_entry_stream(builder).await?;
|
let mut entry = zip.write_entry_stream(builder).await?;
|
||||||
let mut cursor = AllowStdIo::new(std::io::Cursor::new(data_json.as_bytes()));
|
let mut cursor = AllowStdIo::new(std::io::Cursor::new(data_json.as_bytes()));
|
||||||
fcopy(&mut cursor, &mut entry).await?;
|
fcopy(&mut cursor, &mut entry).await?;
|
||||||
@@ -959,7 +982,7 @@ async fn run_html_export_inner(
|
|||||||
|
|
||||||
// Write README.txt
|
// Write README.txt
|
||||||
{
|
{
|
||||||
let builder = ZipEntryBuilder::new("README.txt".into(), Compression::Deflate);
|
let builder = keepsake_entry("README.txt".into(), Compression::Deflate);
|
||||||
let mut entry = zip.write_entry_stream(builder).await?;
|
let mut entry = zip.write_entry_stream(builder).await?;
|
||||||
let mut cursor = AllowStdIo::new(std::io::Cursor::new(README_TEXT.as_bytes()));
|
let mut cursor = AllowStdIo::new(std::io::Cursor::new(README_TEXT.as_bytes()));
|
||||||
fcopy(&mut cursor, &mut entry).await?;
|
fcopy(&mut cursor, &mut entry).await?;
|
||||||
@@ -992,7 +1015,7 @@ async fn run_html_export_inner(
|
|||||||
};
|
};
|
||||||
|
|
||||||
let entry_name = format!("media/{name}");
|
let entry_name = format!("media/{name}");
|
||||||
let builder = ZipEntryBuilder::new(entry_name.into(), Compression::Stored);
|
let builder = keepsake_entry(entry_name, Compression::Stored);
|
||||||
let mut zip_entry = zip.write_entry_stream(builder).await?;
|
let mut zip_entry = zip.write_entry_stream(builder).await?;
|
||||||
let mut f = src_file.compat();
|
let mut f = src_file.compat();
|
||||||
fcopy(&mut f, &mut zip_entry).await?;
|
fcopy(&mut f, &mut zip_entry).await?;
|
||||||
@@ -1051,7 +1074,7 @@ async fn run_html_export_inner(
|
|||||||
// ── DB helpers ───────────────────────────────────────────────────────────────
|
// ── DB helpers ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
async fn query_uploads(pool: &PgPool, event_id: Uuid) -> Result<Vec<ExportUploadRow>> {
|
async fn query_uploads(pool: &PgPool, event_id: Uuid) -> Result<Vec<ExportUploadRow>> {
|
||||||
Ok(sqlx::query_as::<_, ExportUploadRow>(
|
Ok(sqlx::query_as::<_, ExportUploadRow>(concat!(
|
||||||
"SELECT u.id, u.original_path, u.mime_type, u.caption,
|
"SELECT u.id, u.original_path, u.mime_type, u.caption,
|
||||||
usr.display_name AS uploader_name,
|
usr.display_name AS uploader_name,
|
||||||
COUNT(DISTINCT l.user_id) AS like_count,
|
COUNT(DISTINCT l.user_id) AS like_count,
|
||||||
@@ -1059,11 +1082,12 @@ async fn query_uploads(pool: &PgPool, event_id: Uuid) -> Result<Vec<ExportUpload
|
|||||||
FROM upload u
|
FROM upload u
|
||||||
JOIN \"user\" usr ON usr.id = u.user_id
|
JOIN \"user\" usr ON usr.id = u.user_id
|
||||||
LEFT JOIN \"like\" l ON l.upload_id = u.id
|
LEFT JOIN \"like\" l ON l.upload_id = u.id
|
||||||
WHERE u.event_id = $1 AND u.deleted_at IS NULL
|
",
|
||||||
AND usr.uploads_hidden = FALSE AND usr.is_banned = FALSE
|
export_visibility_where!(),
|
||||||
|
"
|
||||||
GROUP BY u.id, usr.display_name
|
GROUP BY u.id, usr.display_name
|
||||||
ORDER BY u.created_at ASC",
|
ORDER BY u.created_at ASC",
|
||||||
)
|
))
|
||||||
.bind(event_id)
|
.bind(event_id)
|
||||||
.fetch_all(pool)
|
.fetch_all(pool)
|
||||||
.await?)
|
.await?)
|
||||||
@@ -1267,15 +1291,16 @@ fn is_superseded_archive(
|
|||||||
/// downscaled to 2000px first, which only makes this estimate more conservative — the direction we
|
/// downscaled to 2000px first, which only makes this estimate more conservative — the direction we
|
||||||
/// want, since being wrong low means ENOSPC halfway through.
|
/// want, since being wrong low means ENOSPC halfway through.
|
||||||
///
|
///
|
||||||
/// Matches [`query_uploads`]' visibility filter exactly, so hidden/banned uploads aren't counted.
|
/// Shares [`query_uploads`]' visibility filter via [`export_visibility_where`], so hidden/banned
|
||||||
|
/// uploads can't be counted here but skipped there (or the reverse, which under-reserves).
|
||||||
pub async fn estimate_export_bytes(pool: &PgPool, event_id: Uuid) -> Result<u64> {
|
pub async fn estimate_export_bytes(pool: &PgPool, event_id: Uuid) -> Result<u64> {
|
||||||
let (bytes,): (i64,) = sqlx::query_as(
|
let (bytes,): (i64,) = sqlx::query_as(concat!(
|
||||||
"SELECT COALESCE(SUM(u.original_size_bytes), 0)::bigint
|
"SELECT COALESCE(SUM(u.original_size_bytes), 0)::bigint
|
||||||
FROM upload u
|
FROM upload u
|
||||||
JOIN \"user\" usr ON usr.id = u.user_id
|
JOIN \"user\" usr ON usr.id = u.user_id
|
||||||
WHERE u.event_id = $1 AND u.deleted_at IS NULL
|
",
|
||||||
AND usr.uploads_hidden = FALSE AND usr.is_banned = FALSE",
|
export_visibility_where!(),
|
||||||
)
|
))
|
||||||
.bind(event_id)
|
.bind(event_id)
|
||||||
.fetch_one(pool)
|
.fetch_one(pool)
|
||||||
.await
|
.await
|
||||||
@@ -1527,6 +1552,36 @@ async fn maybe_broadcast_complete(
|
|||||||
/// double-clicking `index.html` (file://), where browsers block a cross-origin
|
/// double-clicking `index.html` (file://), where browsers block a cross-origin
|
||||||
/// `fetch()` of a sibling `data.json` — so the data is inlined into the page.
|
/// `fetch()` of a sibling `data.json` — so the data is inlined into the page.
|
||||||
/// (`data.json` is still written separately for the http-served case.)
|
/// (`data.json` is still written separately for the http-served case.)
|
||||||
|
/// Permissions stamped on every entry in both archives: `rw-r--r--`.
|
||||||
|
///
|
||||||
|
/// `ZipEntryBuilder::new` leaves the external file attribute at zero, and the host compatibility
|
||||||
|
/// defaults to Unix — so every entry was written with a stored mode of **0000**. Windows Explorer
|
||||||
|
/// ignores Unix modes and was fine, which is exactly why this survived: on Linux and macOS
|
||||||
|
/// `unzip` faithfully applies what the archive asks for, and the guest gets a directory of files
|
||||||
|
/// none of which they can open. `?---------` on every line of `unzip -Z`.
|
||||||
|
///
|
||||||
|
/// That is the keepsake — the artifact the whole event exists to produce — arriving unreadable,
|
||||||
|
/// after distribution, with no server-side symptom at all.
|
||||||
|
/// `S_IFREG | 0644`. The type bits are included because the mode is written whole into the high
|
||||||
|
/// half of the external file attribute: without them extractors see a file of type "unknown"
|
||||||
|
/// (`unzip -Z` renders `?rw-r--r--`), which works but is not what the archive means to say.
|
||||||
|
const KEEPSAKE_ENTRY_MODE: u16 = 0o100_644;
|
||||||
|
|
||||||
|
/// Build a ZIP entry for the keepsake. ALL entries in both archives go through here so the mode
|
||||||
|
/// can't be forgotten at one of the six call sites.
|
||||||
|
fn keepsake_entry(name: String, compression: Compression) -> ZipEntryBuilder {
|
||||||
|
ZipEntryBuilder::new(name.into(), compression).unix_permissions(KEEPSAKE_ENTRY_MODE)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Escape a JSON payload for inlining inside a `<script>` element.
|
||||||
|
///
|
||||||
|
/// See the call site in [`write_viewer_with_data`] for why this is every `<` and not just `</`.
|
||||||
|
/// Kept separate so the property that matters — no `<` survives, and the value still decodes to
|
||||||
|
/// the original — can be asserted without building a ZIP.
|
||||||
|
fn escape_json_for_script(data_json: &str) -> String {
|
||||||
|
data_json.replace('<', "\\u003c")
|
||||||
|
}
|
||||||
|
|
||||||
async fn write_viewer_with_data(
|
async fn write_viewer_with_data(
|
||||||
dir: &include_dir::Dir<'_>,
|
dir: &include_dir::Dir<'_>,
|
||||||
zip: &mut ZipFileWriter<tokio::fs::File>,
|
zip: &mut ZipFileWriter<tokio::fs::File>,
|
||||||
@@ -1538,8 +1593,31 @@ async fn write_viewer_with_data(
|
|||||||
if path == "index.html" {
|
if path == "index.html" {
|
||||||
let html = std::str::from_utf8(file.contents())
|
let html = std::str::from_utf8(file.contents())
|
||||||
.context("export-viewer index.html is not valid UTF-8")?;
|
.context("export-viewer index.html is not valid UTF-8")?;
|
||||||
// Escape `</` so a caption containing `</script>` can't break out of the tag.
|
// Escape EVERY `<`, not just `</`.
|
||||||
let safe = data_json.replace("</", "<\\/");
|
//
|
||||||
|
// `</` -> `<\/` stops the obvious break-out (`</script><img onerror=…>`) and is inert
|
||||||
|
// against XSS. It does not stop the caption steering the HTML TOKENIZER. A caption
|
||||||
|
// containing `<!--<script` with no later `-->` puts the parser into
|
||||||
|
// script-data-double-escaped state; from there the template's own `</script>` only
|
||||||
|
// steps back to script-data-escaped instead of closing the element, and the rest of the
|
||||||
|
// document — including the viewer bundle — is swallowed as script data. Nothing
|
||||||
|
// executes and nothing leaks; `window.__EXPORT_DATA__` is simply never assigned and the
|
||||||
|
// keepsake opens blank.
|
||||||
|
//
|
||||||
|
// That failure is silent and POST-DISTRIBUTION: the export succeeds, the ZIP is
|
||||||
|
// well-formed, the job writes `done`, /export/status is green, and the host hands out a
|
||||||
|
// file that only fails when a guest double-clicks index.html — in every copy, with no
|
||||||
|
// way to fix it after the fact. Reachable from any guest-authored caption or comment,
|
||||||
|
// since both are embedded in the viewer.
|
||||||
|
//
|
||||||
|
// `<` never appears in JSON structural syntax — only inside string values — so a global
|
||||||
|
// replace is sound, and `<` is valid in both JSON and a JS string literal. One
|
||||||
|
// rule covers `</script`, `<!--` and `<script` together, which is the point: the
|
||||||
|
// previous escape was named for the single case it did handle.
|
||||||
|
//
|
||||||
|
// NOTE this is deliberately only for the INLINED copy. `data.json` is written
|
||||||
|
// separately, in no HTML context, and must stay literal.
|
||||||
|
let safe = escape_json_for_script(data_json);
|
||||||
// Match the live app's colour theme: inject the same `:root:root{…}` override
|
// Match the live app's colour theme: inject the same `:root:root{…}` override
|
||||||
// the app builds at runtime so a rose/sage/custom event exports a rose/sage
|
// the app builds at runtime so a rose/sage/custom event exports a rose/sage
|
||||||
// keepsake (not the embedded default gold). The CSS is generated purely from
|
// keepsake (not the embedded default gold). The CSS is generated purely from
|
||||||
@@ -1553,13 +1631,13 @@ async fn write_viewer_with_data(
|
|||||||
Some(idx) => format!("{}{}{}", &html[..idx], head_inject, &html[idx..]),
|
Some(idx) => format!("{}{}{}", &html[..idx], head_inject, &html[idx..]),
|
||||||
None => format!("{head_inject}{html}"),
|
None => format!("{head_inject}{html}"),
|
||||||
};
|
};
|
||||||
let builder = ZipEntryBuilder::new(path.into(), Compression::Deflate);
|
let builder = keepsake_entry(path, Compression::Deflate);
|
||||||
let mut entry = zip.write_entry_stream(builder).await?;
|
let mut entry = zip.write_entry_stream(builder).await?;
|
||||||
let mut cursor = AllowStdIo::new(std::io::Cursor::new(injected.as_bytes()));
|
let mut cursor = AllowStdIo::new(std::io::Cursor::new(injected.as_bytes()));
|
||||||
fcopy(&mut cursor, &mut entry).await?;
|
fcopy(&mut cursor, &mut entry).await?;
|
||||||
entry.close().await?;
|
entry.close().await?;
|
||||||
} else {
|
} else {
|
||||||
let builder = ZipEntryBuilder::new(path.into(), Compression::Deflate);
|
let builder = keepsake_entry(path, Compression::Deflate);
|
||||||
let mut entry = zip.write_entry_stream(builder).await?;
|
let mut entry = zip.write_entry_stream(builder).await?;
|
||||||
let mut cursor = AllowStdIo::new(std::io::Cursor::new(file.contents()));
|
let mut cursor = AllowStdIo::new(std::io::Cursor::new(file.contents()));
|
||||||
fcopy(&mut cursor, &mut entry).await?;
|
fcopy(&mut cursor, &mut entry).await?;
|
||||||
@@ -1790,6 +1868,62 @@ mod tests {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Every `<` is escaped, whatever it is part of.
|
||||||
|
///
|
||||||
|
/// PREVENTS the regression to `</` -> `<\\/`, which is named for the one case it handles.
|
||||||
|
/// `<!--<script` with no later `-->` drives the HTML tokenizer into
|
||||||
|
/// script-data-double-escaped state, where the template's own `</script>` no longer closes
|
||||||
|
/// the element — the viewer bundle is swallowed as script data, `__EXPORT_DATA__` is never
|
||||||
|
/// assigned, and the keepsake opens blank in every copy the host has already handed out.
|
||||||
|
#[test]
|
||||||
|
fn no_left_angle_bracket_survives_inlining() {
|
||||||
|
for payload in [
|
||||||
|
r#"{"caption":"<!--<script"}"#,
|
||||||
|
r#"{"caption":"</script><img src=x onerror=alert(1)>"}"#,
|
||||||
|
r#"{"caption":"<!--"}"#,
|
||||||
|
r#"{"caption":"<script>"}"#,
|
||||||
|
r#"{"caption":"a < b"}"#,
|
||||||
|
] {
|
||||||
|
let escaped = escape_json_for_script(payload);
|
||||||
|
assert!(
|
||||||
|
!escaped.contains('<'),
|
||||||
|
"a surviving `<` can still steer the tokenizer: {escaped}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The escape must not change what the viewer READS — it is a transport encoding, not a
|
||||||
|
/// sanitiser. A caption is guest-authored text that has to render back exactly.
|
||||||
|
#[test]
|
||||||
|
fn the_payload_still_decodes_to_the_original_value() {
|
||||||
|
// `<` appears only inside JSON string values, never in structural syntax, so a global
|
||||||
|
// replace is sound — this is the assertion that says so.
|
||||||
|
for caption in [
|
||||||
|
"<!--<script",
|
||||||
|
"</script><img src=x onerror=alert(1)>",
|
||||||
|
"a < b und c > d",
|
||||||
|
"ganz normale Bildunterschrift",
|
||||||
|
"Herz <3",
|
||||||
|
] {
|
||||||
|
let json = serde_json::json!({ "posts": [{ "caption": caption }] }).to_string();
|
||||||
|
let escaped = escape_json_for_script(&json);
|
||||||
|
let back: serde_json::Value =
|
||||||
|
serde_json::from_str(&escaped).expect("the escaped form must still be valid JSON");
|
||||||
|
assert_eq!(
|
||||||
|
back["posts"][0]["caption"].as_str(),
|
||||||
|
Some(caption),
|
||||||
|
"the caption must survive the round trip unchanged"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Nothing else in the document is touched.
|
||||||
|
#[test]
|
||||||
|
fn a_payload_with_no_angle_brackets_is_unchanged() {
|
||||||
|
let json = r#"{"posts":[{"caption":"schönes Foto"}]}"#;
|
||||||
|
assert_eq!(escape_json_for_script(json), json);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn a_lone_armed_job_reserves_for_one_archive() {
|
fn a_lone_armed_job_reserves_for_one_archive() {
|
||||||
// A ViewerOnly regeneration re-arms only the HTML half — reserving for two would refuse
|
// A ViewerOnly regeneration re-arms only the HTML half — reserving for two would refuse
|
||||||
|
|||||||
@@ -293,6 +293,10 @@ pub async fn set_user_moderation(pool: &PgPool, user_id: Uuid, banned: bool, hid
|
|||||||
|
|
||||||
/// SRC: `services/export.rs::query_uploads` — the visibility filter, verbatim, projected down to
|
/// SRC: `services/export.rs::query_uploads` — the visibility filter, verbatim, projected down to
|
||||||
/// `(id, original_size_bytes)`. This is the row set that ACTUALLY lands in the archives.
|
/// `(id, original_size_bytes)`. This is the row set that ACTUALLY lands in the archives.
|
||||||
|
///
|
||||||
|
/// Production builds this WHERE from `export_visibility_where!()`, shared with
|
||||||
|
/// `estimate_export_bytes`. A copy here can pin the behaviour but CANNOT detect production moving
|
||||||
|
/// away from it — that is what sharing the fragment is for, not this.
|
||||||
pub async fn export_visible_uploads(pool: &PgPool, event_id: Uuid) -> Vec<(Uuid, i64)> {
|
pub async fn export_visible_uploads(pool: &PgPool, event_id: Uuid) -> Vec<(Uuid, i64)> {
|
||||||
sqlx::query_as(
|
sqlx::query_as(
|
||||||
"SELECT u.id, u.original_size_bytes
|
"SELECT u.id, u.original_size_bytes
|
||||||
@@ -309,7 +313,9 @@ pub async fn export_visible_uploads(pool: &PgPool, event_id: Uuid) -> Vec<(Uuid,
|
|||||||
.expect("export_visible_uploads")
|
.expect("export_visible_uploads")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// SRC: `services/export.rs::estimate_export_bytes` — verbatim.
|
/// SRC: `services/export.rs::estimate_export_bytes` — verbatim. Same caveat as above: production
|
||||||
|
/// shares its WHERE with `query_uploads` via `export_visibility_where!()`, so these two copies
|
||||||
|
/// agreeing proves the behaviour, not the absence of drift.
|
||||||
pub async fn estimate_export_bytes(pool: &PgPool, event_id: Uuid) -> i64 {
|
pub async fn estimate_export_bytes(pool: &PgPool, event_id: Uuid) -> i64 {
|
||||||
let (bytes,): (i64,) = sqlx::query_as(
|
let (bytes,): (i64,) = sqlx::query_as(
|
||||||
"SELECT COALESCE(SUM(u.original_size_bytes), 0)::bigint
|
"SELECT COALESCE(SUM(u.original_size_bytes), 0)::bigint
|
||||||
|
|||||||
@@ -16,10 +16,18 @@
|
|||||||
//!
|
//!
|
||||||
//! What these tests pin is the ESTIMATE — the part that decides. The arithmetic on top of it lives
|
//! What these tests pin is the ESTIMATE — the part that decides. The arithmetic on top of it lives
|
||||||
//! in `services/export.rs`'s unit tests; the filesystem selection lives in `is_superseded_archive`.
|
//! in `services/export.rs`'s unit tests; the filesystem selection lives in `is_superseded_archive`.
|
||||||
//! The risk here is drift: if `query_uploads` ever gains or loses a visibility predicate and
|
//!
|
||||||
//! `estimate_export_bytes` doesn't, the preflight silently sizes the wrong gallery. So rather than
|
//! ON DRIFT, precisely, because it is easy to overclaim here. The hazard is that `query_uploads`
|
||||||
//! restating the filter, these assert the estimate against the row set the archive actually
|
//! (which selects the rows the archives are built from) and `estimate_export_bytes` (which sizes
|
||||||
//! contains.
|
//! them) could disagree — and an estimate missing rows the archive writes UNDER-reserves, the one
|
||||||
|
//! direction that reintroduces the ENOSPC. **These tests cannot catch that**, and neither can any
|
||||||
|
//! test in this harness: both sides here are `SRC:`-marked hand-copies in `tests/common/mod.rs`,
|
||||||
|
//! so if production moved and the copies didn't, they would sit still and keep passing.
|
||||||
|
//!
|
||||||
|
//! That is fixed where it can be — the two queries now share one `export_visibility_where!()`
|
||||||
|
//! fragment in `services/export.rs`, so they cannot diverge by construction. What is left for
|
||||||
|
//! these tests is what the convention is genuinely good at: pinning the BEHAVIOUR, so a change
|
||||||
|
//! that deliberately alters the filter has to come here and say so.
|
||||||
|
|
||||||
mod common;
|
mod common;
|
||||||
|
|
||||||
@@ -29,9 +37,10 @@ use sqlx::PgPool;
|
|||||||
/// The estimate must equal the sum over EXACTLY the rows `query_uploads` returns — computed from
|
/// The estimate must equal the sum over EXACTLY the rows `query_uploads` returns — computed from
|
||||||
/// that row set, not from a restatement of its WHERE clause.
|
/// that row set, not from a restatement of its WHERE clause.
|
||||||
///
|
///
|
||||||
/// PREVENTS: the two queries drifting apart. An estimate that counts rows the archive skips is
|
/// PINS: which uploads the preflight is allowed to count. Each excluded row below is excluded by a
|
||||||
/// merely pessimistic; one that MISSES rows the archive writes under-reserves, which is the whole
|
/// DIFFERENT predicate, so a change that drops or weakens any one of them fails here and has to be
|
||||||
/// failure being guarded against.
|
/// argued for. (It does not detect production drifting away from these copies — see the file
|
||||||
|
/// header; `export_visibility_where!()` is what makes that impossible.)
|
||||||
#[sqlx::test]
|
#[sqlx::test]
|
||||||
async fn the_estimate_sums_exactly_the_rows_the_archive_will_contain(pool: PgPool) {
|
async fn the_estimate_sums_exactly_the_rows_the_archive_will_contain(pool: PgPool) {
|
||||||
let event_id = seed_event(&pool, "wedding").await;
|
let event_id = seed_event(&pool, "wedding").await;
|
||||||
|
|||||||
103
e2e/specs/06-export/archive-permissions.spec.ts
Normal file
103
e2e/specs/06-export/archive-permissions.spec.ts
Normal file
@@ -0,0 +1,103 @@
|
|||||||
|
/**
|
||||||
|
* Regression guard — the keepsake extracts to files a guest can actually open.
|
||||||
|
*
|
||||||
|
* `ZipEntryBuilder::new` leaves the external file attribute at zero, and async_zip's host
|
||||||
|
* compatibility defaults to Unix — so every entry in BOTH archives was written with a stored mode
|
||||||
|
* of 0000. `unzip -Z` showed `?---------` on every line.
|
||||||
|
*
|
||||||
|
* Windows Explorer ignores Unix modes, which is exactly why this survived. On Linux and macOS,
|
||||||
|
* `unzip` faithfully applies what the archive asks for, and the guest gets a folder of photos none
|
||||||
|
* of which they can open — plus an index.html the browser refuses with ERR_ACCESS_DENIED.
|
||||||
|
*
|
||||||
|
* Unconditional: it affected every keepsake ever produced, no hostile input required. And it is
|
||||||
|
* invisible server-side — the export succeeds, the ZIP is well-formed, the job writes `done`,
|
||||||
|
* /export/status is green. The only way to see it is to extract the real artifact and try to read
|
||||||
|
* it, which is what this does.
|
||||||
|
*
|
||||||
|
* Found while chasing an unrelated ERR_ACCESS_DENIED that looked like a Playwright quirk.
|
||||||
|
*/
|
||||||
|
import { test, expect } from '../../fixtures/test';
|
||||||
|
import { execFileSync } from 'node:child_process';
|
||||||
|
import { mkdtempSync, writeFileSync, rmSync, readFileSync, statSync, readdirSync } from 'node:fs';
|
||||||
|
import { tmpdir } from 'node:os';
|
||||||
|
import { join } from 'node:path';
|
||||||
|
import { seedUpload } from '../../helpers/seed';
|
||||||
|
import { BASE } from '../../helpers/env';
|
||||||
|
|
||||||
|
/** Walk every file under `dir`, ignoring the archives we dropped there ourselves. */
|
||||||
|
function walk(dir: string, skip: string[] = []): string[] {
|
||||||
|
return readdirSync(dir, { withFileTypes: true }).flatMap((e) => {
|
||||||
|
const p = join(dir, e.name);
|
||||||
|
if (e.isDirectory()) return walk(p, skip);
|
||||||
|
return skip.includes(e.name) ? [] : [p];
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
test.describe('Export — the archives extract to readable files', () => {
|
||||||
|
test('every entry in both keepsake archives is owner-readable', async ({ host, guest, db }) => {
|
||||||
|
test.setTimeout(120_000);
|
||||||
|
const bearer = { Authorization: `Bearer ${host.jwt}` };
|
||||||
|
|
||||||
|
const g = await guest('Archivist');
|
||||||
|
const id = await seedUpload(g.jwt, { caption: 'ein Foto' });
|
||||||
|
await expect.poll(() => db.compressionStatus(id), { timeout: 30_000 }).toBe('done');
|
||||||
|
|
||||||
|
expect(
|
||||||
|
(await fetch(`${BASE}/api/v1/host/gallery/release`, { method: 'POST', headers: bearer }))
|
||||||
|
.status
|
||||||
|
).toBe(204);
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(
|
||||||
|
async () => {
|
||||||
|
const res = await fetch(`${BASE}/api/v1/export/status`, { headers: bearer });
|
||||||
|
const s = await res.json();
|
||||||
|
return s.zip?.status === 'done' && s.html?.status === 'done';
|
||||||
|
},
|
||||||
|
{ timeout: 90_000, intervals: [500] }
|
||||||
|
)
|
||||||
|
.toBe(true);
|
||||||
|
|
||||||
|
for (const kind of ['zip', 'html'] as const) {
|
||||||
|
const ticketRes = await fetch(`${BASE}/api/v1/export/ticket`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: bearer,
|
||||||
|
});
|
||||||
|
const { ticket } = (await ticketRes.json()) as { ticket: string };
|
||||||
|
const dl = await fetch(`${BASE}/api/v1/export/${kind}?ticket=${encodeURIComponent(ticket)}`);
|
||||||
|
expect(dl.status, `downloading the ${kind} archive`).toBe(200);
|
||||||
|
|
||||||
|
const dir = mkdtempSync(join(tmpdir(), `eventsnap-perms-${kind}-`));
|
||||||
|
try {
|
||||||
|
const zipPath = join(dir, 'archive.zip');
|
||||||
|
writeFileSync(zipPath, Buffer.from(await dl.arrayBuffer()));
|
||||||
|
|
||||||
|
// The mode as STORED in the archive — this is what a guest's unzip will apply. Reading it
|
||||||
|
// from the central directory catches the defect even on a filesystem that would mask it.
|
||||||
|
const listing = execFileSync('unzip', ['-Z', zipPath], { encoding: 'utf8' });
|
||||||
|
const modes = listing
|
||||||
|
.split('\n')
|
||||||
|
.filter((l) => /^[?d-][rwx-]{9}\s/.test(l))
|
||||||
|
.map((l) => l.slice(0, 10));
|
||||||
|
expect(modes.length, `${kind}: no entries listed`).toBeGreaterThan(0);
|
||||||
|
for (const m of modes) {
|
||||||
|
expect(m, `${kind}: an entry is stored mode ${m} — the guest cannot open it`).toMatch(
|
||||||
|
/^.r[w-]-/
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// And extraction really does produce readable files.
|
||||||
|
execFileSync('unzip', ['-qo', zipPath, '-d', dir]);
|
||||||
|
const files = walk(dir, ['archive.zip']);
|
||||||
|
expect(files.length, `${kind}: nothing extracted`).toBeGreaterThan(0);
|
||||||
|
for (const f of files) {
|
||||||
|
expect(statSync(f).mode & 0o400, `${f} is not owner-readable`).toBeTruthy();
|
||||||
|
// The assertion that matters to a guest: the bytes actually come out.
|
||||||
|
expect(() => readFileSync(f)).not.toThrow();
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
rmSync(dir, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
125
e2e/specs/06-export/viewer-caption-injection.spec.ts
Normal file
125
e2e/specs/06-export/viewer-caption-injection.spec.ts
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
/**
|
||||||
|
* Regression guard — a guest-authored caption cannot brick the offline keepsake.
|
||||||
|
*
|
||||||
|
* The viewer's data is inlined as `<script>window.__EXPORT_DATA__={…};</script>` (it must be:
|
||||||
|
* guests open index.html over file://, where a cross-origin fetch of a sibling data.json is
|
||||||
|
* blocked). Captions and comments are guest text and land in that payload.
|
||||||
|
*
|
||||||
|
* The escape used to be `</` → `<\/`. Against XSS that holds — `</script><img src=x onerror=…>`
|
||||||
|
* round-trips inert. It does NOT stop the caption steering the HTML TOKENIZER: `<!--<script` with
|
||||||
|
* no later `-->` drives the parser into script-data-double-escaped state, where the template's own
|
||||||
|
* `</script>` steps back to script-data-escaped instead of closing the element. Everything after —
|
||||||
|
* including the viewer bundle — is swallowed as script data. Nothing executes and nothing leaks;
|
||||||
|
* `__EXPORT_DATA__` is never assigned and the keepsake renders blank.
|
||||||
|
*
|
||||||
|
* What makes it worth a browser-level test rather than a unit test alone: the failure is SILENT and
|
||||||
|
* POST-DISTRIBUTION. The export succeeds, the ZIP is well-formed, the job writes `done`,
|
||||||
|
* /export/status is green, and the host hands out a file that only fails when a guest
|
||||||
|
* double-clicks it — in every copy, unfixably. It is not visible by reading the escape. It is only
|
||||||
|
* visible by running a real parser over the real artifact, which is what this does: release, pull
|
||||||
|
* the actual Memories.zip, extract index.html, open it over file:// in Chromium, and assert the
|
||||||
|
* viewer actually booted.
|
||||||
|
*
|
||||||
|
* The near-miss worth recording: `<!--<script>alert(1)</script>-->` comes back CLEAN, because the
|
||||||
|
* trailing `-->` returns the parser to script-data state. A probe using the terminated form
|
||||||
|
* quietly repairs the very thing it is testing for. Only the unterminated variant exposes it.
|
||||||
|
*/
|
||||||
|
import { test, expect } from '../../fixtures/test';
|
||||||
|
import { execFileSync } from 'node:child_process';
|
||||||
|
import { mkdtempSync, writeFileSync, rmSync } from 'node:fs';
|
||||||
|
import { tmpdir } from 'node:os';
|
||||||
|
import { join } from 'node:path';
|
||||||
|
import { seedUpload } from '../../helpers/seed';
|
||||||
|
import { BASE } from '../../helpers/env';
|
||||||
|
|
||||||
|
/** Unterminated on purpose — see the header. The terminated form self-repairs. */
|
||||||
|
const TOKENIZER_PAYLOAD = '<!--<script';
|
||||||
|
/** The classic break-out. Already handled, kept so the fix can never regress on it. */
|
||||||
|
const BREAKOUT_PAYLOAD = '</script><img src=x onerror=window.__XSS__=1>';
|
||||||
|
|
||||||
|
test.describe('Export — a caption cannot brick the keepsake viewer', () => {
|
||||||
|
test('the exported viewer boots with a tokenizer-hostile caption in it', async ({
|
||||||
|
page,
|
||||||
|
host,
|
||||||
|
guest,
|
||||||
|
db,
|
||||||
|
}) => {
|
||||||
|
test.setTimeout(120_000);
|
||||||
|
const bearer = { Authorization: `Bearer ${host.jwt}` };
|
||||||
|
|
||||||
|
const g = await guest('Trickster');
|
||||||
|
const a = await seedUpload(g.jwt, { caption: TOKENIZER_PAYLOAD });
|
||||||
|
const b = await seedUpload(g.jwt, { caption: BREAKOUT_PAYLOAD });
|
||||||
|
for (const id of [a, b]) {
|
||||||
|
await expect.poll(() => db.compressionStatus(id), { timeout: 30_000 }).toBe('done');
|
||||||
|
}
|
||||||
|
|
||||||
|
expect(
|
||||||
|
(await fetch(`${BASE}/api/v1/host/gallery/release`, { method: 'POST', headers: bearer }))
|
||||||
|
.status
|
||||||
|
).toBe(204);
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(
|
||||||
|
async () => {
|
||||||
|
const res = await fetch(`${BASE}/api/v1/export/status`, { headers: bearer });
|
||||||
|
return (await res.json()).html?.status;
|
||||||
|
},
|
||||||
|
{ timeout: 90_000, intervals: [500] }
|
||||||
|
)
|
||||||
|
.toBe('done');
|
||||||
|
|
||||||
|
const ticketRes = await fetch(`${BASE}/api/v1/export/ticket`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: bearer,
|
||||||
|
});
|
||||||
|
const { ticket } = (await ticketRes.json()) as { ticket: string };
|
||||||
|
const dl = await fetch(`${BASE}/api/v1/export/html?ticket=${encodeURIComponent(ticket)}`);
|
||||||
|
expect(dl.status).toBe(200);
|
||||||
|
|
||||||
|
const dir = mkdtempSync(join(tmpdir(), 'eventsnap-viewer-'));
|
||||||
|
try {
|
||||||
|
const zipPath = join(dir, 'Memories.zip');
|
||||||
|
writeFileSync(zipPath, Buffer.from(await dl.arrayBuffer()));
|
||||||
|
// Extract the WHOLE archive: index.html pulls in the viewer's own JS/CSS, and the point of
|
||||||
|
// this test is that those later resources are still reachable by the parser.
|
||||||
|
execFileSync('unzip', ['-qo', zipPath, '-d', dir]);
|
||||||
|
|
||||||
|
// file://, not http://. That is how a guest actually opens the keepsake, and it is the
|
||||||
|
// whole reason the data is inlined rather than fetched from a sibling data.json.
|
||||||
|
let xss = false;
|
||||||
|
page.on('dialog', (d) => {
|
||||||
|
xss = true;
|
||||||
|
void d.dismiss();
|
||||||
|
});
|
||||||
|
await page.goto('file://' + join(dir, 'index.html'));
|
||||||
|
|
||||||
|
// 1. The payload was assigned at all. This is the assertion that fails on the old escape —
|
||||||
|
// the second script block is never reached, so the global stays undefined.
|
||||||
|
const captions = await page.evaluate(() => {
|
||||||
|
const d = (window as unknown as { __EXPORT_DATA__?: { posts?: { caption?: string }[] } })
|
||||||
|
.__EXPORT_DATA__;
|
||||||
|
return d?.posts?.map((p) => p.caption ?? '') ?? null;
|
||||||
|
});
|
||||||
|
expect(captions, '__EXPORT_DATA__ was never assigned — the viewer is bricked').not.toBeNull();
|
||||||
|
|
||||||
|
// 2. The captions survived verbatim. The escape is a transport encoding, not a sanitiser:
|
||||||
|
// a guest's text has to come back exactly, or we have silently rewritten their words.
|
||||||
|
expect(captions).toContain(TOKENIZER_PAYLOAD);
|
||||||
|
expect(captions).toContain(BREAKOUT_PAYLOAD);
|
||||||
|
|
||||||
|
// 3. And nothing executed.
|
||||||
|
expect(
|
||||||
|
await page.evaluate(() => (window as unknown as { __XSS__?: number }).__XSS__ === 1),
|
||||||
|
'the caption must be inert, not merely non-fatal'
|
||||||
|
).toBe(false);
|
||||||
|
expect(xss).toBe(false);
|
||||||
|
|
||||||
|
// 4. The viewer actually rendered — the whole document parsed, not just the head. If the
|
||||||
|
// tokenizer had swallowed the bundle, the body would be empty of viewer output.
|
||||||
|
await expect(page.locator('body')).not.toBeEmpty();
|
||||||
|
} finally {
|
||||||
|
rmSync(dir, { recursive: true, force: true });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user