External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 01:17:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Split unit tests & add access obj org sanity check.

Browse Source
This commit is contained in:
Aaron Tan
2016-10-13 17:06:37 -04:00
parent a0ea2337c6
commit f301cb0f9b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/access.py
View File

@@ -2053,7 +2053,7 @@ class CustomInventoryScriptAccess(BaseAccess):
@check_superuser @check_superuser
def can_admin(self, obj, data=None): def can_admin(self, obj, data=None):
org_pk = get_pk_from_dict(data, 'organization') org_pk = get_pk_from_dict(data, 'organization')
if obj and org_pk and obj.organization.pk != org_pk: if obj and org_pk and obj.organization and obj.organization.pk != org_pk:
org = get_object_or_400(Organization, pk=org_pk) org = get_object_or_400(Organization, pk=org_pk)
if self.user not in org.admin_role: if self.user not in org.admin_role:
return False return False

10
awx/main/tests/functional/test_rbac_inventory.py
View File

@@ -15,7 +15,7 @@ from awx.main.access import (
from django.apps import apps from django.apps import apps
@pytest.mark.django_db @pytest.mark.django_db
def test_custom_inv_script_access(organization, user, organization_factory): def test_custom_inv_script_access(organization, user):
u = user('user', False) u = user('user', False)
ou = user('oadm', False) ou = user('oadm', False)
@@ -30,8 +30,14 @@ def test_custom_inv_script_access(organization, user, organization_factory):
organization.admin_role.members.add(ou) organization.admin_role.members.add(ou)
assert ou in custom_inv.admin_role assert ou in custom_inv.admin_role
@pytest.mark.django_db
def test_modify_inv_script_foreign_org_admin(org_admin, organization, organization_factory, project):
custom_inv = CustomInventoryScript.objects.create(name='test', script='test', description='test')
custom_inv.organization = organization
custom_inv.save()
other_org = organization_factory('not-my-org').organization other_org = organization_factory('not-my-org').organization
access = CustomInventoryScriptAccess(ou) access = CustomInventoryScriptAccess(org_admin)
assert not access.can_change(custom_inv, {'organization': other_org.pk, 'name': 'new-project'}) assert not access.can_change(custom_inv, {'organization': other_org.pk, 'name': 'new-project'})
@pytest.mark.django_db @pytest.mark.django_db