shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Prohibit adding singleton permissions as child of team

Browse Source
This commit is contained in:
AlanCoding 2016-12-07 08:42:39 -05:00
parent 95f54b59cf
commit 3663c97ac2
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
awx/api/views.py
View File

@ -939,6 +939,10 @@ class TeamRolesList(SubListCreateAttachDetachAPIView):
data = dict(msg=_("You cannot assign an Organization role as a child role for a Team.")) data = dict(msg=_("You cannot assign an Organization role as a child role for a Team."))
return Response(data, status=status.HTTP_400_BAD_REQUEST) return Response(data, status=status.HTTP_400_BAD_REQUEST)
if role.is_singleton():
data = dict(msg=_("You cannot grant system-level permissions to a team."))
return Response(data, status=status.HTTP_400_BAD_REQUEST)
team = get_object_or_404(Team, pk=self.kwargs['pk']) team = get_object_or_404(Team, pk=self.kwargs['pk'])
credential_content_type = ContentType.objects.get_for_model(Credential) credential_content_type = ContentType.objects.get_for_model(Credential)
if role.content_type == credential_content_type: if role.content_type == credential_content_type:
@ -4179,6 +4183,11 @@ class RoleTeamsList(SubListAPIView):
action = 'attach' action = 'attach'
if request.data.get('disassociate', None): if request.data.get('disassociate', None):
action = 'unattach' action = 'unattach'
if role.is_singleton() and action == 'attach':
data = dict(msg=_("You cannot grant system-level permissions to a team."))
return Response(data, status=status.HTTP_400_BAD_REQUEST)
if not request.user.can_access(self.parent_model, action, role, team, if not request.user.can_access(self.parent_model, action, role, team,
self.relationship, request.data, self.relationship, request.data,
skip_sub_obj_read_check=False): skip_sub_obj_read_check=False):

3
awx/main/models/rbac.py
View File

@ -427,6 +427,9 @@ class Role(models.Model):
def is_ancestor_of(self, role): def is_ancestor_of(self, role):
return role.ancestors.filter(id=self.id).exists() return role.ancestors.filter(id=self.id).exists()
def is_singleton(self):
return self.singleton_name in [ROLE_SINGLETON_SYSTEM_ADMINISTRATOR, ROLE_SINGLETON_SYSTEM_AUDITOR]
class RoleAncestorEntry(models.Model): class RoleAncestorEntry(models.Model):