Claude
1912a17fa2
Two DAV-surface fixes that replicate patterns the codebase already had: NC PROPFIND (folder case) previously loaded EVERY child via unbounded list_files/list_folders and serialized the entire multistatus into one Vec (~2 KB per entry — a 50k-file folder meant ~100 MB of buffer per request, repeated constantly by sync clients). It now mirrors the native WebDAV handler's streaming builder: children are fetched in pages of PROPFIND_BATCH_SIZE (500), each page's favorites and oc:fileids are resolved with two batch queries, and the XML is yielded chunk by chunk — memory stays O(batch) and the first byte flows immediately. The single-file PROPFIND keeps a small buffered variant; the multistatus opening tag is factored into a shared helper so the namespace set cannot diverge. WebDAV GET (native and NC) ignored the Range header and never compared the ETag it emitted, so mount-style clients (rclone, davfs2, Finder) re-transferred whole files on every seek, resume, or revalidation. New shared `interfaces::range_requests` helpers — same semantics as the REST download endpoint, which now reuses the 304 helper too — give both GETs If-None-Match → 304, Range → 206/416, and Accept-Ranges advertising. https://claude.ai/code/session_01Dp3oWon5GBMVn4j3QXZdgx
98 lines
3.7 KiB
Rust
98 lines
3.7 KiB
Rust
//! Conditional-request (`If-None-Match` → 304) and `Range` (→ 206/416)
|
|
//! helpers shared by the native WebDAV and NextCloud GET handlers.
|
|
//!
|
|
//! Mount-style WebDAV clients (rclone, davfs2, Finder, video players)
|
|
//! read by ranges; without 206 support every seek or resume transfers
|
|
//! the whole file. The REST download handler keeps its own richer
|
|
//! variant in `file_handler.rs` (Content-Disposition, compression,
|
|
//! permission-scoped streams) but follows the same header semantics.
|
|
|
|
use axum::body::Body;
|
|
use axum::http::{HeaderMap, Response, StatusCode, header};
|
|
use http_range_header::parse_range_header;
|
|
use std::sync::Arc;
|
|
|
|
use crate::application::dtos::file_dto::FileDto;
|
|
use crate::application::ports::file_ports::FileRetrievalUseCase;
|
|
use crate::application::services::file_retrieval_service::FileRetrievalService;
|
|
|
|
/// `If-None-Match` short-circuit: returns a `304 Not Modified` response
|
|
/// when the client already holds the current representation. `etag` must
|
|
/// be the quoted form the GET would emit (same comparison as the REST
|
|
/// download endpoint: exact match or `*`).
|
|
pub fn not_modified_response(headers: &HeaderMap, etag: &str) -> Option<Response<Body>> {
|
|
let client_etag = headers.get(header::IF_NONE_MATCH)?.to_str().ok()?;
|
|
if client_etag == etag || client_etag == "*" {
|
|
return Some(
|
|
Response::builder()
|
|
.status(StatusCode::NOT_MODIFIED)
|
|
.header(header::ETAG, etag)
|
|
.body(Body::empty())
|
|
.unwrap(),
|
|
);
|
|
}
|
|
None
|
|
}
|
|
|
|
/// `Range` short-circuit for a streaming download.
|
|
///
|
|
/// Returns `Some(206)` with the requested byte range, `Some(416)` when
|
|
/// the range cannot be satisfied, or `None` when no (parseable) range
|
|
/// was requested or the range stream could not be created — callers
|
|
/// fall through to the full-body response, mirroring the REST handler.
|
|
///
|
|
/// The caller has already resolved access to the file (path-resolver /
|
|
/// ownership), so this uses the unscoped range stream — same contract
|
|
/// as the `get_file_stream` call in the surrounding handlers.
|
|
pub async fn range_response(
|
|
headers: &HeaderMap,
|
|
file: &FileDto,
|
|
etag: &str,
|
|
retrieval: &Arc<FileRetrievalService>,
|
|
) -> Option<Response<Body>> {
|
|
let range_str = headers.get(header::RANGE)?.to_str().ok()?;
|
|
let ranges = parse_range_header(range_str).ok()?;
|
|
|
|
let valid_ranges = match ranges.validate(file.size) {
|
|
Ok(v) => v,
|
|
Err(_) => {
|
|
return Some(
|
|
Response::builder()
|
|
.status(StatusCode::RANGE_NOT_SATISFIABLE)
|
|
.header(header::CONTENT_RANGE, format!("bytes */{}", file.size))
|
|
.body(Body::empty())
|
|
.unwrap(),
|
|
);
|
|
}
|
|
};
|
|
|
|
let range = valid_ranges.first()?;
|
|
let start = *range.start();
|
|
let end = *range.end();
|
|
let range_length = end - start + 1;
|
|
|
|
match retrieval
|
|
.get_file_range_stream(&file.id, start, Some(end + 1))
|
|
.await
|
|
{
|
|
Ok(stream) => Some(
|
|
Response::builder()
|
|
.status(StatusCode::PARTIAL_CONTENT)
|
|
.header(header::CONTENT_TYPE, &*file.mime_type)
|
|
.header(header::CONTENT_LENGTH, range_length)
|
|
.header(
|
|
header::CONTENT_RANGE,
|
|
format!("bytes {}-{}/{}", start, end, file.size),
|
|
)
|
|
.header(header::ACCEPT_RANGES, "bytes")
|
|
.header(header::ETAG, etag)
|
|
.body(Body::from_stream(Box::into_pin(stream)))
|
|
.unwrap(),
|
|
),
|
|
Err(err) => {
|
|
tracing::error!("Error creating range stream: {}", err);
|
|
None // fall through to the full download
|
|
}
|
|
}
|
|
}
|