External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-20 20:50:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

remove can_update from RBAC checks

Browse Source
This commit is contained in:
AlanCoding
2017-08-04 12:03:41 -04:00
parent 59d52df6d9
commit dfda406090
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/access.py
View File

@@ -816,7 +816,7 @@ class InventorySourceAccess(BaseAccess):
def can_start(self, obj, validate_license=True): def can_start(self, obj, validate_license=True):
if obj and obj.inventory: if obj and obj.inventory:
return obj.can_update and self.user in obj.inventory.update_role return self.user in obj.inventory.update_role
return False return False

20
awx/main/tests/functional/test_rbac_workflow.py
View File

@@ -7,6 +7,8 @@ from awx.main.access import (
# WorkflowJobNodeAccess # WorkflowJobNodeAccess
) )
from awx.main.models import InventorySource
@pytest.fixture @pytest.fixture
def wfjt(workflow_job_template_factory, organization): def wfjt(workflow_job_template_factory, organization):
@@ -102,6 +104,10 @@ class TestWorkflowJobAccess:
access = WorkflowJobAccess(rando) access = WorkflowJobAccess(rando)
assert access.can_cancel(workflow_job) assert access.can_cancel(workflow_job)
@pytest.mark.django_db
class TestWFJTCopyAccess:
def test_copy_permissions_org_admin(self, wfjt, org_admin, org_member): def test_copy_permissions_org_admin(self, wfjt, org_admin, org_member):
admin_access = WorkflowJobTemplateAccess(org_admin) admin_access = WorkflowJobTemplateAccess(org_admin)
assert admin_access.can_copy(wfjt) assert admin_access.can_copy(wfjt)
@@ -126,6 +132,20 @@ class TestWorkflowJobAccess:
warnings = access.messages warnings = access.messages
assert 'inventories_unable_to_copy' in warnings assert 'inventories_unable_to_copy' in warnings
def test_workflow_copy_no_start(self, wfjt, inventory, admin_user):
# Test that un-startable resource doesn't block copy
inv_src = InventorySource.objects.create(
inventory = inventory,
source = 'custom',
source_script = None
)
assert not inv_src.can_update
wfjt.workflow_job_template_nodes.create(unified_job_template=inv_src)
access = WorkflowJobTemplateAccess(admin_user, save_messages=True)
access.can_copy(wfjt)
assert not access.messages
def test_workflow_copy_warnings_jt(self, wfjt, rando, job_template): def test_workflow_copy_warnings_jt(self, wfjt, rando, job_template):
wfjt.workflow_job_template_nodes.create(unified_job_template=job_template) wfjt.workflow_job_template_nodes.create(unified_job_template=job_template)
access = WorkflowJobTemplateAccess(rando, save_messages=True) access = WorkflowJobTemplateAccess(rando, save_messages=True)