nextcloud-agent 2.3.7__tar.gz → 2.4.0__tar.gz

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextcloud-agent
-Version: 2.3.7
+Version: 2.4.0
 Summary: Nextcloud MCP Server for Agentic AI!
 Author-email: Repository Maintainers <maintainers@knuckles.team>
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: scion-sdk[mcp]<0.7.0,>=0.6.3
+Requires-Dist: scion-sdk[mcp]<0.9,>=0.8.0
 Requires-Dist: requests>=2.34.2
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: python-dateutil>=2.9.0.post0

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/nextcloud_agent/api/api_client_base.py

@@ -1,19 +1,19 @@
 import ipaddress
 import json
 import logging
-import os
 from collections.abc import Iterator
 from typing import Any, Protocol
 from urllib.parse import quote, urljoin, urlsplit
 
 import requests
+from scion_sdk.config import csv_values, setting
+from scion_sdk.storage import WebDavBackend
 from scion_sdk.tls.profile import ResolvedTLSProfile
 from scion_sdk.tls.resolve import resolve_tls_profile
 
 from nextcloud_agent.api.xml_security import (
     MAX_XML_BYTES,
     XmlSecurityError,
-    parse_untrusted_xml,
 )
 
 logger = logging.getLogger(__name__)
@@ -163,9 +163,26 @@ class BaseApiClient:
         )
         self.carddav_base = f"{self.base_url}/remote.php/dav/addressbooks/users/{quote(self.username, safe='')}"
         self.ocs_base = f"{self.base_url}/ocs/v2.php"
+        self._files_dav: WebDavBackend | None = None
+
+    @property
+    def files_dav(self) -> WebDavBackend:
+        """The SDK WebDAV backend on the files root (CONN-NEXTCLOUD-AGENT-R002)."""
+        if self._files_dav is None:
+            hosts = tuple(csv_values(setting("NEXTCLOUD_ALLOWED_PRIVATE_HOSTS", "")))
+            self._files_dav = WebDavBackend(
+                self.webdav_base,
+                username=self.username,
+                password=self.password,
+                tls=self.tls_profile,
+                allowed_private_hosts=hosts,
+            )
+        return self._files_dav
 
     def close(self) -> None:
         """Close transport state and erase any profile materialized for this client."""
+        if self._files_dav is not None:
+            self._files_dav.close()
         self._session.close()
         if self._owns_tls_profile:
             self.tls_profile.cleanup()
@@ -240,64 +257,6 @@ class BaseApiClient:
         finally:
             response.close()
 
-    def _parse_propfind_response(
-        self, xml_content: str | bytes | bytearray
-    ) -> list[dict]:
-        """Parse PROPFIND XML response into a list of file dictionaries."""
-        try:
-            root = parse_untrusted_xml(xml_content)
-        except XmlSecurityError:
-            return []
-
-        ns = {
-            "d": "DAV:",
-            "oc": "http://owncloud.org/ns",
-            "nc": "http://nextcloud.org/ns",
-        }
-
-        files = []
-        for response in root.findall("d:response", ns):
-            href = response.find("d:href", ns).text  # type: ignore[union-attr]
-            propstat = response.find("d:propstat", ns)
-            if propstat is None:
-                continue
-
-            prop = propstat.find("d:prop", ns)
-            if prop is None:
-                continue
-
-            file_data = {
-                "href": href,
-                "name": os.path.basename(href.rstrip("/")),  # type: ignore[union-attr]
-                "is_folder": href.endswith("/"),  # type: ignore[union-attr]
-                "last_modified": prop.findtext(
-                    "d:getlastmodified", default="", namespaces=ns
-                ),
-                "etag": prop.findtext("d:getetag", default="", namespaces=ns),
-                "content_type": prop.findtext(
-                    "d:getcontenttype", default="", namespaces=ns
-                ),
-                "content_length": prop.findtext(
-                    "d:getcontentlength", default="0", namespaces=ns
-                ),
-                "permissions": prop.findtext(
-                    "oc:permissions", default="", namespaces=ns
-                ),
-                "favorite": prop.findtext("oc:favorite", default="0", namespaces=ns),
-                "file_id": prop.findtext("oc:fileid", default="", namespaces=ns),
-            }
-
-            resourcetype = prop.find("d:resourcetype", ns)
-            if (
-                resourcetype is not None
-                and resourcetype.find("d:collection", ns) is not None
-            ):
-                file_data["is_folder"] = True
-
-            files.append(file_data)
-
-        return files
-
     def _get_absolute_url(self, href: str) -> str:
         """Convert a WebDAV href to a full URL."""
         absolute = urljoin(self.base_url + "/", href)

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/nextcloud_agent/api/api_client_files.py

@@ -1,51 +1,44 @@
-import os
+from scion_sdk.storage import AlreadyExistsError, DavEntry, NotFoundError
 
 from nextcloud_agent.api.api_client_base import BaseApiClient
 from nextcloud_agent.api.xml_security import parse_untrusted_xml
 
+_OC = "http://owncloud.org/ns"
+#: The Nextcloud properties a listing keeps beside the standard DAV fields.
+NC_PROPS = ((_OC, "permissions"), (_OC, "favorite"), (_OC, "fileid"))
+
+
+def _entry_dict(webdav_base: str, entry: DavEntry) -> dict:
+    """One SDK listing entry in the connector's listing shape."""
+    suffix = "/" if entry.is_collection else ""
+    href = f"{webdav_base.split('://', 1)[-1].split('/', 1)[-1]}/{entry.path}".rstrip(
+        "/"
+    )
+    return {
+        "href": f"/{href}{suffix}",
+        "name": entry.name,
+        "is_folder": entry.is_collection,
+        "last_modified": entry.last_modified or "",
+        "etag": f'"{entry.etag}"' if entry.etag else "",
+        "content_type": entry.content_type or "",
+        "content_length": str(entry.size),
+        "permissions": entry.props.get("permissions", ""),
+        "favorite": entry.props.get("favorite") or "0",
+        "file_id": entry.props.get("fileid", ""),
+    }
 
-class Api(BaseApiClient):
-    def list_contents(self, path: str = "") -> list[dict]:
-        """List files and folders in a directory using PROPFIND."""
-        url = self._get_full_url(path)
-
-        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">
-              <d:prop>
-                <d:getlastmodified/>
-                <d:getcontentlength/>
-                <d:getcontenttype/>
-                <oc:permissions/>
-                <d:resourcetype/>
-                <d:getetag/>
-                <oc:favorite/>
-                <oc:fileid/>
-              </d:prop>
-            </d:propfind>"""
-
-        response = self._session.request(
-            "PROPFIND",
-            url,
-            data=body,
-            headers={"Depth": "1", "Content-Type": "application/xml"},
-            stream=True,
-            timeout=(10, 30),
-        )
-
-        if response.status_code == 404:
-            response.close()
-            raise FileNotFoundError("Configured remote path was not found")
 
-        files = self._parse_propfind_response(self._read_xml_response(response))
-
-        filtered_files = []
-        for f in files:
-            if f["name"] and f["name"] != os.path.basename(path.strip("/")):
-                filtered_files.append(f)
-            elif not path.strip("/") and f["name"]:
-                filtered_files.append(f)
+class Api(BaseApiClient):
+    """File operations run through the SDK WebDAV backend (CONN-NEXTCLOUD-AGENT-R001)."""
 
-        return files
+    def list_contents(self, path: str = "") -> list[dict]:
+        """List files and folders in a directory (PROPFIND, depth 1)."""
+        self._get_full_url(path)  # the shared path guard
+        try:
+            entries = self.files_dav.propfind(path.strip("/"), 1, extra_props=NC_PROPS)
+        except NotFoundError:
+            raise FileNotFoundError("Configured remote path was not found") from None
+        return [_entry_dict(self.webdav_base, entry) for entry in entries]
 
     def list_files(self, path: str = "") -> list[dict]:
         """Alias for list_contents to support MCP server action."""
@@ -53,42 +46,34 @@ class Api(BaseApiClient):
 
     def read_file(self, path: str) -> bytes:
         """Download a file."""
-        url = self._get_full_url(path)
-        response = self._session.get(url)
-        response.raise_for_status()
-        return response.content
+        self._get_full_url(path)
+        try:
+            return self.files_dav.read_path(path.strip("/"))
+        except NotFoundError:
+            raise FileNotFoundError("Configured remote path was not found") from None
 
     def write_file(
         self, path: str, content: str | bytes, overwrite: bool = True
     ) -> bool:
-        """Upload a file."""
-        url = self._get_full_url(path)
-
+        """Upload a file, creating missing parent folders."""
+        self._get_full_url(path)
         if isinstance(content, str):
             content = content.encode("utf-8")
-
-        if not overwrite:
-            headers = {"If-None-Match": "*"}
-        else:
-            headers = {}
-
-        response = self._session.put(url, data=content, headers=headers)
-
-        if not overwrite and response.status_code == 412:
-            raise FileExistsError("Configured remote file already exists")
-
-        response.raise_for_status()
+        try:
+            self.files_dav.write_path(path.strip("/"), content, overwrite=overwrite)
+        except AlreadyExistsError:
+            raise FileExistsError("Configured remote file already exists") from None
         return True
 
     def create_directory(self, path: str) -> bool:
         """Create a directory (MKCOL)."""
-        url = self._get_full_url(path)
-        response = self._session.request("MKCOL", url)
-
-        if response.status_code == 405:
-            raise FileExistsError("Configured remote directory likely already exists")
-
-        response.raise_for_status()
+        self._get_full_url(path)
+        try:
+            self.files_dav.make_collection(path.strip("/"), exist_ok=False)
+        except AlreadyExistsError:
+            raise FileExistsError(
+                "Configured remote directory likely already exists"
+            ) from None
         return True
 
     def create_folder(self, path: str) -> bool:
@@ -97,30 +82,36 @@ class Api(BaseApiClient):
 
     def delete_resource(self, path: str) -> bool:
         """Delete a file or directory."""
-        url = self._get_full_url(path)
-        response = self._session.delete(url)
-        response.raise_for_status()
+        self._get_full_url(path)
+        try:
+            self.files_dav.delete_path(path.strip("/"))
+        except NotFoundError:
+            raise FileNotFoundError("Configured remote path was not found") from None
         return True
 
     def delete_item(self, path: str) -> bool:
         """Alias for delete_resource to support MCP server action."""
         return self.delete_resource(path)
 
+    def _transfer(self, move: bool, source: str, dest: str, overwrite: bool) -> bool:
+        self._get_full_url(source)
+        self._get_full_url(dest)
+        method = self.files_dav.move_path if move else self.files_dav.copy_path
+        try:
+            method(source.strip("/"), dest.strip("/"), overwrite=overwrite)
+        except AlreadyExistsError:
+            raise FileExistsError(
+                "Configured remote destination already exists"
+            ) from None
+        except NotFoundError:
+            raise FileNotFoundError("Configured remote path was not found") from None
+        return True
+
     def move_resource(
         self, source_path: str, dest_path: str, overwrite: bool = False
     ) -> bool:
         """Move a file or directory."""
-        source_url = self._get_full_url(source_path)
-        dest_url = self._get_full_url(dest_path)
-
-        headers = {"Destination": dest_url, "Overwrite": "T" if overwrite else "F"}
-        response = self._session.request("MOVE", source_url, headers=headers)
-
-        if response.status_code == 412:
-            raise FileExistsError("Configured remote destination already exists")
-
-        response.raise_for_status()
-        return True
+        return self._transfer(True, source_path, dest_path, overwrite)
 
     def move_item(
         self, source_path: str, dest_path: str, overwrite: bool = False
@@ -132,17 +123,7 @@ class Api(BaseApiClient):
         self, source_path: str, dest_path: str, overwrite: bool = False
     ) -> bool:
         """Copy a file or directory."""
-        source_url = self._get_full_url(source_path)
-        dest_url = self._get_full_url(dest_path)
-
-        headers = {"Destination": dest_url, "Overwrite": "T" if overwrite else "F"}
-        response = self._session.request("COPY", source_url, headers=headers)
-
-        if response.status_code == 412:
-            raise FileExistsError("Configured remote destination already exists")
-
-        response.raise_for_status()
-        return True
+        return self._transfer(False, source_path, dest_path, overwrite)
 
     def copy_item(
         self, source_path: str, dest_path: str, overwrite: bool = False

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/nextcloud_agent/ontology/certification.json

@@ -29,5 +29,5 @@
   "signer": "UNSIGNED-PREVIEW",
   "signing_public_key": "",
   "status": "source-validated",
-  "validated_at": "2026-10-30T22:45:59Z"
+  "validated_at": "2026-11-05T11:12:30Z"
 }

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/nextcloud_agent.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextcloud-agent
-Version: 2.3.7
+Version: 2.4.0
 Summary: Nextcloud MCP Server for Agentic AI!
 Author-email: Repository Maintainers <maintainers@knuckles.team>
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: scion-sdk[mcp]<0.7.0,>=0.6.3
+Requires-Dist: scion-sdk[mcp]<0.9,>=0.8.0
 Requires-Dist: requests>=2.34.2
 Requires-Dist: defusedxml>=0.7.1
 Requires-Dist: python-dateutil>=2.9.0.post0

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/nextcloud_agent.egg-info/SOURCES.txt

@@ -42,6 +42,7 @@ nextcloud_agent/skills/nextcloud-shares/WORKFLOW.md
 tests/conftest.py
 tests/test_api_client.py
 tests/test_auth.py
+tests/test_files_webdav.py
 tests/test_fleet_name.py
 tests/test_init.py
 tests/test_init_dynamics.py

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/nextcloud_agent.egg-info/requires.txt

@@ -1,4 +1,4 @@
-scion-sdk[mcp]<0.7.0,>=0.6.3
+scion-sdk[mcp]<0.9,>=0.8.0
 requests>=2.34.2
 defusedxml>=0.7.1
 python-dateutil>=2.9.0.post0

{nextcloud_agent-2.3.7 → nextcloud_agent-2.4.0}/pyproject.toml

@@ -4,12 +4,12 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "nextcloud-agent"
-version = "2.3.7"
+version = "2.4.0"
 description = "Nextcloud MCP Server for Agentic AI!"
 readme = "README.md"
 classifiers = [ "Development Status :: 3 - Alpha", "License :: OSI Approved :: MIT License", "Environment :: Console", "Operating System :: POSIX :: Linux", "Programming Language :: Python :: 3",]
 requires-python = ">=3.12"
-dependencies = [ "scion-sdk[mcp]>=0.6.3,<0.7.0", "requests>=2.34.2", "defusedxml>=0.7.1", "python-dateutil>=2.9.0.post0", "icalendar>=7.3.0", "vobject>=0.9.9",]
+dependencies = [ "scion-sdk[mcp]>=0.8.0,<0.9", "requests>=2.34.2", "defusedxml>=0.7.1", "python-dateutil>=2.9.0.post0", "icalendar>=7.3.0", "vobject>=0.9.9",]
 [[project.authors]]
 name = "Repository Maintainers"
 email = "maintainers@knuckles.team"

nextcloud_agent-2.4.0/tests/test_files_webdav.py

@@ -0,0 +1,145 @@
+"""CONN-NEXTCLOUD-AGENT: the file tools run through the SDK WebDAV backend."""
+
+from urllib.parse import unquote, urlsplit
+
+import httpx
+import pytest
+from scion_sdk.storage import WebDavBackend
+
+from nextcloud_agent.api_client import NextcloudAPI
+
+ROOT = "/remote.php/dav/files/svc"
+
+
+class _Dav:
+    """A minimal in-memory WebDAV double."""
+
+    def __init__(self):
+        self.files, self.cols, self.requests = {}, {""}, []
+
+    def _path(self, url):
+        return unquote(urlsplit(str(url)).path)[len(ROOT) :].strip("/")
+
+    def _resp(self, path):
+        href = f"{ROOT}/{path}".rstrip("/") + ("/" if path in self.cols else "")
+        if path in self.cols:
+            props = "<d:resourcetype><d:collection/></d:resourcetype>"
+        else:
+            props = f"<d:resourcetype/><d:getcontentlength>{len(self.files[path])}</d:getcontentlength>"
+        props += "<oc:permissions>RGDNVW</oc:permissions><oc:favorite>1</oc:favorite><oc:fileid>7</oc:fileid>"
+        return f"<d:response><d:href>{href}</d:href><d:propstat><d:prop>{props}</d:prop></d:propstat></d:response>"
+
+    def handle(self, request):
+        path, method = self._path(request.url), request.method
+        self.requests.append((method, path))
+        if method == "PROPFIND":
+            if path not in self.cols and path not in self.files:
+                return httpx.Response(404)
+            items = (
+                [path]
+                + sorted(
+                    p
+                    for p in (*self.files, *self.cols)
+                    if p and p.rsplit("/", 1)[0] == path and p != path
+                )
+                if path
+                else [path]
+                + sorted(p for p in (*self.files, *self.cols) if p and "/" not in p)
+            )
+            body = (
+                '<d:multistatus xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">'
+                + "".join(self._resp(p) for p in items)
+                + "</d:multistatus>"
+            )
+            return httpx.Response(207, content=body.encode())
+        if method == "MKCOL":
+            if path in self.cols:
+                return httpx.Response(405)
+            self.cols.add(path)
+            return httpx.Response(201)
+        if method == "PUT":
+            if request.headers.get("If-None-Match") == "*" and path in self.files:
+                return httpx.Response(412)
+            self.files[path] = request.read()
+            return httpx.Response(201)
+        if method == "GET":
+            return (
+                httpx.Response(200, content=self.files[path])
+                if path in self.files
+                else httpx.Response(404)
+            )
+        if method == "DELETE":
+            return (
+                httpx.Response(204)
+                if self.files.pop(path, None) is not None
+                else httpx.Response(404)
+            )
+        if method in ("COPY", "MOVE"):
+            target = self._path(request.headers["Destination"])
+            self.files[target] = self.files[path]
+            if method == "MOVE":
+                del self.files[path]
+            return httpx.Response(201)
+        return httpx.Response(405)
+
+
+def _client(dav):
+    client = NextcloudAPI(
+        base_url="https://cloud.example", username="svc", password="pw"
+    )
+    client._files_dav = WebDavBackend(
+        client.webdav_base,
+        username="svc",
+        password="pw",
+        transport=httpx.MockTransport(dav.handle),
+    )
+    return client
+
+
+@pytest.mark.spec("CONN-NEXTCLOUD-AGENT-R001")
+def test_file_methods_route_through_sdk_webdav_backend():
+    dav = _Dav()
+    client = _client(dav)
+    assert client.write_file("Docs/a.txt", "hello") is True
+    assert [m for m, _ in dav.requests][:2] == ["MKCOL", "PUT"]
+    with pytest.raises(FileExistsError):
+        client.write_file("Docs/a.txt", "again", overwrite=False)
+    assert client.read_file("Docs/a.txt") == b"hello"
+    listing = {e["name"]: e for e in client.list_files("Docs")}
+    entry = listing["a.txt"]
+    assert (
+        entry["permissions"] == "RGDNVW"
+        and entry["favorite"] == "1"
+        and entry["file_id"] == "7"
+    )
+    assert entry["is_folder"] is False and entry["content_length"] == "5"
+    client.copy_item("Docs/a.txt", "Docs/b.txt")
+    client.move_item("Docs/b.txt", "Docs/c.txt")
+    client.delete_item("Docs/c.txt")
+    assert set(dav.files) == {"Docs/a.txt"}
+    with pytest.raises(FileNotFoundError):
+        client.read_file("Docs/missing.txt")
+    with pytest.raises(ValueError):
+        client.read_file("../escape")
+
+
+@pytest.mark.spec("CONN-NEXTCLOUD-AGENT-R002")
+def test_backend_uses_files_root_and_private_host_setting(monkeypatch):
+    client = NextcloudAPI(
+        base_url="https://cloud.example", username="svc", password="pw"
+    )
+    assert client.webdav_base.endswith("/remote.php/dav/files/svc")
+    monkeypatch.delenv("NEXTCLOUD_ALLOWED_PRIVATE_HOSTS", raising=False)
+    private = NextcloudAPI(base_url="https://10.9.8.7", username="svc", password="pw")
+    with pytest.raises(httpx.TransportError, match="rejected"):
+        private.read_file("a.txt")
+    monkeypatch.setenv("NEXTCLOUD_ALLOWED_PRIVATE_HOSTS", "10.9.8.7")
+    allowed = NextcloudAPI(base_url="https://10.9.8.7", username="svc", password="pw")
+    assert allowed.files_dav is not None
+
+
+@pytest.mark.spec("CONN-NEXTCLOUD-AGENT-R003")
+def test_sdk_pin_carries_storage_backend():
+    from scion_sdk.storage import WebDavBackend as Backend
+
+    assert Backend.backend_type == "webdav"