irondrop: more prop* fizes

Author: dev-harsh1998

src/webdav.rs

@@ -154,8 +154,10 @@ fn handle_propfind(
 "#,
     );
 
+    let compact_children = depth == DavDepth::One && target_path.is_dir();
     for resource in resources {
-        append_multistatus_response(&mut body, base_dir, &resource, &mode)?;
+        let compact = compact_children && resource != target_path;
+        append_multistatus_response(&mut body, base_dir, &resource, &mode, compact)?;
     }
     body.push_str("</D:multistatus>\n");
 
@@ -1726,6 +1728,7 @@ fn append_multistatus_response(
     base_dir: &Path,
     resource: &Path,
     mode: &PropfindMode,
+    compact: bool,
 ) -> Result<(), AppError> {
     let metadata = std::fs::metadata(resource)?;
     let is_dir = metadata.is_dir();
@@ -1743,27 +1746,40 @@ fn append_multistatus_response(
     xml.push_str("    <D:href>");
     xml.push_str(&xml_escape(&href));
     xml.push_str("</D:href>\n");
-    let live_props = build_live_props(resource, is_dir, &displayname, &metadata);
+    let include_lock_props = !compact;
+    let live_props = build_live_props(
+        resource,
+        is_dir,
+        &displayname,
+        &metadata,
+        include_lock_props,
+    );
     match mode {
         PropfindMode::AllProp => {
-            let mut merged = live_props.clone();
-            let dead = dead_props_for_path(resource);
-            for (name, value) in dead {
-                if !merged.iter().any(|(live_name, _)| live_name == &name) {
-                    merged.push((name, Some(xml_escape(&value))));
+            if compact {
+                append_propstat(xml, &live_props, "HTTP/1.1 200 OK");
+            } else {
+                let mut merged = live_props.clone();
+                let dead = dead_props_for_path(resource);
+                for (name, value) in dead {
+                    if !merged.iter().any(|(live_name, _)| live_name == &name) {
+                        merged.push((name, Some(xml_escape(&value))));
+                    }
                 }
+                append_propstat(xml, &merged, "HTTP/1.1 200 OK");
             }
-            append_propstat(xml, &merged, "HTTP/1.1 200 OK");
         }
         PropfindMode::PropName => {
             let mut names: Vec<(PropName, Option<String>)> = live_props
                 .iter()
                 .map(|(name, _)| (name.clone(), None))
                 .collect();
-            let dead = dead_props_for_path(resource);
-            for dead_name in dead.keys() {
-                if !names.iter().any(|(name, _)| name == dead_name) {
-                    names.push((dead_name.clone(), None));
+            if !compact {
+                let dead = dead_props_for_path(resource);
+                for dead_name in dead.keys() {
+                    if !names.iter().any(|(name, _)| name == dead_name) {
+                        names.push((dead_name.clone(), None));
+                    }
                 }
             }
             append_propstat(xml, &names, "HTTP/1.1 200 OK");
@@ -1850,6 +1866,7 @@ fn build_live_props(
     is_dir: bool,
     displayname: &str,
     metadata: &std::fs::Metadata,
+    include_lock_props: bool,
 ) -> Vec<(PropName, Option<String>)> {
     let mut props = Vec::new();
     props.push((dav_prop_name("displayname"), Some(xml_escape(displayname))));
@@ -1891,23 +1908,25 @@ fn build_live_props(
         dav_prop_name("getetag"),
         Some(etag_for_resource(resource, metadata)),
     ));
-    props.push((
-        dav_prop_name("supportedlock"),
-        Some("<D:lockentry><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype></D:lockentry>".to_string()),
-    ));
-    if let Some(lock) = current_lock_for_path(resource) {
+    if include_lock_props {
         props.push((
-            dav_prop_name("lockdiscovery"),
-            Some(format!(
-                "<D:activelock><D:locktype><D:write/></D:locktype><D:lockscope><D:exclusive/></D:lockscope><D:depth>{}</D:depth><D:timeout>Second-{}</D:timeout><D:lockroot><D:href>{}</D:href></D:lockroot><D:locktoken><D:href>{}</D:href></D:locktoken></D:activelock>",
-                if lock.depth_infinity { "Infinity" } else { "0" },
-                lock.timeout_secs,
-                xml_escape(&lock.lockroot_href),
-                xml_escape(&lock.token)
-            )),
+            dav_prop_name("supportedlock"),
+            Some("<D:lockentry><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype></D:lockentry>".to_string()),
         ));
-    } else {
-        props.push((dav_prop_name("lockdiscovery"), Some(String::new())));
+        if let Some(lock) = current_lock_for_path(resource) {
+            props.push((
+                dav_prop_name("lockdiscovery"),
+                Some(format!(
+                    "<D:activelock><D:locktype><D:write/></D:locktype><D:lockscope><D:exclusive/></D:lockscope><D:depth>{}</D:depth><D:timeout>Second-{}</D:timeout><D:lockroot><D:href>{}</D:href></D:lockroot><D:locktoken><D:href>{}</D:href></D:locktoken></D:activelock>",
+                    if lock.depth_infinity { "Infinity" } else { "0" },
+                    lock.timeout_secs,
+                    xml_escape(&lock.lockroot_href),
+                    xml_escape(&lock.token)
+                )),
+            ));
+        } else {
+            props.push((dav_prop_name("lockdiscovery"), Some(String::new())));
+        }
     }
 
     props

tests/webdav_options_propfind_test.rs

@@ -179,6 +179,38 @@ fn test_propfind_finder_probe_missing_returns_not_found_fast() {
     assert_eq!(response.status(), StatusCode::NOT_FOUND);
 }
 
+#[test]
+fn test_propfind_depth_one_compacts_lock_props_for_children() {
+    let server = setup_test_server_with_tree_and_webdav(
+        |root| {
+            std::fs::create_dir_all(root.join("call_rec_feb25").join("+911726132348")).unwrap();
+            let mut f = std::fs::File::create(
+                root.join("call_rec_feb25")
+                    .join("+911726132348")
+                    .join("x.txt"),
+            )
+            .unwrap();
+            write!(f, "x").unwrap();
+        },
+        true,
+    );
+    let client = Client::new();
+
+    let response = client
+        .request(
+            Method::from_bytes(b"PROPFIND").unwrap(),
+            format!("http://{}/call_rec_feb25/", server.addr),
+        )
+        .header("Depth", "1")
+        .send()
+        .unwrap();
+
+    assert_eq!(response.status().as_u16(), 207);
+    let xml = response.text().unwrap();
+    let count = xml.matches("supportedlock").count();
+    assert!(count <= 1);
+}
+
 #[test]
 fn test_propfind_depth_one_on_collection_includes_children() {
     let server = setup_test_server_with_tree(|root| {