From e4419b4a18d0762f46c85d6ec348813adaa3bcc8 Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Tue, 13 Oct 2026 20:37:56 +0200 Subject: [PATCH] second phase of the project management dashboard --- README.md | 36 +- config/settings.py | 49 ++ config/urls.py | 9 +- core/templates/core/base.html | 2 +- mcp_server/__init__.py | 0 mcp_server/server.py | 545 ++++++++++++++++++ package.json | 1 + projects/forms.py | 30 +- projects/migrations/0002_creationkey.py | 30 + projects/migrations/0003_oauthidentity.py | 29 + projects/models.py | 21 + projects/oidc.py | 44 ++ projects/services.py | 120 +++- projects/templates/projects/_board.html | 38 +- .../templates/projects/_project_list.html | 2 +- projects/templates/projects/board.html | 44 +- projects/templates/projects/card.html | 13 +- projects/templates/projects/form.html | 2 +- projects/templates/projects/list.html | 2 +- projects/templates/projects/login.html | 2 +- projects/templates/projects/profile.html | 18 +- projects/test_oauth_mcp.py | 90 +++ projects/test_oidc.py | 22 + projects/tests.py | 55 +- projects/urls.py | 6 + projects/views.py | 166 +++++- requirements.txt | 4 + 27 files changed, 1317 insertions(+), 63 deletions(-) create mode 100644 mcp_server/__init__.py create mode 100644 mcp_server/server.py create mode 100644 projects/migrations/0002_creationkey.py create mode 100644 projects/migrations/0003_oauthidentity.py create mode 100644 projects/oidc.py create mode 100644 projects/test_oauth_mcp.py create mode 100644 projects/test_oidc.py diff --git a/README.md b/README.md index 17a6303..a12f359 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,40 @@ -# Unified Dashboard · design showcase +# Common Ground dashboard and projects -A Django template based design foundation using demo data only. Django 6.1, Vite, SCSS, Bootstrap, Bootstrap Icons, Chart.js, and vanilla JavaScript. +Django dashboard with an authenticated project manager, Kanban boards, Markdown specifications, and a separate Streamable HTTP MCP server. The original Today, Health, Energy, Home, and Showcase page templates remain in place. -## Run locally +## Local setup ```sh -python3 -m venv .venv .venv/bin/python -m pip install -r requirements.txt +.venv/bin/python manage.py migrate +.venv/bin/python manage.py createsuperuser npm install npm run dev ``` -Open http://127.0.0.1:8765/. The dev command checks that Django port **8765** and Vite port **5174** are free before launching either server. Ports 8000 and 1234 are not used. +The dashboard runs at `http://127.0.0.1:8765/`. `npm run dev` uses the existing package scripts; `npm run dev:mcp` starts the MCP process at `http://127.0.0.1:8766/mcp`. If Node.js is unavailable, use `.venv/bin/uvicorn mcp_server.server:app --host 127.0.0.1 --port 8766`. Port 8766 is separate from TasksNest's MCP listener. -## Projects manager +`/projects/` contains active and archived projects. New projects seed editable To-do, In Progress, and Done columns. New cards use the board's selected default column and Medium priority. Cards store raw Markdown, a revision history, explicit blockers, comments, and activity. HTML output is sanitized. Git URLs are metadata; the server does not fetch or clone them. -Run `.venv/bin/python manage.py migrate` and create a local account with `.venv/bin/python manage.py createsuperuser`. All dashboard and project pages require sign-in. Projects can be created at `/projects/`; each gets an editable To-do, In Progress, Done board. New cards enter its selected default column with Medium priority. Cards store full Markdown and revision history. The project URL is metadata and is never fetched by the server. +## OAuth and MCP -Configuration: `DJANGO_SECRET_KEY` must be set for deployment; `DJANGO_DEBUG=0` enables secure session and CSRF cookies; `DJANGO_ALLOWED_HOSTS` is a comma-separated host list. Serve the site behind HTTPS in production. +The Django server hosts OAuth authorization, token, revocation, and discovery endpoints under `/o/` and `/.well-known/oauth-authorization-server`. The MCP process hosts `/mcp` and `/.well-known/oauth-protected-resource/mcp`. The server registers 51 tools; reads require `projects:read`, and writes require `projects:write`. OAuth authorization codes require PKCE. Tokens expire after one hour, can be revoked from Profile, and are stored hashed by django-oauth-toolkit. -The MCP server is a later integration. Reserve **8766** for its separate listener so it does not collide with TasksNest. Do not point an MCP client at the Django page server: OAuth discovery, token issuance, and MCP transport are not yet implemented here. The reference TasksNest implementation is in `/home/jorenmartijn/django/main/mcp_server` and uses Streamable HTTP with a separate OAuth-enabled Django API. +Authenticated dynamic client registration is enabled at `/o/register/`. A signed-in user can register a client; session requests also need a CSRF token. Anonymous registration is denied. You can also create a public authorization-code client in Django admin, setting its exact HTTPS redirect URI and the needed scopes. Profile shows active grants and revocation controls. -For a compiled frontend, run `npm run build`; Django then serves the compiled assets via its static file finder. The templates use Vite when its dev server is running, the build manifest when available, and checked-in preview assets otherwise. A Node.js 20.19+ installation is needed for Vite 7. This workspace had no system Node.js; the build was verified with a temporary Node.js binary. +Local accounts work by default. To enable separate OIDC sign-in to the dashboard, set `OIDC_OP_ISSUER`, `OIDC_OP_AUTHORIZATION_ENDPOINT`, `OIDC_OP_TOKEN_ENDPOINT`, `OIDC_OP_USER_ENDPOINT`, `OIDC_OP_JWKS_ENDPOINT`, `OIDC_RP_CLIENT_ID`, and `OIDC_RP_CLIENT_SECRET`. Register `/oidc/callback/` at the provider. OIDC identities are linked by verified issuer and subject; a matching email does not link an existing local account. The actual provider callback still needs an integration test with your provider configuration. + +Set `MCP_PUBLIC_URL` and `OAUTH_ISSUER_URL` to the public HTTPS MCP endpoint and Django origin. Route `/mcp` and `/.well-known/oauth-protected-resource/mcp` to port 8766, and OAuth routes to the Django process. Preserve the Authorization header. The MCP process and Django must use the same database and `DJANGO_SECRET_KEY`. + +## Deployment settings + +Set `DJANGO_DEBUG=0`, a strong `DJANGO_SECRET_KEY`, `DJANGO_ALLOWED_HOSTS`, `MCP_PUBLIC_URL`, and `OAUTH_ISSUER_URL`. `DJANGO_CSRF_TRUSTED_ORIGINS` accepts a comma-separated origin list if needed behind a proxy. Production mode requires HTTPS URLs and enables secure cookies, SSL redirect, and HSTS. The local sign-in throttle uses Django's process-local cache; use a shared cache when running multiple workers. + +Run checks and tests with: + +```sh +.venv/bin/python manage.py check +.venv/bin/python manage.py test projects +``` + +For compiled frontend assets, run `npm run build`. Django uses Vite in development, the build manifest when present, and checked-in preview assets otherwise. diff --git a/config/settings.py b/config/settings.py index cbfea31..88f50e1 100644 --- a/config/settings.py +++ b/config/settings.py @@ -1,9 +1,12 @@ import os from pathlib import Path +from django.core.exceptions import ImproperlyConfigured BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'django-insecure-local-development-only') DEBUG = os.environ.get('DJANGO_DEBUG', '1') == '1' +if not DEBUG and (SECRET_KEY.startswith('django-insecure-') or len(SECRET_KEY) < 50): + raise ImproperlyConfigured('Set a strong DJANGO_SECRET_KEY when DJANGO_DEBUG=0.') ALLOWED_HOSTS = os.environ.get('DJANGO_ALLOWED_HOSTS', 'localhost,127.0.0.1').split(',') INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.sessions', 'django.contrib.messages', @@ -11,6 +14,7 @@ INSTALLED_APPS = [ "django.contrib.staticfiles", "core", 'projects', + 'oauth2_provider', ] MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", @@ -19,6 +23,7 @@ MIDDLEWARE = [ 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] ROOT_URLCONF = "config.urls" TEMPLATES = [{ @@ -39,3 +44,47 @@ LOGOUT_REDIRECT_URL = 'login' CSRF_COOKIE_SECURE = not DEBUG SESSION_COOKIE_SECURE = not DEBUG SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') +SECURE_SSL_REDIRECT = not DEBUG +SECURE_HSTS_SECONDS = 31536000 if not DEBUG else 0 +CSRF_TRUSTED_ORIGINS = [item for item in os.environ.get('DJANGO_CSRF_TRUSTED_ORIGINS', '').split(',') if item] +MCP_PUBLIC_URL = os.environ.get('MCP_PUBLIC_URL', 'http://127.0.0.1:8766/mcp') +OAUTH_ISSUER_URL = os.environ.get('OAUTH_ISSUER_URL', 'http://127.0.0.1:8765/') +if not DEBUG and (not MCP_PUBLIC_URL.startswith('https://') or not OAUTH_ISSUER_URL.startswith('https://')): + raise ImproperlyConfigured('MCP_PUBLIC_URL and OAUTH_ISSUER_URL must use HTTPS in production.') +OAUTH2_PROVIDER = { + 'SCOPES': {'projects:read': 'Read projects and cards', 'projects:write': 'Create and edit projects and cards'}, + 'DEFAULT_SCOPES': ['projects:read'], + 'ALLOWED_REDIRECT_URI_SCHEMES': ['http', 'https'] if DEBUG else ['https'], + 'PKCE_REQUIRED': True, + 'COMPLIANT_BCP_RFC9700_PKCE_METHOD': True, + 'COMPLIANT_BCP_RFC9700_ACCESS_TOKEN_TRANSPORT': True, + 'COMPLIANT_BCP_RFC9700_TOKEN_STORAGE': True, + 'ACCESS_TOKEN_EXPIRE_SECONDS': 3600, + 'REFRESH_TOKEN_REUSE_PROTECTION': True, + 'DCR_ENABLED': True, + 'DCR_REGISTRATION_PERMISSION_CLASSES': ['oauth2_provider.dcr.IsAuthenticatedDCRPermission'], + 'COMPLIANT_BCP_RFC9700_IMPLICIT_GRANT': True, + 'COMPLIANT_BCP_RFC9700_PASSWORD_GRANT': True, + 'COMPLIANT_BCP_RFC9700_AUTHZ_RESPONSE_ISS': True, +} +OIDC_KEYS = ('OIDC_OP_ISSUER', 'OIDC_OP_AUTHORIZATION_ENDPOINT', 'OIDC_OP_TOKEN_ENDPOINT', + 'OIDC_OP_USER_ENDPOINT', 'OIDC_OP_JWKS_ENDPOINT', 'OIDC_RP_CLIENT_ID', 'OIDC_RP_CLIENT_SECRET') +OIDC_ENABLED = all(os.environ.get(key) for key in OIDC_KEYS) +if any(os.environ.get(key) for key in OIDC_KEYS) and not OIDC_ENABLED: + raise ImproperlyConfigured('Set every OIDC provider variable, or leave all of them unset.') +if OIDC_ENABLED: + if not DEBUG and any(not os.environ[key].startswith('https://') for key in OIDC_KEYS[:5]): + raise ImproperlyConfigured('OIDC provider URLs must use HTTPS in production.') + INSTALLED_APPS.append('mozilla_django_oidc') + AUTHENTICATION_BACKENDS = ['django.contrib.auth.backends.ModelBackend', 'projects.oidc.IdentityBackend'] + OIDC_OP_ISSUER = os.environ['OIDC_OP_ISSUER'] + OIDC_OP_AUTHORIZATION_ENDPOINT = os.environ['OIDC_OP_AUTHORIZATION_ENDPOINT'] + OIDC_OP_TOKEN_ENDPOINT = os.environ['OIDC_OP_TOKEN_ENDPOINT'] + OIDC_OP_USER_ENDPOINT = os.environ['OIDC_OP_USER_ENDPOINT'] + OIDC_OP_JWKS_ENDPOINT = os.environ['OIDC_OP_JWKS_ENDPOINT'] + OIDC_RP_CLIENT_ID = os.environ['OIDC_RP_CLIENT_ID'] + OIDC_RP_CLIENT_SECRET = os.environ['OIDC_RP_CLIENT_SECRET'] + OIDC_RP_SIGN_ALGO = 'RS256' + OIDC_RP_SCOPES = 'openid email profile' + OIDC_STORE_ACCESS_TOKEN = False + OIDC_STORE_ID_TOKEN = False diff --git a/config/urls.py b/config/urls.py index 94319a4..1bb07e6 100644 --- a/config/urls.py +++ b/config/urls.py @@ -1,11 +1,16 @@ from django.urls import path, include from django.contrib.auth import views as auth_views from django.contrib import admin +from django.conf import settings +from oauth2_provider.urls import metadata_urlpatterns from core import views +from projects import views as project_views urlpatterns = [ + *metadata_urlpatterns, + path('o/', include('oauth2_provider.urls', namespace='oauth2_provider')), path('admin/', admin.site.urls), - path('accounts/login/', auth_views.LoginView.as_view(template_name='projects/login.html'), name='login'), + path('accounts/login/', project_views.ThrottledLoginView.as_view(), name='login'), path('accounts/logout/', auth_views.LogoutView.as_view(), name='logout'), path('accounts/password/change/', auth_views.PasswordChangeView.as_view(template_name='projects/form.html', success_url='/projects/profile/'), name='password_change'), path('projects/', include('projects.urls')), @@ -15,3 +20,5 @@ urlpatterns = [ path("home/", views.home, name="home"), path("showcase/", views.showcase, name="showcase"), ] +if settings.OIDC_ENABLED: + urlpatterns.insert(0, path('oidc/', include('mozilla_django_oidc.urls'))) diff --git a/core/templates/core/base.html b/core/templates/core/base.html index 8b491ad..4e33023 100644 --- a/core/templates/core/base.html +++ b/core/templates/core/base.html @@ -5,7 +5,7 @@ {{ title }} · Common Ground - + diff --git a/mcp_server/__init__.py b/mcp_server/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/mcp_server/server.py b/mcp_server/server.py new file mode 100644 index 0000000..daab669 --- /dev/null +++ b/mcp_server/server.py @@ -0,0 +1,545 @@ +"""Streamable HTTP MCP server for project management. Run on port 8766.""" +import os +from datetime import date +from typing import Any, Literal +from urllib.parse import urlsplit +from uuid import UUID + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') +import django +django.setup() + +from asgiref.sync import sync_to_async +from django.conf import settings +from django.contrib.auth import get_user_model +from django.core.exceptions import PermissionDenied, ValidationError +from django.db.models import Q +from django.db import transaction +from django.http import Http404 +from django.test.client import RequestFactory +from oauth2_provider.oauth2_backends import OAuthLibCore +from mcp.server.auth.middleware.auth_context import get_access_token +from mcp.server.auth.provider import AccessToken, TokenVerifier +from mcp.server.auth.routes import create_protected_resource_routes +from mcp.server.auth.settings import AuthSettings +from mcp.server.mcpserver import MCPServer +from mcp.server.mcpserver.exceptions import ToolError +from mcp.server.transport_security import TransportSecuritySettings +from pydantic import AnyHttpUrl + +from projects import services +from projects.models import Activity, Card, CardComment, CardRevision, Column, Project, Tag + + +def _verified(raw): + resource = urlsplit(settings.MCP_PUBLIC_URL) + request = RequestFactory().get(resource.path, HTTP_HOST=resource.netloc, + HTTP_AUTHORIZATION=f'Bearer {raw}', secure=resource.scheme == 'https') + valid, result = OAuthLibCore().verify_request(request, scopes=[]) + if not valid or not getattr(result, 'user', None): + return None + return {'user_id': result.user.pk, 'scopes': list(result.scopes), 'expires_at': getattr(result, 'expires_at', None)} + + +class OAuthTokenVerifier(TokenVerifier): + async def verify_token(self, token: str) -> AccessToken | None: + if len(token) > 512: + return None + info = await sync_to_async(_verified)(token) + if not info: + return None + return AccessToken(token=token, client_id='dashboard', scopes=info['scopes'], subject=str(info['user_id'])) + + +def _actor(scope='projects:read'): + access = get_access_token() + if access is None or scope not in access.scopes: + raise ToolError(f'permission_denied: {scope} authorization required') + return get_user_model().objects.get(pk=access.subject) + + +def _project(user, value, write=False): + try: + identifier = UUID(value) + except (ValueError, TypeError): + matches = list(services.accessible(user).filter(name__iexact=value)[:3]) + if len(matches) != 1: + raise ToolError(f'ambiguous_project: supply a project UUID; candidates: {[str(p.pk) for p in matches]}') + identifier = matches[0].pk + return services.project_for(user, identifier, write=write) + + +def _card(user, value, write=False): + return services.card_for(user, UUID(value), write=write) + + +def _project_data(project): + cards = Card.objects.filter(project=project, archived=False) + return {'id': str(project.pk), 'name': project.name, 'slug': project.slug, 'description': project.description, + 'git_repository_url': project.git_repository_url or None, 'archived': project.archived, + 'card_count': cards.count(), 'done_count': cards.filter(column__is_done=True).count()} + + +def _card_data(card): + return {'id': str(card.pk), 'project_id': str(card.project_id), 'column_id': str(card.column_id), 'title': card.title, + 'markdown': card.description_markdown, 'priority': card.priority, 'card_type': card.card_type, + 'revision': card.revision, 'position': card.position, 'is_blocked': card.is_blocked, + 'blocked_reason': card.blocked_reason, 'archived': card.archived, + 'assignee_id': card.assignee_id, + 'tags': [{'id': tag.pk, 'name': tag.name} for tag in card.tags.all()], + 'due_date': card.due_date.isoformat() if card.due_date else None, + 'completed_at': card.completed_at.isoformat() if card.completed_at else None, + 'created_at': card.created_at.isoformat(), 'updated_at': card.updated_at.isoformat(), + 'url': f'{settings.OAUTH_ISSUER_URL.rstrip("/")}/projects/cards/{card.pk}/'} + + +def _column_data(column): + return {'id': str(column.pk), 'name': column.name, 'position': column.position, + 'color': column.color, 'is_default': column.is_default, 'is_done': column.is_done} + + +def _safe(operation): + try: + return operation() + except (Http404, Project.DoesNotExist, Card.DoesNotExist, Column.DoesNotExist, CardRevision.DoesNotExist, Tag.DoesNotExist, get_user_model().DoesNotExist): + raise ToolError('not_found: project or card is unavailable') + except PermissionDenied: + raise ToolError('permission_denied: write access required') + except ValidationError as exc: + raise ToolError(f'invalid_input: {exc}') + except services.RevisionConflict as exc: + raise ToolError(f'revision_conflict: current revision is {exc.current}') + except ValueError as exc: + raise ToolError(f'invalid_input: {exc}') + + +def create_server(): + server = MCPServer('Common Ground Projects', description='Projects, Kanban cards, and Markdown specifications.', + token_verifier=OAuthTokenVerifier(), auth=AuthSettings( + issuer_url=AnyHttpUrl(settings.OAUTH_ISSUER_URL), + resource_server_url=AnyHttpUrl(settings.MCP_PUBLIC_URL), required_scopes=[], validate_token_resource=False)) + + @server.tool(structured_output=True, description='List projects accessible to the connected user, with counts and repository metadata.') + async def projects_list(limit: int = 50, offset: int = 0) -> dict[str, Any]: + def run(): + user = _actor() + qs = services.accessible(user).filter(archived=False).order_by('name') + return {'items': [_project_data(p) for p in qs[offset:offset + min(max(limit, 1), 100)]], 'total': qs.count()} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Get a project, its default column, counts, and Git repository URL. The URL is metadata only.') + async def projects_get(project: str) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + return {**_project_data(p), 'default_column_id': str(p.board.columns.get(is_default=True, archived=False).pk)} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Update project name, description, or HTTPS Git repository metadata.') + async def projects_update(project: str, name: str | None = None, description: str | None = None, git_repository_url: str | None = None) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + p = _project(user, project, write=True) + if name is not None: p.name = name + if description is not None: p.description = description + if git_repository_url is not None: p.git_repository_url = git_repository_url + p.full_clean() + if p.git_repository_url and not p.git_repository_url.startswith('https://'): + raise ValidationError('Use an HTTPS repository URL.') + p.save() + Activity.objects.create(project=p, actor=user, action='project.updated', origin='mcp') + return _project_data(p) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Archive a project without deleting its board or cards.') + async def projects_archive(project: str) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + p = _project(user, project, write=True) + p.archived = True; p.save(update_fields=['archived']) + Activity.objects.create(project=p, actor=user, action='project.archived', origin='mcp') + return _project_data(p) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Get project progress and workload by priority with repository metadata.') + async def projects_summary(project: str) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + cards = Card.objects.filter(project=p, archived=False) + return {**_project_data(p), 'by_priority': {priority: cards.filter(priority=priority).count() for priority in ('high', 'medium', 'low')}, 'blocked_count': cards.filter(is_blocked=True).count()} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Search accessible project names and descriptions.') + async def projects_search(query: str, limit: int = 50) -> dict[str, Any]: + def run(): + qs = services.accessible(_actor()).filter(Q(name__icontains=query) | Q(description__icontains=query), archived=False)[:min(max(limit, 1), 100)] + return {'items': [_project_data(p) for p in qs]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Create a project and seed editable To-do, In Progress, and Done columns.') + async def projects_create(name: str, description: str = '', git_repository_url: str = '') -> dict[str, Any]: + return await sync_to_async(lambda: _safe(lambda: _project_data(services.create_project(_actor('projects:write'), name=name, description=description, git_repository_url=git_repository_url))))() + + @server.tool(structured_output=True, description='List active columns for a project, including default and completion flags.') + async def columns_list(project: str) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + return {'items': [_column_data(c) for c in p.board.columns.filter(archived=False)]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Get a project board with its columns and card summaries.') + async def boards_get(project: str) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + return {'project': _project_data(p), 'columns': [{**_column_data(c), 'cards': [_card_data(card) for card in c.cards.filter(archived=False)[:100]]} for c in p.board.columns.filter(archived=False)]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Create an editable Kanban column in a project.') + async def columns_create(project: str, name: str, color: str = '#315d4d', is_done: bool = False) -> dict[str, Any]: + def run(): + p = _project(_actor('projects:write'), project, write=True) + column = Column(board=p.board, name=name, color=color, is_done=is_done, position=p.board.columns.count()) + column.full_clean(); column.save() + return _column_data(column) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Rename or recolor a column, or change its completed state.') + async def columns_update(column_id: str, name: str | None = None, color: str | None = None, is_done: bool | None = None) -> dict[str, Any]: + def run(): + column = Column.objects.get(pk=UUID(column_id)) + return _column_data(services.update_column(_actor('projects:write'), column, name=name, color=color, is_done=is_done, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Choose the one default destination column for new cards.') + async def columns_set_default(column_id: str) -> dict[str, Any]: + def run(): + column = Column.objects.get(pk=UUID(column_id)) + return _column_data(services.set_default(_actor('projects:write'), column)) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Reorder active columns by supplying every column UUID exactly once.') + async def columns_reorder(project: str, column_ids: list[str]) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); p = _project(user, project, write=True) + services.reorder_columns(user, p, column_ids) + return {'items': [_column_data(c) for c in p.board.columns.filter(archived=False)]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Archive an empty, non-default column.') + async def columns_archive(column_id: str) -> dict[str, Any]: + def run(): + column = Column.objects.get(pk=UUID(column_id)) + services.archive_column(_actor('projects:write'), column) + return {'id': str(column.pk), 'archived': True} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Create a card in the project default column with Medium priority unless specified.') + async def cards_create(project: str, title: str, markdown: str = '', priority: Literal['low', 'medium', 'high'] = 'medium', card_type: Literal['feature', 'bug', 'task', 'research', 'idea'] = 'task', column_id: str | None = None, idempotency_key: str | None = None) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + p = _project(user, project, write=True) + column = Column.objects.get(pk=UUID(column_id)) if column_id else None + return _card_data(services.create_card(user, p, title=title, markdown=markdown, priority=priority, card_type=card_type, column=column, origin='mcp', idempotency_key=idempotency_key)) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Create a Markdown specification card; the configured default column and Medium priority are used if omitted.') + async def specs_create(project: str, title: str, markdown: str, priority: Literal['low', 'medium', 'high'] = 'medium', column_id: str | None = None, idempotency_key: str | None = None) -> dict[str, Any]: + return await cards_create(project, title, markdown, priority, 'feature', column_id, idempotency_key) + + @server.tool(structured_output=True, description='Get full card details including exact raw Markdown and revision.') + async def cards_get(card_id: str) -> dict[str, Any]: + return await sync_to_async(lambda: _safe(lambda: _card_data(_card(_actor(), card_id))))() + + @server.tool(structured_output=True, description='Update card fields; supply the expected revision to prevent lost edits.') + async def cards_update(card_id: str, expected_revision: int, title: str | None = None, markdown: str | None = None, priority: Literal['low', 'medium', 'high'] | None = None, card_type: Literal['feature', 'bug', 'task', 'research', 'idea'] | None = None, due_date: str | None = None, is_blocked: bool | None = None, blocked_reason: str | None = None) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + card = _card(user, card_id, write=True) + values = {'title': title, 'description_markdown': markdown, 'priority': priority, 'card_type': card_type, 'is_blocked': is_blocked, 'blocked_reason': blocked_reason} + values = {key: value for key, value in values.items() if value is not None} + if due_date is not None: + values['due_date'] = date.fromisoformat(due_date) if due_date else None + return _card_data(services.update_card(user, card, expected_revision=expected_revision, origin='mcp', **values)) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List cards in an accessible project; filter by priority, column, or archived state.') + async def cards_list(project: str, priority: Literal['low', 'medium', 'high'] | None = None, card_type: Literal['feature', 'bug', 'task', 'research', 'idea'] | None = None, column_id: str | None = None, tag_id: int | None = None, assignee_id: int | None = None, archived: bool = False, limit: int = 50, offset: int = 0) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + qs = Card.objects.filter(project=p, archived=archived) + if priority: qs = qs.filter(priority=priority) + if card_type: qs = qs.filter(card_type=card_type) + if column_id: qs = qs.filter(column_id=UUID(column_id)) + if tag_id: qs = qs.filter(tags__pk=tag_id) + if assignee_id: qs = qs.filter(assignee_id=assignee_id) + return {'items': [_card_data(c) for c in qs[offset:offset + min(max(limit, 1), 100)]], 'total': qs.count()} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Search card titles and full Markdown within an accessible project.') + async def cards_search(project: str, query: str, priority: Literal['low', 'medium', 'high'] | None = None, limit: int = 50) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + qs = Card.objects.filter(project=p, archived=False).filter(Q(title__icontains=query) | Q(description_markdown__icontains=query)) + if priority: qs = qs.filter(priority=priority) + return {'items': [_card_data(c) for c in qs[:min(max(limit, 1), 100)]]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Archive a card without permanently deleting its content or history.') + async def cards_archive(card_id: str, expected_revision: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + return _card_data(services.update_card(user, card, expected_revision=expected_revision, archived=True, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Restore an archived card to its existing column.') + async def cards_restore(card_id: str, expected_revision: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + return _card_data(services.update_card(user, card, expected_revision=expected_revision, archived=False, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Add a progress comment to a card.') + async def cards_add_comment(card_id: str, body: str) -> dict[str, Any]: + def run(): + if not body.strip(): raise ValidationError('Comment is required.') + user = _actor('projects:write'); card = _card(user, card_id, write=True) + note = CardComment.objects.create(card=card, author=user, body=body) + Activity.objects.create(project=card.project, card=card, actor=user, action='card.commented', origin='mcp') + return {'id': note.pk, 'card_id': str(card.pk), 'body': note.body, 'created_at': note.created_at.isoformat()} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List progress comments on a card.') + async def cards_list_comments(card_id: str, limit: int = 50) -> dict[str, Any]: + def run(): + card = _card(_actor(), card_id) + return {'items': [{'id': c.pk, 'body': c.body, 'author_id': c.author_id, 'created_at': c.created_at.isoformat()} for c in card.comments.order_by('-created_at')[:min(max(limit, 1), 100)]]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List card activity and revision numbers.') + async def cards_history(card_id: str, limit: int = 50) -> dict[str, Any]: + def run(): + card = _card(_actor(), card_id) + return {'items': [{'action': a.action, 'detail': a.detail, 'origin': a.origin, 'created_at': a.created_at.isoformat()} for a in card.activity.all()[:min(max(limit, 1), 100)]], 'revision': card.revision} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Replace raw Markdown only when expected_revision matches the current card revision.') + async def specs_replace(card_id: str, markdown: str, expected_revision: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + card = _card(user, card_id, write=True) + return _card_data(services.update_card(user, card, expected_revision=expected_revision, description_markdown=markdown, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Append raw Markdown with an optimistic revision check.') + async def specs_append(card_id: str, markdown: str, expected_revision: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + card = _card(user, card_id, write=True) + return _card_data(services.update_card(user, card, expected_revision=expected_revision, description_markdown=card.description_markdown + markdown, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Set one of the three supported card priorities without changing its column.') + async def cards_set_priority(card_id: str, priority: Literal['low', 'medium', 'high'], expected_revision: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + card = _card(user, card_id, write=True) + return _card_data(services.update_card(user, card, expected_revision=expected_revision, priority=priority, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Move a card to another column in the same project, optionally to a zero-based position.') + async def cards_move(card_id: str, column_id: str, position: int | None = None) -> dict[str, Any]: + def run(): + user = _actor('projects:write') + return _card_data(services.move_card(user, _card(user, card_id, write=True), Column.objects.get(pk=UUID(column_id)), position, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Reorder a card within its current column using a zero-based position.') + async def cards_reorder(card_id: str, position: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + return _card_data(services.move_card(user, card, card.column, position, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Duplicate a card and its raw Markdown into the same project and column.') + async def cards_duplicate(card_id: str) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + copy = services.create_card(user, card.project, title=f'{card.title} (copy)', markdown=card.description_markdown, column=card.column, priority=card.priority, card_type=card.card_type, origin='mcp') + copy.tags.set(card.tags.all()) + return _card_data(copy) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Replace a card’s tags with existing tag IDs from the same project.') + async def cards_set_tags(card_id: str, tag_ids: list[int]) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + tags = list(Tag.objects.filter(project=card.project, pk__in=tag_ids)) + if len(tags) != len(set(tag_ids)): raise ValidationError('All tags must belong to this project.') + card.tags.set(tags) + Activity.objects.create(project=card.project, card=card, actor=user, action='card.tags_changed', origin='mcp') + return {**_card_data(card), 'tags': [{'id': t.pk, 'name': t.name} for t in tags]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Assign a card to a user who has access to its project, or clear assignment.') + async def cards_set_assignee(card_id: str, user_id: int | None = None) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + assignee = get_user_model().objects.get(pk=user_id) if user_id is not None else None + services.set_assignee(user, card, assignee, origin='mcp') + return {**_card_data(card), 'assignee_id': card.assignee_id} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List unfinished cards grouped by their exact High, Medium, and Low priorities.') + async def cards_list_by_priority(project: str, limit: int = 100) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + cards = Card.objects.filter(project=p, archived=False, column__is_done=False)[:min(max(limit, 1), 100)] + return {priority: [_card_data(c) for c in cards if c.priority == priority] for priority in ('high', 'medium', 'low')} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List tags in an accessible project.') + async def tags_list(project: str) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + return {'items': [{'id': t.pk, 'name': t.name} for t in Tag.objects.filter(project=p).order_by('name')]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Create a tag within a project.') + async def tags_create(project: str, name: str) -> dict[str, Any]: + def run(): + p = _project(_actor('projects:write'), project, write=True) + tag = Tag(project=p, name=name); tag.full_clean(); tag.save() + return {'id': tag.pk, 'name': tag.name} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Rename a tag in a project you may edit.') + async def tags_update(tag_id: int, name: str) -> dict[str, Any]: + def run(): + tag = Tag.objects.get(pk=tag_id) + services.project_for(_actor('projects:write'), tag.project_id, write=True) + tag.name = name; tag.full_clean(); tag.save() + return {'id': tag.pk, 'name': tag.name} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Show the connected account without exposing credentials.') + async def users_me() -> dict[str, Any]: + def run(): + user = _actor() + return {'id': user.pk, 'username': user.get_username(), 'email': user.email} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List users eligible to be assigned cards in a project.') + async def users_list_assignable(project: str) -> dict[str, Any]: + def run(): + p = _project(_actor(), project) + ids = {p.owner_id, *p.memberships.values_list('user_id', flat=True)} + return {'items': [{'id': user.pk, 'username': user.get_username()} for user in get_user_model().objects.filter(pk__in=ids).order_by('username')]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List activity across projects visible to the connected user.') + async def activity_list(limit: int = 50) -> dict[str, Any]: + def run(): + events = Activity.objects.filter(project__in=services.accessible(_actor())).order_by('-created_at')[:min(max(limit, 1), 100)] + return {'items': [{'project_id': str(e.project_id), 'card_id': str(e.card_id) if e.card_id else None, 'action': e.action, 'detail': e.detail, 'origin': e.origin, 'created_at': e.created_at.isoformat()} for e in events]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List Markdown versions of a card, newest first.') + async def specs_versions(card_id: str, limit: int = 50) -> dict[str, Any]: + def run(): + card = _card(_actor(), card_id) + return {'items': [{'revision': v.revision, 'markdown': v.markdown, 'created_at': v.created_at.isoformat()} for v in card.revisions.order_by('-revision')[:min(max(limit, 1), 100)]]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Get full exact Markdown and revision for a specification card.') + async def specs_get(card_id: str) -> dict[str, Any]: + return await cards_get(card_id) + + @server.tool(structured_output=True, description='Restore an earlier Markdown version while retaining revision history.') + async def specs_restore_version(card_id: str, revision: int, expected_revision: int) -> dict[str, Any]: + def run(): + user = _actor('projects:write'); card = _card(user, card_id, write=True) + version = CardRevision.objects.get(card=card, revision=revision) + return _card_data(services.update_card(user, card, expected_revision=expected_revision, description_markdown=version.markdown, origin='mcp')) + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Suggest actionable cards using live columns, priority, due date, and explicit blockers. Does not change any card.') + async def planning_next(project: str | None = None, limit: int = 20) -> dict[str, Any]: + def run(): + user = _actor() + projects = services.accessible(user).filter(archived=False) + if project: projects = projects.filter(pk=_project(user, project).pk) + cards = Card.objects.filter(project__in=projects, archived=False, column__is_done=False).select_related('project', 'column') + ranked = sorted(cards, key=lambda c: (c.is_blocked, c.column.is_default, {'high': 0, 'medium': 1, 'low': 2}[c.priority], c.due_date or date.max, c.created_at)) + return {'items': [{**_card_data(c), 'project_name': c.project.name, 'git_repository_url': c.project.git_repository_url or None} for c in ranked[:min(max(limit, 1), 100)]]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Summarize open work by project, column, and priority with Git repository metadata.') + async def planning_overview() -> dict[str, Any]: + def run(): + items = [] + for p in services.accessible(_actor()).filter(archived=False): + cards = Card.objects.filter(project=p, archived=False) + items.append({**_project_data(p), 'columns': [{**_column_data(c), 'count': cards.filter(column=c).count()} for c in p.board.columns.filter(archived=False)], 'priorities': {key: cards.filter(priority=key).count() for key in ('high', 'medium', 'low')}}) + return {'items': items} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List only cards explicitly marked blocked, with their stated reasons.') + async def planning_blocked(limit: int = 50) -> dict[str, Any]: + def run(): + cards = Card.objects.filter(project__in=services.accessible(_actor()), archived=False, is_blocked=True)[:min(max(limit, 1), 100)] + return {'items': [_card_data(c) for c in cards]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List recent project and card changes visible to the connected user.') + async def planning_recent(limit: int = 50) -> dict[str, Any]: + def run(): + events = Activity.objects.filter(project__in=services.accessible(_actor())).order_by('-created_at')[:min(max(limit, 1), 100)] + return {'items': [{'project_id': str(e.project_id), 'card_id': str(e.card_id) if e.card_id else None, 'action': e.action, 'detail': e.detail, 'origin': e.origin, 'created_at': e.created_at.isoformat()} for e in events]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Summarize outstanding High, Medium, and Low cards without changing priorities.') + async def planning_priorities() -> dict[str, Any]: + def run(): + cards = Card.objects.filter(project__in=services.accessible(_actor()), archived=False, column__is_done=False) + return {'high': cards.filter(priority='high').count(), 'medium': cards.filter(priority='medium').count(), 'low': cards.filter(priority='low').count()} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='List unfinished cards grouped by priority across accessible projects.') + async def planning_backlog(limit: int = 100) -> dict[str, Any]: + def run(): + cards = Card.objects.filter(project__in=services.accessible(_actor()), archived=False, column__is_done=False)[:min(max(limit, 1), 100)] + return {priority: [_card_data(c) for c in cards if c.priority == priority] for priority in ('high', 'medium', 'low')} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Search accessible projects and cards. Results include only data the connected user may read.') + async def search_global(query: str, limit: int = 50) -> dict[str, Any]: + def run(): + user = _actor() + projects = services.accessible(user).filter(Q(name__icontains=query) | Q(description__icontains=query))[:min(max(limit, 1), 100)] + cards = Card.objects.filter(project__in=services.accessible(user), archived=False).filter(Q(title__icontains=query) | Q(description_markdown__icontains=query))[:min(max(limit, 1), 100)] + return {'projects': [_project_data(p) for p in projects], 'cards': [_card_data(c) for c in cards]} + return await sync_to_async(lambda: _safe(run))() + + @server.tool(structured_output=True, description='Report supported MCP tools, scopes, and result limits.') + async def system_capabilities() -> dict[str, Any]: + _actor() + return {'scopes': ['projects:read', 'projects:write'], 'max_page_size': 100, 'version': '0.2', 'transport': 'streamable_http'} + + return server + + +app = create_server().streamable_http_app( + streamable_http_path='/mcp', stateless_http=True, json_response=True, + transport_security=TransportSecuritySettings( + allowed_hosts=[urlsplit(settings.MCP_PUBLIC_URL).netloc, '127.0.0.1:*', 'localhost:*'], + allowed_origins=[f'{urlsplit(settings.MCP_PUBLIC_URL).scheme}://{urlsplit(settings.MCP_PUBLIC_URL).netloc}', 'https://chatgpt.com', 'http://127.0.0.1:*', 'http://localhost:*'], + ), +) +metadata_route = create_protected_resource_routes( + resource_url=AnyHttpUrl(settings.MCP_PUBLIC_URL), + authorization_servers=[AnyHttpUrl(settings.OAUTH_ISSUER_URL)], + scopes_supported=['projects:read', 'projects:write'], +)[0] +for index, route in enumerate(app.router.routes): + if getattr(route, 'path', None) == metadata_route.path: + app.router.routes[index] = metadata_route + break diff --git a/package.json b/package.json index 5648615..a68dde0 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dev": "node scripts/dev.mjs", "dev:servers": "concurrently -k -n django,vite -c cyan,green \"npm:dev:django\" \"npm:dev:vite\"", "dev:django": ".venv/bin/python manage.py runserver 127.0.0.1:8765", + "dev:mcp": ".venv/bin/uvicorn mcp_server.server:app --host 127.0.0.1 --port 8766", "dev:vite": "vite --host 127.0.0.1", "build": "vite build" }, diff --git a/projects/forms.py b/projects/forms.py index 863ad7a..76ef4b8 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -1,5 +1,6 @@ from django import forms -from .models import Card, Column, Profile, Project +from .models import Card, Column, Profile, Project, Tag, Membership +from django.contrib.auth import get_user_model class ProjectForm(forms.ModelForm): @@ -7,6 +8,16 @@ class ProjectForm(forms.ModelForm): model = Project fields = ['name', 'description', 'git_repository_url'] + def __init__(self, *args, user=None, **kwargs): + super().__init__(*args, **kwargs) + self.user = user + + def clean_name(self): + value = self.cleaned_data['name'].strip() + if self.user and Project.objects.filter(owner=self.user, name__iexact=value).exclude(pk=self.instance.pk).exists(): + raise forms.ValidationError('You already have a project with this name.') + return value + def clean_git_repository_url(self): value = self.cleaned_data['git_repository_url'] if value and not value.startswith('https://'): @@ -16,12 +27,21 @@ class ProjectForm(forms.ModelForm): class CardForm(forms.ModelForm): expected_revision = forms.IntegerField(widget=forms.HiddenInput, required=False) + assignee = forms.ModelChoiceField(queryset=get_user_model().objects.none(), required=False) + tags = forms.ModelMultipleChoiceField(queryset=Tag.objects.none(), required=False) class Meta: model = Card - fields = ['title', 'description_markdown', 'priority', 'card_type', 'due_date', 'is_blocked', 'blocked_reason'] + fields = ['title', 'description_markdown', 'priority', 'card_type', 'due_date', 'is_blocked', 'blocked_reason', 'assignee', 'tags'] widgets = {'description_markdown': forms.Textarea(attrs={'rows': 16}), 'due_date': forms.DateInput(attrs={'type': 'date'})} + def __init__(self, *args, project=None, **kwargs): + super().__init__(*args, **kwargs) + if project: + ids = [project.owner_id, *Membership.objects.filter(project=project).values_list('user_id', flat=True)] + self.fields['assignee'].queryset = get_user_model().objects.filter(pk__in=ids).order_by('username') + self.fields['tags'].queryset = Tag.objects.filter(project=project).order_by('name') + class ColumnForm(forms.ModelForm): class Meta: @@ -30,6 +50,12 @@ class ColumnForm(forms.ModelForm): widgets = {'color': forms.TextInput(attrs={'type': 'color'})} +class TagForm(forms.ModelForm): + class Meta: + model = Tag + fields = ['name'] + + class ProfileForm(forms.ModelForm): email = forms.EmailField(required=False) diff --git a/projects/migrations/0002_creationkey.py b/projects/migrations/0002_creationkey.py new file mode 100644 index 0000000..b2f8457 --- /dev/null +++ b/projects/migrations/0002_creationkey.py @@ -0,0 +1,30 @@ +# Generated by Django 6.1.2 on 2026-10-13 13:30 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='CreationKey', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('key', models.CharField(max_length=128)), + ('payload_hash', models.CharField(max_length=64)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('card', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='projects.card')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'constraints': [models.UniqueConstraint(fields=('user', 'key'), name='unique_card_creation_key')], + }, + ), + ] diff --git a/projects/migrations/0003_oauthidentity.py b/projects/migrations/0003_oauthidentity.py new file mode 100644 index 0000000..96c8e05 --- /dev/null +++ b/projects/migrations/0003_oauthidentity.py @@ -0,0 +1,29 @@ +# Generated by Django 6.1.2 on 2026-10-13 18:28 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0002_creationkey'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='OAuthIdentity', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('issuer', models.URLField()), + ('subject', models.CharField(max_length=255)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='oauth_identities', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'constraints': [models.UniqueConstraint(fields=('issuer', 'subject'), name='unique_oidc_identity')], + }, + ), + ] diff --git a/projects/models.py b/projects/models.py index e9f4cbf..42f7750 100644 --- a/projects/models.py +++ b/projects/models.py @@ -14,6 +14,16 @@ class Profile(models.Model): theme = models.CharField(max_length=16, default='system') +class OAuthIdentity(models.Model): + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='oauth_identities') + issuer = models.URLField() + subject = models.CharField(max_length=255) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + constraints = [models.UniqueConstraint(fields=['issuer', 'subject'], name='unique_oidc_identity')] + + class Project(models.Model): id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='owned_projects') @@ -112,6 +122,17 @@ class CardComment(models.Model): created_at = models.DateTimeField(auto_now_add=True) +class CreationKey(models.Model): + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + key = models.CharField(max_length=128) + payload_hash = models.CharField(max_length=64) + card = models.ForeignKey(Card, on_delete=models.CASCADE) + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + constraints = [models.UniqueConstraint(fields=['user', 'key'], name='unique_card_creation_key')] + + class Activity(models.Model): project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name='activity') card = models.ForeignKey(Card, null=True, blank=True, on_delete=models.CASCADE, related_name='activity') diff --git a/projects/oidc.py b/projects/oidc.py new file mode 100644 index 0000000..c9e939c --- /dev/null +++ b/projects/oidc.py @@ -0,0 +1,44 @@ +import hashlib +from django.conf import settings +from django.core.exceptions import SuspiciousOperation +from django.db import transaction +from mozilla_django_oidc.auth import OIDCAuthenticationBackend +from .models import OAuthIdentity + + +class IdentityBackend(OIDCAuthenticationBackend): + """Map an external account by verified issuer and subject, never by email.""" + + def verify_token(self, token, **kwargs): + payload = super().verify_token(token, **kwargs) + audience = payload.get('aud', []) + if isinstance(audience, str): + audience = [audience] + if payload.get('iss') != settings.OIDC_OP_ISSUER or settings.OIDC_RP_CLIENT_ID not in audience or not payload.get('sub'): + raise SuspiciousOperation('OIDC issuer, audience, or subject mismatch.') + return payload + + def get_userinfo(self, access_token, id_token, payload): + claims = super().get_userinfo(access_token, id_token, payload) + if claims.get('sub') != payload.get('sub'): + raise SuspiciousOperation('OIDC subject mismatch.') + claims['issuer'] = payload['iss'] + return claims + + def verify_claims(self, claims): + return bool(claims.get('issuer') == settings.OIDC_OP_ISSUER and claims.get('sub')) + + def filter_users_by_claims(self, claims): + ids = OAuthIdentity.objects.filter(issuer=claims['issuer'], subject=claims['sub']).values_list('user_id', flat=True) + return self.UserModel.objects.filter(pk__in=ids) + + @transaction.atomic + def create_user(self, claims): + digest = hashlib.sha256(f"{claims['issuer']}:{claims['sub']}".encode()).hexdigest()[:30] + username = f'oidc_{digest}' + email = claims.get('email', '') if claims.get('email_verified') else '' + user = self.UserModel.objects.create_user(username=username, email=email) + user.set_unusable_password() + user.save(update_fields=['password']) + OAuthIdentity.objects.create(user=user, issuer=claims['issuer'], subject=claims['sub']) + return user diff --git a/projects/services.py b/projects/services.py index 701f9e5..047d66f 100644 --- a/projects/services.py +++ b/projects/services.py @@ -1,10 +1,13 @@ +import hashlib +import json from django.core.exceptions import PermissionDenied, ValidationError from django.db import transaction from django.db.models import Q, Max +from django.core.validators import URLValidator from django.shortcuts import get_object_or_404 from django.utils import timezone from django.utils.text import slugify -from .models import Activity, Board, Card, CardRevision, Column, Membership, Project +from .models import Activity, Board, Card, CardRevision, Column, CreationKey, Membership, Project, Tag class RevisionConflict(Exception): @@ -13,6 +16,8 @@ class RevisionConflict(Exception): def accessible(user): + if not user.is_authenticated: + return Project.objects.none() return Project.objects.filter(Q(owner=user) | Q(memberships__user=user)).distinct() @@ -32,13 +37,21 @@ def card_for(user, identifier, write=False): @transaction.atomic def create_project(user, *, name, description='', git_repository_url=''): + if not name.strip(): + raise ValidationError('Project name is required.') + if Project.objects.filter(owner=user, name__iexact=name.strip()).exists(): + raise ValidationError('You already have a project with this name.') + if git_repository_url: + URLValidator(schemes=['https'])(git_repository_url) base = slugify(name) or 'project' slug = base n = 2 while Project.objects.filter(owner=user, slug=slug).exists(): slug = f'{base}-{n}' n += 1 - project = Project.objects.create(owner=user, name=name, slug=slug, description=description, git_repository_url=git_repository_url) + project = Project(owner=user, name=name, slug=slug, description=description, git_repository_url=git_repository_url) + project.full_clean() + project.save() board = Board.objects.create(project=project) for index, title in enumerate(('To-do', 'In Progress', 'Done')): Column.objects.create(board=board, name=title, position=index, is_default=index == 0, is_done=index == 2) @@ -47,19 +60,35 @@ def create_project(user, *, name, description='', git_repository_url=''): @transaction.atomic -def create_card(user, project, *, title, markdown='', column=None, priority='medium', card_type='task', origin='web'): +def create_card(user, project, *, title, markdown='', column=None, priority='medium', card_type='task', origin='web', idempotency_key=None): project_for(user, project.pk, write=True) if priority not in dict(Card.PRIORITY) or card_type not in dict(Card.TYPE): raise ValidationError('Invalid priority or card type.') + if not title.strip(): + raise ValidationError('Card title is required.') + if idempotency_key: + if len(idempotency_key) > 128: + raise ValidationError('Idempotency key is too long.') + payload = json.dumps({'project': str(project.pk), 'title': title, 'markdown': markdown, 'column': str(column.pk) if column else None, 'priority': priority, 'card_type': card_type}, sort_keys=True) + payload_hash = hashlib.sha256(payload.encode()).hexdigest() + existing = CreationKey.objects.filter(user=user, key=idempotency_key).select_related('card').first() + if existing: + if existing.payload_hash != payload_hash: + raise ValidationError('Idempotency key was already used with different card details.') + return existing.card column = column or project.board.columns.get(is_default=True, archived=False) if column.board_id != project.board.pk or column.archived: raise ValidationError('Column is not available in this project.') position = (Card.objects.filter(column=column, archived=False).aggregate(Max('position'))['position__max'] or 0) + 1 - card = Card.objects.create(project=project, column=column, title=title, description_markdown=markdown, - priority=priority, card_type=card_type, position=position, created_by=user, - completed_at=timezone.now() if column.is_done else None) + card = Card(project=project, column=column, title=title, description_markdown=markdown, + priority=priority, card_type=card_type, position=position, created_by=user, + completed_at=timezone.now() if column.is_done else None) + card.full_clean() + card.save() CardRevision.objects.create(card=card, revision=1, markdown=markdown, actor=user) Activity.objects.create(project=project, card=card, actor=user, action='card.created', origin=origin) + if idempotency_key: + CreationKey.objects.create(user=user, key=idempotency_key, payload_hash=payload_hash, card=card) return card @@ -80,12 +109,11 @@ def update_card(user, card, *, expected_revision=None, origin='web', **changes): if getattr(card, field) != value: setattr(card, field, value) changed.append(field) - if markdown_changed: - card.revision += 1 if changed: + card.revision += 1 + card.full_clean() card.save() - if markdown_changed: - CardRevision.objects.create(card=card, revision=card.revision, markdown=card.description_markdown, actor=user) + CardRevision.objects.create(card=card, revision=card.revision, markdown=card.description_markdown, actor=user) Activity.objects.create(project=card.project, card=card, actor=user, action='card.updated', detail={'fields': changed}, origin=origin) return card @@ -119,3 +147,75 @@ def set_default(user, column): column.is_default = True column.save(update_fields=['is_default']) return column + + +@transaction.atomic +def archive_column(user, column): + project_for(user, column.board.project_id, write=True) + if column.is_default or column.cards.filter(archived=False).exists(): + raise ValidationError('Choose another default and move cards before archiving this column.') + column.archived = True + column.save(update_fields=['archived']) + return column + + +@transaction.atomic +def reorder_columns(user, project, ids): + project_for(user, project.pk, write=True) + columns = list(project.board.columns.filter(archived=False)) + if len(ids) != len(columns) or set(map(str, ids)) != {str(c.pk) for c in columns}: + raise ValidationError('Invalid column order.') + for index, identifier in enumerate(ids): + Column.objects.filter(pk=identifier, board=project.board).update(position=index) + return columns + + +@transaction.atomic +def shift_column(user, column, direction): + project = project_for(user, column.board.project_id, write=True) + ids = [str(c.pk) for c in project.board.columns.filter(archived=False)] + index = ids.index(str(column.pk)) + target = max(0, min(index + direction, len(ids) - 1)) + ids[index], ids[target] = ids[target], ids[index] + reorder_columns(user, project, ids) + return column + + +@transaction.atomic +def update_column(user, column, *, name=None, color=None, is_done=None, origin='web'): + column = Column.objects.select_for_update().get(pk=column.pk) + project = project_for(user, column.board.project_id, write=True) + if name is not None: + column.name = name + if color is not None: + column.color = color + completion_changed = is_done is not None and column.is_done != is_done + if is_done is not None: + column.is_done = is_done + column.full_clean() + column.save() + if completion_changed: + Card.objects.filter(column=column, archived=False).update(completed_at=timezone.now() if is_done else None) + Activity.objects.create(project=project, actor=user, action='column.updated', detail={'column_id': str(column.pk)}, origin=origin) + return column + + +def set_assignee(user, card, assignee, origin='web'): + project_for(user, card.project_id, write=True) + if assignee and assignee.pk != card.project.owner_id and not Membership.objects.filter(project=card.project, user=assignee).exists(): + raise ValidationError('Assignee must have access to this project.') + card.assignee = assignee + card.save(update_fields=['assignee', 'updated_at']) + Activity.objects.create(project=card.project, card=card, actor=user, action='card.assigned', detail={'assignee': assignee.pk if assignee else None}, origin=origin) + return card + + +@transaction.atomic +def set_tags(user, card, tags, origin='web'): + project_for(user, card.project_id, write=True) + tags = list(tags) + if any(tag.project_id != card.project_id for tag in tags): + raise ValidationError('Tags must belong to this project.') + card.tags.set(tags) + Activity.objects.create(project=card.project, card=card, actor=user, action='card.tags_changed', origin=origin) + return card diff --git a/projects/templates/projects/_board.html b/projects/templates/projects/_board.html index c660002..1dab2bd 100644 --- a/projects/templates/projects/_board.html +++ b/projects/templates/projects/_board.html @@ -1 +1,37 @@ -
{% for column in columns %}
{{ column.name }}{% if column.is_default %} · Default{% endif %}Edit
{% for card in column.visible_cards %}
{{ card.title }}
{{ card.get_priority_display }} {{ card.get_card_type_display }}{% if card.is_blocked %}Blocked{% endif %}
{% csrf_token %}
{% endfor %}
{% endfor %}
+
+{% for column in columns %} +
+
+
{{ column.name }}{% if column.is_default %} · Default{% endif %}
+ {% if can_edit %}Edit{% endif %} +
+ {% if can_edit %}
+
{% csrf_token %}
+
{% csrf_token %}
+ {% if not column.is_default %}
{% csrf_token %}
{% endif %} + {% if not column.is_default and not column.active_count %}
{% csrf_token %}
{% endif %} +
{% endif %} +
+ {% for card in column.visible_cards %} +
+
+ {{ card.title }} +
{{ card.get_priority_display }} {{ card.get_card_type_display }}{% if card.is_blocked %}Blocked{% endif %}
+ {% if can_edit %}
+ {% csrf_token %} + +
+
+
{% csrf_token %}
+
{% csrf_token %}
+
{% endif %} +
+
+ {% endfor %} +
+
+{% endfor %} +
+{% if page_obj.has_other_pages %}{% endif %} diff --git a/projects/templates/projects/_project_list.html b/projects/templates/projects/_project_list.html index 782134c..ff25f71 100644 --- a/projects/templates/projects/_project_list.html +++ b/projects/templates/projects/_project_list.html @@ -1 +1 @@ -
{% for project in projects %}

{{ project.name }}

{{ project.description|truncatechars:180 }}

{{ project.card_count }} cards{% if project.git_repository_url %}

Repository

{% endif %}
{% empty %}

No projects found.

{% endfor %}
+
{% for project in projects %}

{{ project.name }}

{{ project.description|truncatechars:180 }}

{{ project.card_count }} cards{% if project.git_repository_url %}

Repository

{% endif %}
{% empty %}

No projects found.

{% endfor %}
{% if page_obj.has_other_pages %}{% endif %} diff --git a/projects/templates/projects/board.html b/projects/templates/projects/board.html index 1635158..87ea3b8 100644 --- a/projects/templates/projects/board.html +++ b/projects/templates/projects/board.html @@ -1 +1,43 @@ -{% extends 'core/base.html' %}{% block content %}
All projects

{{ project.name }}

{{ project.description }}

{% if project.git_repository_url %}Repository{% endif %}
Edit project New card
{% include 'projects/_board.html' %}
Add column{% csrf_token %}{% endblock %} +{% extends 'core/base.html' %} +{% block content %} +
+
All projects

{{ project.name }}

{{ project.description }}

{% if project.git_repository_url %}Repository{% endif %}

{{ done_count }} of {{ total_count }} cards done

+ {% if can_edit %}
Edit project {% if project.archived %}
{% csrf_token %}
{% else %}
{% csrf_token %}
New card{% endif %}
{% endif %} +
+
{% for label,count in priority_counts %}{{ label }}: {{ count }} open{% endfor %}
+ +
{% include 'projects/_board.html' %}
+{% if can_edit %}Add column +Add tag{% endif %} +

Recent activity

+ +{% if can_edit %} + + +{% csrf_token %} +{% endif %} +{% endblock %} diff --git a/projects/templates/projects/card.html b/projects/templates/projects/card.html index 31964d9..3701a4f 100644 --- a/projects/templates/projects/card.html +++ b/projects/templates/projects/card.html @@ -1 +1,12 @@ -{% extends 'core/base.html' %}{% load project_markdown %}{% block content %}← {{ card.project.name }}

{{ card.title }}

Edit

{{ card.get_priority_display }} {{ card.column.name }} · {{ card.get_card_type_display }} · Revision {{ card.revision }}

{{ card.description_markdown|safe_markdown }}

Progress notes

{% for comment in card.comments.all %}
{{ comment.author }} · {{ comment.created_at }}

{{ comment.body|linebreaksbr }}

{% endfor %}
{% csrf_token %}

History

{% endblock %} +{% extends 'core/base.html' %}{% load project_markdown %} +{% block content %} +← {{ card.project.name }} +

{{ card.title }}

{% if can_edit %}
Edit {% if card.archived %}
{% csrf_token %}
{% else %}
{% csrf_token %}
{% endif %}
{% endif %}
+

{{ card.get_priority_display }} {{ card.column.name }} · {{ card.get_card_type_display }} · Revision {{ card.revision }}

+
{{ card.description_markdown|safe_markdown }}
+
Raw Markdown
{{ card.description_markdown }}
+

Progress notes

+{% for comment in card.comments.all %}
{{ comment.author }} · {{ comment.created_at }}

{{ comment.body|linebreaksbr }}

{% endfor %} +{% if can_edit %}
{% csrf_token %}
{% endif %} +

History

+{% endblock %} diff --git a/projects/templates/projects/form.html b/projects/templates/projects/form.html index 252b02f..0e3b688 100644 --- a/projects/templates/projects/form.html +++ b/projects/templates/projects/form.html @@ -1 +1 @@ -{% extends 'core/base.html' %}{% block content %}

{{ title }}

{% csrf_token %}{{ form.as_p }}
{% endblock %} +{% extends 'core/base.html' %}{% block content %}

{{ title }}

{% csrf_token %}{{ form.as_p }}{% if show_preview %}{% endif %}
{% if show_preview %}{% endif %}{% endblock %} diff --git a/projects/templates/projects/list.html b/projects/templates/projects/list.html index 1403863..775c18c 100644 --- a/projects/templates/projects/list.html +++ b/projects/templates/projects/list.html @@ -1 +1 @@ -{% extends 'core/base.html' %}{% block content %}

Projects

Boards and specifications across your workspace.

New project
{% include 'projects/_project_list.html' %}
{% endblock %} +{% extends 'core/base.html' %}{% block content %}

Projects

Boards and specifications across your workspace.

New project

Active · Archived

{% include 'projects/_project_list.html' %}
{% endblock %} diff --git a/projects/templates/projects/login.html b/projects/templates/projects/login.html index 7a0814a..7ed2961 100644 --- a/projects/templates/projects/login.html +++ b/projects/templates/projects/login.html @@ -1 +1 @@ -Sign in · Common Ground

Common Ground

Sign in to your dashboard.

{% csrf_token %}{{ form.as_p }}
+Sign in · Common Ground

Common Ground

Sign in to your dashboard.

{% csrf_token %}{{ form.as_p }}
{% if oidc_enabled %}Sign in with your organization{% endif %}
diff --git a/projects/templates/projects/profile.html b/projects/templates/projects/profile.html index 9b17e56..5c7a72f 100644 --- a/projects/templates/projects/profile.html +++ b/projects/templates/projects/profile.html @@ -1 +1,17 @@ -{% extends 'core/base.html' %}{% block content %}

Profile

Account

{% csrf_token %}{{ form.as_p }}
Change password
{% csrf_token %}

MCP connections

Remote MCP and OAuth connections are being prepared. No clients are connected.

{% endblock %} +{% extends 'core/base.html' %} +{% block content %} +

Profile

+
+

Account

+
{% csrf_token %}{{ form.as_p }}
+ Change password +
{% csrf_token %}
+
+

Connected sign-in identities

+{% for identity in identities %}

{{ identity.issuer }} · {{ identity.subject }}

{% empty %}

No external sign-in identity connected.

{% endfor %} +

MCP connections

+

Endpoint: {{ mcp_url }}. Authorize a registered client with projects:read and optionally projects:write. Client registration requires a signed-in account and a CSRF token for browser requests.

+{% for grant in grants %} +
{{ grant.application.name|default:'Connected client' }}Permissions: {{ grant.scope }}Expires {{ grant.expires }}
{% csrf_token %}
+{% empty %}

No active MCP clients.

{% endfor %} +{% endblock %} diff --git a/projects/test_oauth_mcp.py b/projects/test_oauth_mcp.py new file mode 100644 index 0000000..2c4c0bb --- /dev/null +++ b/projects/test_oauth_mcp.py @@ -0,0 +1,90 @@ +import base64 +import hashlib +import json +from urllib.parse import parse_qs, urlparse + +from django.contrib.auth import get_user_model +from django.test import TestCase, Client as DjangoClient +from django.conf import settings +from asgiref.sync import async_to_sync +from unittest.mock import patch +from mcp.server.auth.provider import AccessToken as McpAccessToken +from mcp.server.mcpserver.exceptions import ToolError +from oauth2_provider.models import Application +from mcp_server.server import _verified, create_server +from .services import create_project + + +class OAuthMcpTests(TestCase): + def setUp(self): + self.user = get_user_model().objects.create_user('mcp-user', password='test-password') + self.application = Application.objects.create( + user=self.user, name='Test client', client_type=Application.CLIENT_PUBLIC, + authorization_grant_type=Application.GRANT_AUTHORIZATION_CODE, + redirect_uris='http://localhost:9876/callback', + ) + + def test_pkce_token_and_revocation(self): + self.client.force_login(self.user) + verifier = 'v' * 64 + challenge = base64.urlsafe_b64encode(hashlib.sha256(verifier.encode()).digest()).decode().rstrip('=') + params = {'response_type': 'code', 'client_id': self.application.client_id, + 'redirect_uri': 'http://localhost:9876/callback', 'scope': 'projects:read projects:write', + 'state': 'test-state', 'code_challenge': challenge, 'code_challenge_method': 'S256', + 'resource': settings.MCP_PUBLIC_URL} + response = self.client.get('/o/authorize/', params) + self.assertEqual(response.status_code, 200, response.content[:300]) + form = response.context['form'] + payload = {field.name: field.value() for field in form if field.field.widget.is_hidden and field.value() is not None} + payload['allow'] = 'Authorize' + response = self.client.post('/o/authorize/', payload) + self.assertEqual(response.status_code, 302, response.content[:300]) + code = parse_qs(urlparse(response['Location']).query)['code'][0] + response = self.client.post('/o/token/', {'grant_type': 'authorization_code', 'code': code, + 'redirect_uri': 'http://localhost:9876/callback', 'client_id': self.application.client_id, + 'code_verifier': verifier, 'resource': settings.MCP_PUBLIC_URL}) + self.assertEqual(response.status_code, 200, response.content[:300]) + secret = response.json()['access_token'] + info = _verified(secret) + self.assertEqual(info['user_id'], self.user.pk) + self.assertIn('projects:write', info['scopes']) + self.client.post(f'/projects/profile/connections/{self.user.oauth2_provider_accesstoken.first().pk}/revoke/') + self.assertIsNone(_verified(secret)) + + def test_discovery_and_project_access(self): + self.assertEqual(self.client.get('/.well-known/oauth-authorization-server').status_code, 200) + project = create_project(self.user, name='Private') + self.assertEqual(self.client.get(f'/projects/{project.pk}/').status_code, 302) + + def test_client_registration_requires_authenticated_user_and_csrf(self): + metadata = {'client_name': 'Private test client', 'redirect_uris': ['https://client.example/callback'], + 'grant_types': ['authorization_code', 'refresh_token'], 'token_endpoint_auth_method': 'none'} + browser = DjangoClient(enforce_csrf_checks=True) + response = browser.post('/o/register/', data=json.dumps(metadata), content_type='application/json') + self.assertEqual(response.status_code, 401) + browser.force_login(self.user) + response = browser.post('/o/register/', data=json.dumps(metadata), content_type='application/json') + self.assertEqual(response.status_code, 401) + browser.get('/projects/profile/') + csrf = browser.cookies['csrftoken'].value + response = browser.post('/o/register/', data=json.dumps(metadata), content_type='application/json', HTTP_X_CSRFTOKEN=csrf) + self.assertEqual(response.status_code, 201, response.content[:300]) + client_id = response.json()['client_id'] + registered = Application.objects.get(client_id=client_id) + self.assertEqual(registered.user_id, self.user.pk) + + def test_mcp_default_card_and_scope_enforcement(self): + project = create_project(self.user, name='BoomCast', git_repository_url='https://example.com/repo') + server = create_server() + access = McpAccessToken(token='test', client_id='test', scopes=['projects:read', 'projects:write'], subject=str(self.user.pk)) + with patch('mcp_server.server.get_access_token', return_value=access): + result = async_to_sync(server.call_tool)('specs_create', {'project': str(project.pk), 'title': 'Field notes', 'markdown': '# Notes\n\n```py\nprint(1)\n```'}) + card = result.structured_content + self.assertEqual(card['priority'], 'medium') + self.assertEqual(card['markdown'], '# Notes\n\n```py\nprint(1)\n```') + result = async_to_sync(server.call_tool)('projects_get', {'project': str(project.pk)}) + self.assertEqual(result.structured_content['git_repository_url'], 'https://example.com/repo') + read = McpAccessToken(token='test', client_id='test', scopes=['projects:read'], subject=str(self.user.pk)) + with patch('mcp_server.server.get_access_token', return_value=read): + with self.assertRaises(ToolError): + async_to_sync(server.call_tool)('cards_set_priority', {'card_id': card['id'], 'priority': 'high', 'expected_revision': 1}) diff --git a/projects/test_oidc.py b/projects/test_oidc.py new file mode 100644 index 0000000..17dd453 --- /dev/null +++ b/projects/test_oidc.py @@ -0,0 +1,22 @@ +from django.contrib.auth import get_user_model +from django.test import TestCase, override_settings +from .models import OAuthIdentity +from .oidc import IdentityBackend + + +@override_settings( + OIDC_OP_TOKEN_ENDPOINT='https://id.example/token', OIDC_OP_USER_ENDPOINT='https://id.example/userinfo', + OIDC_OP_JWKS_ENDPOINT='https://id.example/jwks', OIDC_RP_CLIENT_ID='dashboard', + OIDC_RP_CLIENT_SECRET='test-secret', OIDC_RP_SIGN_ALGO='RS256', OIDC_OP_ISSUER='https://id.example/', +) +class IdentityMappingTests(TestCase): + def test_matching_email_does_not_link_existing_local_account(self): + local = get_user_model().objects.create_user('local', email='same@example.com', password='password') + backend = IdentityBackend() + claims = {'issuer': 'https://id.example/', 'sub': 'subject-1', 'email': 'same@example.com', 'email_verified': True} + self.assertFalse(backend.filter_users_by_claims(claims).exists()) + external = backend.create_user(claims) + self.assertNotEqual(local.pk, external.pk) + self.assertFalse(external.has_usable_password()) + self.assertEqual(OAuthIdentity.objects.get(user=external).subject, 'subject-1') + self.assertEqual(list(backend.filter_users_by_claims(claims)), [external]) diff --git a/projects/tests.py b/projects/tests.py index ff9069e..accb607 100644 --- a/projects/tests.py +++ b/projects/tests.py @@ -1,8 +1,9 @@ from django.contrib.auth import get_user_model from django.test import TestCase +from django.core.exceptions import ValidationError from django.urls import reverse -from .models import Card, CardRevision -from .services import RevisionConflict, card_for, create_card, create_project, move_card, update_card +from .models import Card, CardRevision, Membership +from .services import RevisionConflict, card_for, create_card, create_project, move_card, update_card, update_column class ProjectWorkflowTests(TestCase): @@ -22,6 +23,13 @@ class ProjectWorkflowTests(TestCase): update_card(self.owner, card, expected_revision=1, description_markdown='# Overwritten') self.assertEqual(Card.objects.get(pk=card.pk).description_markdown, '# Revised') + def test_idempotent_spec_creation(self): + first = create_card(self.owner, self.project, title='Spec', markdown='# Exact\n', idempotency_key='client-request-1') + second = create_card(self.owner, self.project, title='Spec', markdown='# Exact\n', idempotency_key='client-request-1') + self.assertEqual(first.pk, second.pk) + with self.assertRaises(ValidationError): + create_card(self.owner, self.project, title='Different', idempotency_key='client-request-1') + def test_access_and_move(self): card = create_card(self.owner, self.project, title='A') self.assertEqual(self.client.get(reverse('projects:board', args=[self.project.pk])).status_code, 302) @@ -33,7 +41,50 @@ class ProjectWorkflowTests(TestCase): card.refresh_from_db() self.assertIsNotNone(card.completed_at) + def test_board_filters_and_escaped_markdown(self): + card = create_card(self.owner, self.project, title='Danger', markdown='\n\n# Safe') + self.client.force_login(self.owner) + response = self.client.get(reverse('projects:board', args=[self.project.pk]), {'priority': 'medium'}) + self.assertContains(response, 'Danger') + response = self.client.get(reverse('projects:board', args=[self.project.pk]), {'priority': 'high'}) + self.assertNotContains(response, 'Danger') + response = self.client.get(reverse('projects:card', args=[card.pk])) + self.assertNotContains(response, '', html=False) + self.assertContains(response, '

Safe

', html=False) + + def test_completion_flag_updates_existing_cards(self): + card = create_card(self.owner, self.project, title='Complete later') + column = card.column + update_column(self.owner, column, is_done=True) + card.refresh_from_db() + self.assertIsNotNone(card.completed_at) + update_column(self.owner, column, is_done=False) + card.refresh_from_db() + self.assertIsNone(card.completed_at) + + def test_preview_sanitizes_script(self): + self.client.force_login(self.owner) + response = self.client.post(reverse('projects:preview'), {'description_markdown': '# Hello\n\n'}) + self.assertEqual(response.status_code, 200) + self.assertIn('

Hello

', response.content.decode()) + self.assertNotIn('