feat: add webhook management UI and BeforeNodeDeletedEvent support
Added comprehensive webhook management capabilities including: Webhook Client & API: - Added WebhooksClient for Nextcloud webhooks API integration - Create, list, update, and delete webhooks programmatically - Support for event filters in webhook registration Webhook Presets: - Added preset system for common webhook configurations - notes_sync: BeforeNodeDeletedEvent for Notes file operations - calendar_sync: Calendar events (create, update, delete) - deck_sync: Deck card operations - files_sync: File system changes - forms_sync: Form submissions (conditional) - Filter presets by installed apps Admin UI: - Added multi-pane app view with tabs (User Info, Vector Sync, Webhooks) - Webhooks tab for admin users only - Enable/disable preset webhooks via UI - View currently registered webhooks - Uses htmx for dynamic loading and Alpine.js for tab state - Admin permission checking via OCS API CLI Improvements: - Refactored CLI to separate module (cli.py) - Updated entry point in pyproject.toml BeforeNodeDeletedEvent Fix: - Updated ADR-010 to document NodeDeletedEvent issue - BeforeNodeDeletedEvent includes node.id before deletion - NodeDeletedEvent lacks node.id (file already deleted) - Implemented per Nextcloud maintainer recommendation Testing: - Added comprehensive webhook client tests - Added webhook preset filtering tests - Added admin permission tests Configuration: - Updated docker-compose.yml Qdrant settings 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
Chris Coutinho
@@ -0,0 +1,112 @@
|
||||
"""Unit tests for permission checking."""
|
||||
|
||||
import pytest
|
||||
from httpx import AsyncClient
|
||||
|
||||
from nextcloud_mcp_server.auth.permissions import is_nextcloud_admin
|
||||
from nextcloud_mcp_server.client.users import UsersClient
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_request(mocker):
|
||||
"""Create a mock Starlette request."""
|
||||
request = mocker.Mock()
|
||||
request.user = mocker.Mock()
|
||||
request.user.display_name = "testuser"
|
||||
return request
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def mock_http_client(mocker):
|
||||
"""Create a mock HTTP client."""
|
||||
return mocker.AsyncMock(spec=AsyncClient)
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_is_nextcloud_admin_true(mock_request, mock_http_client, mocker):
|
||||
"""Test checking if user is admin (admin group membership)."""
|
||||
# Mock the get_user_groups method to return admin group
|
||||
mock_get_user_groups = mocker.patch.object(
|
||||
UsersClient, "get_user_groups", return_value=["admin", "users"]
|
||||
)
|
||||
|
||||
is_admin = await is_nextcloud_admin(mock_request, mock_http_client)
|
||||
|
||||
assert is_admin is True
|
||||
mock_get_user_groups.assert_called_once_with("testuser")
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_is_nextcloud_admin_false(mock_request, mock_http_client, mocker):
|
||||
"""Test checking if user is not admin (no admin group membership)."""
|
||||
# Mock the get_user_groups method to return no admin group
|
||||
mock_get_user_groups = mocker.patch.object(
|
||||
UsersClient, "get_user_groups", return_value=["users", "editors"]
|
||||
)
|
||||
|
||||
is_admin = await is_nextcloud_admin(mock_request, mock_http_client)
|
||||
|
||||
assert is_admin is False
|
||||
mock_get_user_groups.assert_called_once_with("testuser")
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_is_nextcloud_admin_empty_groups(mock_request, mock_http_client, mocker):
|
||||
"""Test checking admin status when user has no groups."""
|
||||
# Mock the get_user_groups method to return empty list
|
||||
mock_get_user_groups = mocker.patch.object(
|
||||
UsersClient, "get_user_groups", return_value=[]
|
||||
)
|
||||
|
||||
is_admin = await is_nextcloud_admin(mock_request, mock_http_client)
|
||||
|
||||
assert is_admin is False
|
||||
mock_get_user_groups.assert_called_once_with("testuser")
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_is_nextcloud_admin_no_username(mock_request, mock_http_client, mocker):
|
||||
"""Test checking admin status when username is missing."""
|
||||
# Set username to None
|
||||
mock_request.user.display_name = None
|
||||
|
||||
mock_get_user_groups = mocker.patch.object(UsersClient, "get_user_groups")
|
||||
|
||||
is_admin = await is_nextcloud_admin(mock_request, mock_http_client)
|
||||
|
||||
assert is_admin is False
|
||||
# Ensure get_user_groups was not called
|
||||
mock_get_user_groups.assert_not_called()
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_is_nextcloud_admin_api_error(mock_request, mock_http_client, mocker):
|
||||
"""Test checking admin status when API call fails."""
|
||||
# Mock the get_user_groups method to raise an exception
|
||||
mock_get_user_groups = mocker.patch.object(
|
||||
UsersClient,
|
||||
"get_user_groups",
|
||||
side_effect=Exception("API error"),
|
||||
)
|
||||
|
||||
is_admin = await is_nextcloud_admin(mock_request, mock_http_client)
|
||||
|
||||
assert is_admin is False
|
||||
mock_get_user_groups.assert_called_once_with("testuser")
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_is_nextcloud_admin_case_sensitive(
|
||||
mock_request, mock_http_client, mocker
|
||||
):
|
||||
"""Test that admin group check is case-sensitive."""
|
||||
# Mock with "Admin" (capital A) instead of "admin"
|
||||
mock_get_user_groups = mocker.patch.object(
|
||||
UsersClient, "get_user_groups", return_value=["Admin", "users"]
|
||||
)
|
||||
|
||||
is_admin = await is_nextcloud_admin(mock_request, mock_http_client)
|
||||
|
||||
# Should be False because Nextcloud uses lowercase "admin"
|
||||
assert is_admin is False
|
||||
mock_get_user_groups.assert_called_once_with("testuser")
|
||||
@@ -0,0 +1,218 @@
|
||||
"""Unit tests for WebhooksClient."""
|
||||
|
||||
import pytest
|
||||
from httpx import AsyncClient
|
||||
|
||||
from nextcloud_mcp_server.client.webhooks import WebhooksClient
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def webhooks_client(mocker):
|
||||
"""Create a WebhooksClient with mocked HTTP client."""
|
||||
mock_http_client = mocker.AsyncMock(spec=AsyncClient)
|
||||
return WebhooksClient(mock_http_client, "testuser")
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_list_webhooks(webhooks_client, mocker):
|
||||
"""Test listing registered webhooks."""
|
||||
mock_response = mocker.Mock()
|
||||
mock_response.json.return_value = {
|
||||
"ocs": {
|
||||
"data": [
|
||||
{
|
||||
"id": 1,
|
||||
"uri": "http://example.com/webhook",
|
||||
"event": "OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
"httpMethod": "POST",
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"uri": "http://example.com/webhook",
|
||||
"event": "OCP\\Files\\Events\\Node\\NodeWrittenEvent",
|
||||
"httpMethod": "POST",
|
||||
},
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
mock_make_request = mocker.patch.object(
|
||||
WebhooksClient, "_make_request", return_value=mock_response
|
||||
)
|
||||
|
||||
webhooks = await webhooks_client.list_webhooks()
|
||||
|
||||
assert len(webhooks) == 2
|
||||
assert webhooks[0]["id"] == 1
|
||||
assert webhooks[0]["event"] == "OCP\\Files\\Events\\Node\\NodeCreatedEvent"
|
||||
assert webhooks[1]["id"] == 2
|
||||
|
||||
mock_make_request.assert_called_once_with(
|
||||
"GET",
|
||||
"/ocs/v2.php/apps/webhook_listeners/api/v1/webhooks",
|
||||
headers={"OCS-APIRequest": "true", "Accept": "application/json"},
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_list_webhooks_empty(webhooks_client, mocker):
|
||||
"""Test listing webhooks when none are registered."""
|
||||
mock_response = mocker.Mock()
|
||||
mock_response.json.return_value = {"ocs": {"data": []}}
|
||||
|
||||
mocker.patch.object(WebhooksClient, "_make_request", return_value=mock_response)
|
||||
|
||||
webhooks = await webhooks_client.list_webhooks()
|
||||
|
||||
assert webhooks == []
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_create_webhook(webhooks_client, mocker):
|
||||
"""Test creating a webhook registration."""
|
||||
mock_response = mocker.Mock()
|
||||
mock_response.json.return_value = {
|
||||
"ocs": {
|
||||
"data": {
|
||||
"id": 123,
|
||||
"uri": "http://example.com/webhook",
|
||||
"event": "OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
"httpMethod": "POST",
|
||||
"authMethod": "none",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mock_make_request = mocker.patch.object(
|
||||
WebhooksClient, "_make_request", return_value=mock_response
|
||||
)
|
||||
|
||||
webhook_data = await webhooks_client.create_webhook(
|
||||
event="OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
uri="http://example.com/webhook",
|
||||
)
|
||||
|
||||
assert webhook_data["id"] == 123
|
||||
assert webhook_data["event"] == "OCP\\Files\\Events\\Node\\NodeCreatedEvent"
|
||||
|
||||
mock_make_request.assert_called_once()
|
||||
call_args = mock_make_request.call_args
|
||||
assert call_args[0][0] == "POST"
|
||||
assert call_args[0][1] == "/ocs/v2.php/apps/webhook_listeners/api/v1/webhooks"
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_create_webhook_with_filter(webhooks_client, mocker):
|
||||
"""Test creating a webhook with event filter."""
|
||||
mock_response = mocker.Mock()
|
||||
mock_response.json.return_value = {
|
||||
"ocs": {
|
||||
"data": {
|
||||
"id": 124,
|
||||
"uri": "http://example.com/webhook",
|
||||
"event": "OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
"eventFilter": {"user.uid": "bob"},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mock_make_request = mocker.patch.object(
|
||||
WebhooksClient, "_make_request", return_value=mock_response
|
||||
)
|
||||
|
||||
webhook_data = await webhooks_client.create_webhook(
|
||||
event="OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
uri="http://example.com/webhook",
|
||||
event_filter={"user.uid": "bob"},
|
||||
)
|
||||
|
||||
assert webhook_data["id"] == 124
|
||||
assert webhook_data["eventFilter"] == {"user.uid": "bob"}
|
||||
|
||||
mock_make_request.assert_called_once()
|
||||
call_args = mock_make_request.call_args
|
||||
assert call_args[1]["json"]["eventFilter"] == {"user.uid": "bob"}
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_create_webhook_with_auth_headers(webhooks_client, mocker):
|
||||
"""Test creating a webhook with authentication headers."""
|
||||
mock_response = mocker.Mock()
|
||||
mock_response.json.return_value = {
|
||||
"ocs": {
|
||||
"data": {
|
||||
"id": 125,
|
||||
"uri": "http://example.com/webhook",
|
||||
"event": "OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
"authMethod": "bearer",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mock_make_request = mocker.patch.object(
|
||||
WebhooksClient, "_make_request", return_value=mock_response
|
||||
)
|
||||
|
||||
webhook_data = await webhooks_client.create_webhook(
|
||||
event="OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
uri="http://example.com/webhook",
|
||||
auth_method="bearer",
|
||||
headers={"Authorization": "Bearer secret-token"},
|
||||
)
|
||||
|
||||
assert webhook_data["id"] == 125
|
||||
assert webhook_data["authMethod"] == "bearer"
|
||||
|
||||
mock_make_request.assert_called_once()
|
||||
call_args = mock_make_request.call_args
|
||||
assert call_args[1]["json"]["authMethod"] == "bearer"
|
||||
assert call_args[1]["json"]["headers"] == {"Authorization": "Bearer secret-token"}
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_delete_webhook(webhooks_client, mocker):
|
||||
"""Test deleting a webhook registration."""
|
||||
mock_response = mocker.Mock()
|
||||
|
||||
mock_make_request = mocker.patch.object(
|
||||
WebhooksClient, "_make_request", return_value=mock_response
|
||||
)
|
||||
|
||||
await webhooks_client.delete_webhook(webhook_id=123)
|
||||
|
||||
mock_make_request.assert_called_once_with(
|
||||
"DELETE",
|
||||
"/ocs/v2.php/apps/webhook_listeners/api/v1/webhooks/123",
|
||||
headers={"OCS-APIRequest": "true", "Accept": "application/json"},
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
async def test_get_webhook(webhooks_client, mocker):
|
||||
"""Test getting a specific webhook by ID."""
|
||||
mock_response = mocker.Mock()
|
||||
mock_response.json.return_value = {
|
||||
"ocs": {
|
||||
"data": {
|
||||
"id": 123,
|
||||
"uri": "http://example.com/webhook",
|
||||
"event": "OCP\\Files\\Events\\Node\\NodeCreatedEvent",
|
||||
"httpMethod": "POST",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mock_make_request = mocker.patch.object(
|
||||
WebhooksClient, "_make_request", return_value=mock_response
|
||||
)
|
||||
|
||||
webhook_data = await webhooks_client.get_webhook(webhook_id=123)
|
||||
|
||||
assert webhook_data["id"] == 123
|
||||
assert webhook_data["event"] == "OCP\\Files\\Events\\Node\\NodeCreatedEvent"
|
||||
|
||||
mock_make_request.assert_called_once_with(
|
||||
"GET",
|
||||
"/ocs/v2.php/apps/webhook_listeners/api/v1/webhooks/123",
|
||||
headers={"OCS-APIRequest": "true", "Accept": "application/json"},
|
||||
)
|
||||
+1
-1
@@ -5,7 +5,7 @@ import os
|
||||
import pytest
|
||||
from click.testing import CliRunner
|
||||
|
||||
from nextcloud_mcp_server.app import run
|
||||
from nextcloud_mcp_server.cli import run
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
"""Unit tests for webhook preset filtering."""
|
||||
|
||||
import pytest
|
||||
|
||||
from nextcloud_mcp_server.server.webhook_presets import (
|
||||
filter_presets_by_installed_apps,
|
||||
get_preset,
|
||||
list_presets,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_list_all_presets():
|
||||
"""Test listing all presets returns 5 presets."""
|
||||
presets = list_presets()
|
||||
assert len(presets) == 5
|
||||
preset_ids = [preset_id for preset_id, _ in presets]
|
||||
assert "notes_sync" in preset_ids
|
||||
assert "calendar_sync" in preset_ids
|
||||
assert "tables_sync" in preset_ids
|
||||
assert "forms_sync" in preset_ids
|
||||
assert "files_sync" in preset_ids
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_get_preset_existing():
|
||||
"""Test getting an existing preset."""
|
||||
preset = get_preset("notes_sync")
|
||||
assert preset is not None
|
||||
assert preset["name"] == "Notes Sync"
|
||||
assert preset["app"] == "notes"
|
||||
assert len(preset["events"]) == 3
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_get_preset_nonexistent():
|
||||
"""Test getting a nonexistent preset returns None."""
|
||||
preset = get_preset("nonexistent_sync")
|
||||
assert preset is None
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_filter_presets_all_apps_installed():
|
||||
"""Test filtering when all apps are installed."""
|
||||
installed_apps = ["notes", "calendar", "tables", "forms"]
|
||||
filtered = filter_presets_by_installed_apps(installed_apps)
|
||||
assert len(filtered) == 5 # All 5 presets (files is always included)
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "notes_sync" in preset_ids
|
||||
assert "calendar_sync" in preset_ids
|
||||
assert "tables_sync" in preset_ids
|
||||
assert "forms_sync" in preset_ids
|
||||
assert "files_sync" in preset_ids
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_filter_presets_subset_installed():
|
||||
"""Test filtering when only some apps are installed."""
|
||||
installed_apps = ["notes", "calendar"]
|
||||
filtered = filter_presets_by_installed_apps(installed_apps)
|
||||
assert len(filtered) == 3 # notes, calendar, files
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "notes_sync" in preset_ids
|
||||
assert "calendar_sync" in preset_ids
|
||||
assert "files_sync" in preset_ids
|
||||
assert "tables_sync" not in preset_ids
|
||||
assert "forms_sync" not in preset_ids
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_filter_presets_no_apps_installed():
|
||||
"""Test filtering when no optional apps are installed."""
|
||||
installed_apps = []
|
||||
filtered = filter_presets_by_installed_apps(installed_apps)
|
||||
assert len(filtered) == 1 # Only files
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "files_sync" in preset_ids
|
||||
assert "notes_sync" not in preset_ids
|
||||
assert "calendar_sync" not in preset_ids
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_filter_presets_files_always_included():
|
||||
"""Test that files preset is always included regardless of installed apps."""
|
||||
# Empty list
|
||||
filtered = filter_presets_by_installed_apps([])
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "files_sync" in preset_ids
|
||||
|
||||
# List with other apps but not explicitly "files"
|
||||
filtered = filter_presets_by_installed_apps(["notes", "calendar"])
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "files_sync" in preset_ids
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_filter_presets_forms_included_when_installed():
|
||||
"""Test that forms preset is included when Forms app is installed."""
|
||||
installed_apps = ["forms"]
|
||||
filtered = filter_presets_by_installed_apps(installed_apps)
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "forms_sync" in preset_ids
|
||||
assert len(filtered) == 2 # forms + files
|
||||
|
||||
|
||||
@pytest.mark.unit
|
||||
def test_filter_presets_forms_excluded_when_not_installed():
|
||||
"""Test that forms preset is excluded when Forms app is not installed."""
|
||||
installed_apps = ["notes", "calendar", "tables"]
|
||||
filtered = filter_presets_by_installed_apps(installed_apps)
|
||||
preset_ids = [preset_id for preset_id, _ in filtered]
|
||||
assert "forms_sync" not in preset_ids
|
||||
Reference in New Issue
Block a user