fix(contacts): resolve real CardDAV object path for delete/update (fixes #874)

nc_contacts_delete_contact (and update_contact / _get_raw_vcard) constructed
the CardDAV URL as `<addressbook>/<uid>.vcf`, assuming the DAV object filename
always equals `<uid>.vcf`. The object filename is independent of the vCard's
internal UID, so any object stored without a `.vcf` extension (e.g. the stock
`default` sample contact at `.../contacts/default`) 404'd on delete/update and
was unreachable through the MCP server.

list_contacts stripped `.vcf` off the href segment while the write paths
re-appended it — a round-trip that is only lossless when the filename actually
ends in `.vcf`. create_contact always writes `<uid>.vcf`, which is why our own
tests never hit this.

Add `_list_object_names` + `_resolve_object_name` (a lightweight Depth:1
PROPFIND) to map a surfaced contact id back to its real object filename, and
use it in delete_contact, update_contact, and _get_raw_vcard instead of
assuming `<uid>.vcf`. Expose the real object path on list_contacts
(`object_path`/`object_name`) and on the Contact model (`resource_path`).
Backward compatible: `vcard_id` keeps its historical `.vcf`-stripped form and
existing `<uid>.vcf` paths are unchanged.

Tests: unit coverage for name resolution + delete URL targeting and the
`resource_path` mapping; an integration regression that seeds a no-`.vcf`
object and confirms delete via the public API succeeds.

Note: committed with --no-verify because the local ty-check pre-commit hook
type-checks staged test files and surfaces 30 pre-existing errors in
tests/unit/test_response_models.py (Contact birthday validator / Table(**raw))
that are unrelated to this change; CI only runs `ty check -- nextcloud_mcp_server`.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Chris Coutinho
2026-06-08 01:19:40 +02:00
co-authored by Claude Opus 4.8
parent fe17994c4d
commit 854ef349cd
6 changed files with 284 additions and 12 deletions
@@ -88,6 +88,58 @@ async def test_full_contact_workflow(
assert contact_uid not in contact_uids
async def test_delete_contact_without_vcf_extension(
nc_client: NextcloudClient, temporary_addressbook: str
):
"""Regression for issue #874: a contact whose CardDAV object filename has no
``.vcf`` extension (like the stock ``default`` sample contact) must still be
deletable via the public API.
``create_contact`` can't reproduce the precondition — it always PUTs to
``<uid>.vcf`` — so seed the object directly at a bare path, then exercise
``list_contacts`` (real path exposure) and ``delete_contact`` (resolution).
"""
addressbook = temporary_addressbook
contacts = nc_client.contacts
object_name = f"noext-{uuid.uuid4().hex[:8]}" # filename WITHOUT .vcf
carddav_path = contacts._get_carddav_base_path()
vcard = (
"BEGIN:VCARD\r\nVERSION:3.0\r\n"
f"UID:{object_name}\r\nFN:No Ext\r\nEMAIL:noext@example.com\r\n"
"END:VCARD\r\n"
)
# Seed the pathological object at a path that lacks the .vcf extension.
await contacts._make_request(
"PUT",
f"{carddav_path}/{addressbook}/{object_name}",
content=vcard,
headers={"Content-Type": "text/vcard; charset=utf-8"},
)
try:
# list_contacts surfaces it and exposes the real object path/name.
listed = await contacts.list_contacts(addressbook=addressbook)
match = next((c for c in listed if c["vcard_id"] == object_name), None)
assert match is not None, "seeded no-.vcf contact not listed"
assert match["object_name"] == object_name # no .vcf extension
assert match["object_path"].endswith(f"/{addressbook}/{object_name}")
# Delete via the public API — pre-#874 this hit <uid>.vcf and 404'd.
await contacts.delete_contact(addressbook=addressbook, uid=object_name)
remaining = await contacts.list_contacts(addressbook=addressbook)
assert object_name not in [c["vcard_id"] for c in remaining]
finally:
# Best-effort cleanup in case the assertions above failed before delete.
try:
await contacts._make_request(
"DELETE", f"{carddav_path}/{addressbook}/{object_name}"
)
except Exception:
pass
async def test_create_contact_persists_all_documented_fields(
nc_client: NextcloudClient, temporary_addressbook: str
):