Use correct propstat in multi-status WebDAV responses

Extract find_ok_prop() helper that iterates all propstat elements
and picks the one with HTTP 200 status, instead of blindly taking
the first propstat which could be a 404 for missing properties.

Author: bigcat88

src/nc_mcp_server/client.py

@@ -70,6 +70,24 @@ def _raise_for_ocs_status(response: niquests.Response, context: str = "") -> Non
 OC_NS = "http://owncloud.org/ns"
 NC_NS = "http://nextcloud.org/ns"
 
+
+def find_ok_prop(response: ET.Element) -> ET.Element | None:
+    """Find the <d:prop> from the first propstat with HTTP 200 status.
+
+    WebDAV multi-status responses may contain multiple propstat elements
+    with different status codes (e.g. 200 for found props, 404 for missing ones).
+    The ordering is not guaranteed, so we iterate all of them.
+    """
+    for propstat in response.findall(f"{{{DAV_NS}}}propstat"):
+        status_el = propstat.find(f"{{{DAV_NS}}}status")
+        if status_el is not None and "200" not in (status_el.text or ""):
+            continue
+        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        if prop is not None:
+            return prop
+    return None
+
+
 # Standard PROPFIND body for file listings
 PROPFIND_BODY = """<?xml version="1.0" encoding="UTF-8"?>
 <d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns" xmlns:nc="http://nextcloud.org/ns">
@@ -430,10 +448,7 @@ def _parse_propfind(xml_text: str, user: str) -> list[dict[str, Any]]:
             # Strip the DAV prefix to get the relative path
             path = (href.split(dav_prefix, 1)[1] if dav_prefix in href else href).rstrip("/")
 
-            propstat = response.find(f"{{{DAV_NS}}}propstat")
-            if propstat is None:
-                continue
-            prop = propstat.find(f"{{{DAV_NS}}}prop")
+            prop = find_ok_prop(response)
             if prop is None:
                 continue
 

src/nc_mcp_server/tools/calendar.py

@@ -12,7 +12,7 @@
 from mcp.server.fastmcp import FastMCP
 
 from ..annotations import ADDITIVE, ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
-from ..client import DAV_NS, NextcloudError
+from ..client import DAV_NS, NextcloudError, find_ok_prop
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client, get_config
 
@@ -122,10 +122,7 @@ def _parse_calendars_xml(xml_text: str, user: str) -> list[dict[str, Any]]:
         if cal_id in SKIP_CALENDARS:
             continue
 
-        propstat = response.find(f"{{{DAV_NS}}}propstat")
-        if propstat is None:
-            continue
-        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        prop = find_ok_prop(response)
         if prop is None:
             continue
         rt = prop.find(f"{{{DAV_NS}}}resourcetype")

src/nc_mcp_server/tools/comments.py

@@ -8,6 +8,7 @@
 from mcp.server.fastmcp import FastMCP
 
 from ..annotations import ADDITIVE, ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
+from ..client import find_ok_prop
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client
 
@@ -86,10 +87,7 @@ def _parse_comments_xml(xml_text: str) -> list[dict[str, Any]]:
         comment_id = parts[-1] if parts else ""
         if not comment_id.isdigit():
             continue
-        propstat = response.find(f"{{{DAV_NS}}}propstat")
-        if propstat is None:
-            continue
-        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        prop = find_ok_prop(response)
         if prop is None:
             continue
         comments.append(_parse_comment_prop(prop, int(comment_id)))

src/nc_mcp_server/tools/system_tags.py

@@ -7,7 +7,7 @@
 from mcp.server.fastmcp import FastMCP
 
 from ..annotations import ADDITIVE, ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
-from ..client import NextcloudError
+from ..client import NextcloudError, find_ok_prop
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client
 
@@ -30,13 +30,7 @@ def _parse_tags_xml(xml_text: str) -> list[dict[str, Any]]:
     root = ET.fromstring(xml_text)  # noqa: S314
     tags: list[dict[str, Any]] = []
     for response in root.findall(f"{{{DAV_NS}}}response"):
-        propstat = response.find(f"{{{DAV_NS}}}propstat")
-        if propstat is None:
-            continue
-        status_el = propstat.find(f"{{{DAV_NS}}}status")
-        if status_el is None or "200" not in (status_el.text or ""):
-            continue
-        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        prop = find_ok_prop(response)
         if prop is None:
             continue
         tag_id_el = prop.find(f"{{{OC_NS}}}id")

src/nc_mcp_server/tools/tasks.py

@@ -12,7 +12,7 @@
 from mcp.server.fastmcp import FastMCP
 
 from ..annotations import ADDITIVE, ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
-from ..client import DAV_NS, NextcloudError
+from ..client import DAV_NS, NextcloudError, find_ok_prop
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client, get_config
 
@@ -103,10 +103,7 @@ def _parse_task_lists_xml(xml_text: str, user: str) -> list[dict[str, Any]]:
         if list_id in SKIP_COLLECTIONS:
             continue
 
-        propstat = response.find(f"{{{DAV_NS}}}propstat")
-        if propstat is None:
-            continue
-        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        prop = find_ok_prop(response)
         if prop is None:
             continue
         rt = prop.find(f"{{{DAV_NS}}}resourcetype")

src/nc_mcp_server/tools/trashbin.py

@@ -9,7 +9,7 @@
 from mcp.server.fastmcp import FastMCP
 
 from ..annotations import ADDITIVE_IDEMPOTENT, DESTRUCTIVE, READONLY
-from ..client import DAV_NS, NC_NS, OC_NS
+from ..client import DAV_NS, NC_NS, OC_NS, find_ok_prop
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client, get_config
 
@@ -66,10 +66,7 @@ def _parse_trash_xml(xml_text: str, user: str) -> list[dict[str, Any]]:
         trash_path = href.split(trash_prefix, 1)[1].rstrip("/") if trash_prefix in href else ""
         if not trash_path:
             continue
-        propstat = response.find(f"{{{DAV_NS}}}propstat")
-        if propstat is None:
-            continue
-        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        prop = find_ok_prop(response)
         if prop is None:
             continue
         entries.append(_parse_trash_entry(prop, trash_path))

src/nc_mcp_server/tools/versions.py

@@ -9,7 +9,7 @@
 from mcp.server.fastmcp import FastMCP
 
 from ..annotations import ADDITIVE_IDEMPOTENT, READONLY
-from ..client import DAV_NS, NC_NS
+from ..client import DAV_NS, NC_NS, find_ok_prop
 from ..permissions import PermissionLevel, require_permission
 from ..state import get_client, get_config
 
@@ -38,10 +38,7 @@ def _parse_versions_xml(xml_text: str, user: str, file_id: int) -> list[dict[str
         version_id = href.split(prefix, 1)[1].rstrip("/") if prefix in href else ""
         if not version_id:
             continue
-        propstat = response.find(f"{{{DAV_NS}}}propstat")
-        if propstat is None:
-            continue
-        prop = propstat.find(f"{{{DAV_NS}}}prop")
+        prop = find_ok_prop(response)
         if prop is None:
             continue
         entry: dict[str, Any] = {"version_id": version_id}