Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ CHANGELOG

- Move from travis to github actions [lferran]

- Install managers group by default [lferran]

6.0.0b3 (2020-04-24)
--------------------
Expand Down
16 changes: 11 additions & 5 deletions guillotina/auth/groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,24 @@
import typing


MANAGER_ROLES = [
"guillotina.ContainerAdmin",
"guillotina.ContainerDeleter",
"guillotina.Owner",
"guillotina.Member",
"guillotina.Manager",
]


class GuillotinaGroup(GuillotinaUser):
def __init__(self, ident):
super(GuillotinaGroup, self).__init__(ident)
self.id = ident

if ident == "Managers":
# Special Case its a Root Manager user
self._roles["guillotina.ContainerAdmin"] = 1
self._roles["guillotina.ContainerDeleter"] = 1
self._roles["guillotina.Owner"] = 1
self._roles["guillotina.Member"] = 1
self._roles["guillotina.Manager"] = 1
for role in MANAGER_ROLES:
self._roles[role] = 1


@configure.utility(provides=IGroups)
Expand Down
15 changes: 14 additions & 1 deletion guillotina/contrib/dbusers/install.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from guillotina import configure
from guillotina.addons import Addon
from guillotina.auth.groups import MANAGER_ROLES
from guillotina.content import create_content_in_container
from guillotina.interfaces import ILayers
from guillotina.utils import get_authenticated_user_id
Expand All @@ -19,9 +20,21 @@ async def install(self, site, request):
await create_content_in_container(
site, "UserManager", "users", creators=(user,), title="Users", check_constraints=False
)
await create_content_in_container(
groups = await create_content_in_container(
site, "GroupManager", "groups", creators=(user,), title="Groups", check_constraints=False
)
users = {"root", user}
await create_content_in_container(
groups,
"Group",
"Managers",
creators=(user,),
title="Managers",
name="Managers",
description="Container managers",
user_roles=MANAGER_ROLES,
users=list(users),
)

@classmethod
async def uninstall(self, site, request):
Expand Down
21 changes: 11 additions & 10 deletions guillotina/tests/dbusers/test_manage_groups.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ async def test_ensure_crud_groups(dbusers_requester, user_data):
assert status_code == 201
resp, status_code = await requester("GET", "/db/guillotina/@groups")
assert status_code == 200
assert len(resp) == 1
assert resp[0]["groupname"] == "foo"
assert len(resp) == 2
assert resp[1]["groupname"] == "foo" or resp[0]["groupname"] == "foo"

data = {"roles": {"guillotina.Manager": True, "guillotina.Tester": True, "guillotina.Bad": False}}

Expand Down Expand Up @@ -78,23 +78,24 @@ async def test_ensure_crud_groups(dbusers_requester, user_data):
@pytest.mark.skipif(NOT_POSTGRES, reason="Only PG")
async def test_list_groups_works_with_catalog(dbusers_requester, user_data):
async with dbusers_requester as requester:
# Check initially there is no users
# Check initially there just one group
resp, status_code = await requester("GET", "/db/guillotina/@groups")
assert status_code == 200
assert len(resp) == 0
assert len(resp) == 1

# Add a user
# Add a group
resp, status_code = await requester("POST", "/db/guillotina/groups", data=json.dumps(_group))
assert status_code == 201

# Check it gets listed
resp, status_code = await requester("GET", "/db/guillotina/@groups")
assert status_code == 200
assert len(resp) == 1
assert resp[0]["@name"]
assert resp[0]["title"]
assert isinstance(resp[0]["roles"], list)
assert isinstance(resp[0]["users"], list)
assert len(resp) == 2
for group in resp:
assert group["@name"]
assert group["title"]
assert isinstance(group["roles"], list)
assert isinstance(group["users"], list)


@pytest.mark.app_settings(settings.DEFAULT_SETTINGS)
Expand Down
6 changes: 6 additions & 0 deletions guillotina/tests/dbusers/test_setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from . import settings
from guillotina.auth.groups import MANAGER_ROLES
from guillotina.tests.utils import get_container

import pytest
Expand All @@ -15,3 +16,8 @@ async def test_users_and_groups_folders_are_created_on_install(dbusers_requester
assert users.type_name == "UserManager"
groups = await container.async_get("groups")
assert groups.type_name == "GroupManager"
managers = await groups.async_get("Managers")
assert managers.type_name == "Group"
assert managers.title == "Managers"
assert managers.users == ["root"]
assert set(managers.user_roles) == set(MANAGER_ROLES)