π₯π₯π₯ Open-source Jira, Linear, Monday, and ClickUp alternative. Plane is a modern project management platform to manage tasks, sprints, docs, and triage.
TypeScript boardsbug-trackerdjangodockerganttissue-trackerjirajira-alternativekanbanlinearpostgresqlproduct-managementproject-managementproject-planningpythonreactredistypesciptvitework-management
[WEB-9166] fix(project): scope project-join membership lookup to the invited project (#9866)
sriram veeraghantab2dd757ec480
diff --git a/apps/api/plane/app/views/project/invite.py b/apps/api/plane/app/views/project/invite.pyindex 45c997596f..6f6dc41fd2 100644--- a/apps/api/plane/app/views/project/invite.py+++ b/apps/api/plane/app/views/project/invite.py@@ -249,9 +249,16 @@ class ProjectJoinEndpoint(BaseAPIView):workspace_member.is_active = Trueworkspace_member.save()- # Check if the user was already a member of project then activate the user+ # Check if the user was already a member of the invited project+ # then activate the user. The lookup must be scoped to+ # `project_id` β a workspace-wide lookup reactivates whatever+ # membership the user already had (typically a project they were+ # removed from) and leaves the invited project without a member+ # row (SECUR-234).project_member = ProjectMember.objects.filter(- workspace_id=project_invite.workspace_id, member=user+ workspace_id=project_invite.workspace_id,+ project_id=project_id,+ member=user,).first()if project_member is None:# Create a Project Member@@ -261,8 +268,10 @@ class ProjectJoinEndpoint(BaseAPIView):role=project_invite.role,)else:+ # The invitation's role is what the inviting admin chose; the+ # stale role on a deactivated row must not survive the rejoin.project_member.is_active = True- project_member.role = project_member.role+ project_member.role = project_invite.roleproject_member.save()return Response(diff --git a/apps/api/plane/tests/contract/app/test_project_join_cross_project_activation.py b/apps/api/plane/tests/contract/app/test_project_join_cross_project_activation.pynew file mode 100644index 0000000000..11ec80f7ce--- /dev/null+++ b/apps/api/plane/tests/contract/app/test_project_join_cross_project_activation.py@@ -0,0 +1,98 @@+# Copyright (c) 2023-present Plane Software, Inc. and contributors+# SPDX-License-Identifier: AGPL-3.0-only+# See the LICENSE file for details.++"""+Regression tests for SECUR-234.++``ProjectJoinEndpoint.post`` looked up the accepting user's existing+``ProjectMember`` row by ``(workspace_id, member)`` and omitted ``project_id``.+Accepting an invitation to project Y therefore reactivated whatever membership+row the user already had in the workspace -- typically a project they had been+removed from -- while project Y itself never received a membership row at all.+A companion no-op, ``project_member.role = project_member.role``, left the+stale row at its original role, so a removed ADMIN returned as ADMIN even+though the new invite was for a GUEST.+"""++import uuid++import pytest+from rest_framework import status+from rest_framework.test import APIClient++from plane.db.models import (+ Project,+ ProjectMember,+ ProjectMemberInvite,+)++ADMIN = 20+GUEST = 5+++def _join_url(slug: str, project_id: uuid.UUID, pk: uuid.UUID) -> str:+ return f"/api/workspaces/{slug}/projects/{project_id}/join/{pk}/"+++def _make_project(workspace, name: str, identifier: str) -> Project:+ return Project.objects.create(name=name, identifier=identifier, workspace=workspace)+++def _make_invite(project: Project, email: str, role: int) -> ProjectMemberInvite:+ return ProjectMemberInvite.objects.create(project=project, email=email, token=uuid.uuid4().hex, role=role)+++def _accept(user, invite: ProjectMemberInvite):+ client = APIClient()+ client.force_authenticate(user=user)+ return client.post(+ _join_url(invite.workspace.slug, invite.project_id, invite.id),+ {"token": invite.token, "accepted": True},+ format="json",+ )+++class TestProjectJoinCrossProjectActivation:+ def test_accepting_invite_creates_membership_on_the_invited_project(self, workspace, create_user):+ """The invited project gets the membership, even when another one already exists."""+ old_project = _make_project(workspace, "Sensitive Project", "SNS")+ invited_project = _make_project(workspace, "New Project", "NEW")+ ProjectMember.objects.create(project=old_project, member=create_user, role=ADMIN, is_active=False)+ invite = _make_invite(invited_project, create_user.email, GUEST)++ response = _accept(create_user, invite)++ assert response.status_code == status.HTTP_200_OK+ membership = ProjectMember.objects.get(project=invited_project, member=create_user)+ assert membership.is_active is True+ assert membership.role == GUEST++ def test_accepting_invite_does_not_reactivate_membership_on_another_project(self, workspace, create_user):+ """A membership the user was removed from stays inactive and keeps its role."""+ old_project = _make_project(workspace, "Sensitive Project", "SNS")+ invited_project = _make_project(workspace, "New Project", "NEW")+ removed = ProjectMember.objects.create(project=old_project, member=create_user, role=ADMIN, is_active=False)+ invite = _make_invite(invited_project, create_user.email, GUEST)++ response = _accept(create_user, invite)++ assert response.status_code == status.HTTP_200_OK+ removed.refresh_from_db()+ assert removed.is_active is False+ assert removed.role == ADMIN++ def test_reactivating_membership_on_the_invited_project_applies_the_invite_role(self, workspace, create_user):+ """Re-joining a project the user was removed from grants the invite's role, not the old one."""+ invited_project = _make_project(workspace, "New Project", "NEW")+ removed = ProjectMember.objects.create(project=invited_project, member=create_user, role=ADMIN, is_active=False)+ invite = _make_invite(invited_project, create_user.email, GUEST)++ response = _accept(create_user, invite)++ assert response.status_code == status.HTTP_200_OK+ removed.refresh_from_db()+ assert removed.is_active is True+ assert removed.role == GUEST