test(mounts): cover download range logic + add just coverage recipe

- Extract the WebDAV/REST mount-download Range decision (parse + validate +
  satisfiable) into a pure `plan_mount_range`, unit-tested across no-range,
  malformed, inclusive, open-ended, suffix, and out-of-bounds cases. This was
  the one untested branch of `download_mount_file` (its I/O deps are already
  integration-covered).
- Add `just coverage [filter]` and `just coverage-integration [filter]`
  recipes wrapping cargo-llvm-cov (HTML + summary; integration variant adds
  the testcontainers tests).
This commit is contained in:
Bradley Nelson
2026-06-25 01:11:45 -06:00
parent 07320a3925
commit 94e5aec4af
2 changed files with 142 additions and 52 deletions
+12
View File
@@ -50,6 +50,18 @@ test:
test-mocks: test-mocks:
cargo test --features test_utils cargo test --features test_utils
# Source-based line coverage (HTML + summary) via cargo-llvm-cov.
# Requires `cargo install cargo-llvm-cov` and llvm-tools (rustup component
# llvm-tools-preview, or set LLVM_COV / LLVM_PROFDATA to an llvm-binutils).
# Unit tests only (no DB). Pass a filter: `just coverage external_mount`.
coverage filter='':
cargo llvm-cov --lib --html {{ if filter == '' { '' } else { '--' } }} {{filter}}
cargo llvm-cov --lib --summary-only {{ if filter == '' { '' } else { '--' } }} {{filter}}
# Coverage including the testcontainers integration tests (needs docker).
coverage-integration filter='mount':
RUSTFLAGS='--cfg integration_tests' cargo llvm-cov --lib --summary-only -- {{filter}}
# DB-dependent integration tests gated on `--cfg integration_tests`. # DB-dependent integration tests gated on `--cfg integration_tests`.
# Spins up the test postgres on port 5433 first. Requires one row in # Spins up the test postgres on port 5433 first. Requires one row in
# auth.users on the test DB (start the server against it once to seed). # auth.users on the test DB (start the server against it once to seed).
+103 -25
View File
@@ -877,24 +877,22 @@ impl FileHandler {
} }
// ── Range Requests ─────────────────────────────────────────── // ── Range Requests ───────────────────────────────────────────
if let Some(range_header) = headers.get(header::RANGE) let range_header = headers.get(header::RANGE).and_then(|v| v.to_str().ok());
&& let Ok(range_str) = range_header.to_str() match plan_mount_range(stat.size, range_header) {
&& let Ok(ranges) = parse_range_header(range_str) MountRangePlan::Full => {}
{ MountRangePlan::NotSatisfiable => {
match ranges.validate(stat.size) { return Response::builder()
Ok(valid_ranges) => { .status(StatusCode::RANGE_NOT_SATISFIABLE)
if let Some(range) = valid_ranges.first() { .header(header::CONTENT_RANGE, format!("bytes */{}", stat.size))
let start = *range.start(); .body(Body::empty())
let end = *range.end(); .unwrap()
.into_response();
}
MountRangePlan::Range { start, end } => {
let range_length = end - start + 1; let range_length = end - start + 1;
let disposition = Self::content_disposition(name, &stat.mime_type, params); let disposition = Self::content_disposition(name, &stat.mime_type, params);
match retrieval match retrieval
.open_mount_file_with_perms( .open_mount_file_with_perms(cfg, node_id, caller_id, Some((start, Some(end))))
cfg,
node_id,
caller_id,
Some((start, Some(end))),
)
.await .await
{ {
Ok(stream) => { Ok(stream) => {
@@ -924,16 +922,6 @@ impl FileHandler {
} }
} }
} }
Err(_) => {
return Response::builder()
.status(StatusCode::RANGE_NOT_SATISFIABLE)
.header(header::CONTENT_RANGE, format!("bytes */{}", stat.size))
.body(Body::empty())
.unwrap()
.into_response();
}
}
}
// ── Normal download ────────────────────────────────────────── // ── Normal download ──────────────────────────────────────────
let disposition = Self::content_disposition(name, &stat.mime_type, params); let disposition = Self::content_disposition(name, &stat.mime_type, params);
@@ -1543,3 +1531,93 @@ pub async fn move_file_simple(
) -> impl IntoResponse { ) -> impl IntoResponse {
FileHandler::move_file_simple_impl(state, auth_user, path, json).await FileHandler::move_file_simple_impl(state, auth_user, path, json).await
} }
/// The download decision for a mount file given a `Range` header — the gnarly
/// parse-and-validate logic, extracted so it is unit-testable without I/O.
#[derive(Debug, PartialEq, Eq)]
pub(super) enum MountRangePlan {
/// Serve the whole file (no/invalid range header).
Full,
/// Serve `start..=end` (inclusive) as 206 Partial Content.
Range { start: u64, end: u64 },
/// The requested range is unsatisfiable for this size → 416.
NotSatisfiable,
}
/// Decide how to serve a mount file for a given size + optional `Range` header.
/// A missing or unparseable range → `Full`; a valid range → `Range`; an
/// out-of-bounds range → `NotSatisfiable`.
pub(super) fn plan_mount_range(size: u64, range_header: Option<&str>) -> MountRangePlan {
let Some(rh) = range_header else {
return MountRangePlan::Full;
};
let Ok(ranges) = parse_range_header(rh) else {
// Malformed range header: ignore it and serve the whole file (RFC 7233).
return MountRangePlan::Full;
};
match ranges.validate(size) {
Ok(valid) => match valid.first() {
Some(r) => MountRangePlan::Range {
start: *r.start(),
end: *r.end(),
},
None => MountRangePlan::Full,
},
Err(_) => MountRangePlan::NotSatisfiable,
}
}
#[cfg(test)]
mod mount_range_tests {
use super::{MountRangePlan, plan_mount_range};
#[test]
fn no_range_header_is_full() {
assert_eq!(plan_mount_range(100, None), MountRangePlan::Full);
}
#[test]
fn malformed_range_falls_back_to_full() {
assert_eq!(
plan_mount_range(100, Some("not-a-range")),
MountRangePlan::Full
);
assert_eq!(
plan_mount_range(100, Some("bytes=abc")),
MountRangePlan::Full
);
}
#[test]
fn valid_range_is_parsed_inclusive() {
assert_eq!(
plan_mount_range(100, Some("bytes=10-19")),
MountRangePlan::Range { start: 10, end: 19 }
);
}
#[test]
fn open_ended_range_extends_to_eof() {
assert_eq!(
plan_mount_range(100, Some("bytes=90-")),
MountRangePlan::Range { start: 90, end: 99 }
);
}
#[test]
fn suffix_range_counts_from_end() {
// last 10 bytes of a 100-byte file => 90..=99
assert_eq!(
plan_mount_range(100, Some("bytes=-10")),
MountRangePlan::Range { start: 90, end: 99 }
);
}
#[test]
fn out_of_bounds_range_is_not_satisfiable() {
assert_eq!(
plan_mount_range(100, Some("bytes=200-300")),
MountRangePlan::NotSatisfiable
);
}
}