Merge pull request #57 from dandi/err-undec-depth

Better handling of undecodable Depth headers
dandi · Feb 8, 2024 · a561bfa · a561bfa
2 parents a8319cd + 76e120a
commit a561bfa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+In Development
+--------------
+- Respond to undecodable "Depth" header values with a 400 response instead of
+  acting like no value was specified
+
 v0.2.0 (2024-02-07)
 -------------------
 - Serve Zarr entries via manifests from

diff --git a/src/dav/util.rs b/src/dav/util.rs
@@ -78,10 +78,10 @@ impl<S: Send + Sync> FromRequestParts<S> for FiniteDepth {
     type Rejection = Response<Body>;
 
     async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
-        match parts.headers.get("Depth").and_then(|v| v.to_str().ok()) {
-            Some("0") => Ok(FiniteDepth::Zero),
-            Some("1") => Ok(FiniteDepth::One),
-            Some("infinity") | None => Err((
+        match parts.headers.get("Depth").map(|v| v.to_str()) {
+            Some(Ok("0")) => Ok(FiniteDepth::Zero),
+            Some(Ok("1")) => Ok(FiniteDepth::One),
+            Some(Ok("infinity")) | None => Err((
                 StatusCode::FORBIDDEN,
                 [(CONTENT_TYPE, DAV_XML_CONTENT_TYPE)],
                 INFINITE_DEPTH_RESPONSE,