diff --git a/gns3server/api/routes/controller/groups.py b/gns3server/api/routes/controller/groups.py index 4022a6053..19e33a1b9 100644 --- a/gns3server/api/routes/controller/groups.py +++ b/gns3server/api/routes/controller/groups.py @@ -140,7 +140,7 @@ async def delete_user_group( success = await users_repo.delete_user_group(user_group_id) if not success: raise ControllerError(f"User group '{user_group_id}' could not be deleted") - await rbac_repo.delete_all_ace_starting_with_path(f"/groups/{user_group_id}") + await rbac_repo.delete_all_ace_starting_with_path(f"/access/groups/{user_group_id}") @router.get( diff --git a/gns3server/api/routes/controller/roles.py b/gns3server/api/routes/controller/roles.py index 119738dd2..4b2441b24 100644 --- a/gns3server/api/routes/controller/roles.py +++ b/gns3server/api/routes/controller/roles.py @@ -135,7 +135,7 @@ async def delete_role( success = await rbac_repo.delete_role(role_id) if not success: raise ControllerError(f"Role '{role_id}' could not be deleted") - await rbac_repo.delete_all_ace_starting_with_path(f"/roles/{role_id}") + await rbac_repo.delete_all_ace_starting_with_path(f"/access/roles/{role_id}") @router.get( diff --git a/gns3server/api/routes/controller/users.py b/gns3server/api/routes/controller/users.py index 8f4eeef70..f68078f72 100644 --- a/gns3server/api/routes/controller/users.py +++ b/gns3server/api/routes/controller/users.py @@ -290,7 +290,7 @@ async def delete_user( success = await users_repo.delete_user(user_id) if not success: raise ControllerError(f"User '{user_id}' could not be deleted") - await rbac_repo.delete_all_ace_starting_with_path(f"/users/{user_id}") + await rbac_repo.delete_all_ace_starting_with_path(f"/access/users/{user_id}") @router.get( diff --git a/tests/api/routes/controller/test_groups.py b/tests/api/routes/controller/test_groups.py index 5451293f7..87f62be17 100644 --- a/tests/api/routes/controller/test_groups.py +++ b/tests/api/routes/controller/test_groups.py @@ -20,7 +20,9 @@ from fastapi import FastAPI, status from httpx import AsyncClient from sqlalchemy.ext.asyncio import AsyncSession +from gns3server.db.repositories.rbac import RbacRepository from gns3server.db.repositories.users import UsersRepository +from gns3server.schemas.controller.rbac import ACECreate from gns3server.schemas.controller.users import User, UserGroupCreate pytestmark = pytest.mark.asyncio @@ -84,6 +86,36 @@ class TestGroupRoutes: response = await client.delete(app.url_path_for("delete_user_group", user_group_id=group_in_db.user_group_id)) assert response.status_code == status.HTTP_403_FORBIDDEN + async def test_delete_group_removes_ace_on_group_path( + self, app: FastAPI, client: AsyncClient, db_session: AsyncSession + ) -> None: + """ + A user ACE on the group path is not covered by the group_id foreign key + cascade: deleting the group must remove it by path. + """ + + response = await client.post(app.url_path_for("create_user_group"), json={"name": "ace_cleanup_group"}) + assert response.status_code == status.HTTP_201_CREATED + group_id = response.json()["user_group_id"] + + # any existing user works: the ACE references the user, not the group + user = await UsersRepository(db_session).get_user_by_username("admin") + role_id = (await RbacRepository(db_session).get_role_by_name("User")).role_id + rbac_repo = RbacRepository(db_session) + await rbac_repo.create_ace( + ACECreate( + path=f"/access/groups/{group_id}", + ace_type="user", + propagate=False, + user_id=str(user.user_id), + role_id=str(role_id), + ) + ) + + response = await client.delete(app.url_path_for("delete_user_group", user_group_id=group_id)) + assert response.status_code == status.HTTP_204_NO_CONTENT + assert await rbac_repo.check_ace_exists(f"/access/groups/{group_id}") is False + class TestGroupMembersRoutes: async def test_add_to_group_already_member( diff --git a/tests/api/routes/controller/test_users.py b/tests/api/routes/controller/test_users.py index 0d59363a6..fd5d3aad4 100644 --- a/tests/api/routes/controller/test_users.py +++ b/tests/api/routes/controller/test_users.py @@ -150,6 +150,36 @@ class TestUserRoutes: assert response.status_code == status.HTTP_200_OK assert len(response.json()) == 4 # admin, user1, user2 and user3 should exist + async def test_delete_user_removes_ace_on_user_path( + self, app: FastAPI, client: AsyncClient, db_session: AsyncSession + ) -> None: + """ + A group ACE on the user path is not covered by the user_id foreign key + cascade: deleting the user must remove it by path. + """ + + new_user = {"username": "ace_cleanup_user", "email": "ace_cleanup_user@email.com", "password": "test_password"} + response = await client.post(app.url_path_for("create_user"), json=new_user) + assert response.status_code == status.HTTP_201_CREATED + user_id = response.json()["user_id"] + + group_id = (await UsersRepository(db_session).get_user_group_by_name("Users")).user_group_id + role_id = (await RbacRepository(db_session).get_role_by_name("User")).role_id + rbac_repo = RbacRepository(db_session) + await rbac_repo.create_ace( + ACECreate( + path=f"/access/users/{user_id}", + ace_type="group", + propagate=False, + group_id=str(group_id), + role_id=str(role_id), + ) + ) + + response = await client.delete(app.url_path_for("delete_user", user_id=user_id)) + assert response.status_code == status.HTTP_204_NO_CONTENT + assert await rbac_repo.check_ace_exists(f"/access/users/{user_id}") is False + class TestAuthTokens: async def test_can_create_token_successfully(