External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3062 from AlanCoding/3037_orphan_proj

Browse Source 
orphan project protection in job delete access (API 3.0.1)
This commit is contained in:
Alan Rominger
2016-07-21 11:57:58 -04:00
committed by GitHub
parent 9513a14ac6 fc96952084
commit 07a1f4bee2
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/access.py
View File

@@ -1081,7 +1081,8 @@ class JobAccess(BaseAccess):
def can_delete(self, obj): def can_delete(self, obj):
if obj.inventory is not None and self.user in obj.inventory.organization.admin_role: if obj.inventory is not None and self.user in obj.inventory.organization.admin_role:
return True return True
if obj.project is not None and self.user in obj.project.organization.admin_role: if (obj.project is not None and obj.project.organization is not None and
self.user in obj.project.organization.admin_role):
return True return True
return False return False

6
awx/main/tests/functional/test_rbac_job.py
View File

@@ -92,6 +92,12 @@ def test_null_related_delete_denied(normal_job, rando):
access = JobAccess(rando) access = JobAccess(rando)
assert not access.can_delete(normal_job) assert not access.can_delete(normal_job)
@pytest.mark.django_db
def test_delete_job_with_orphan_proj(normal_job, rando):
normal_job.project.organization = None
access = JobAccess(rando)
assert not access.can_delete(normal_job)
@pytest.mark.django_db @pytest.mark.django_db
def test_inventory_org_admin_delete_allowed(normal_job, org_admin): def test_inventory_org_admin_delete_allowed(normal_job, org_admin):
normal_job.project = None # do this so we test job->inventory->org->admin connection normal_job.project = None # do this so we test job->inventory->org->admin connection