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

fix special case where orphan JTs can not be edited by system admins in UI

Browse Source
This commit is contained in:
AlanCoding
2017-02-16 14:48:20 -05:00
parent dac2045d49
commit 6b45aa758c
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/access.py
View File

@@ -358,6 +358,9 @@ class BaseAccess(object):
# Grab the answer from the cache, if available # Grab the answer from the cache, if available
if hasattr(obj, 'capabilities_cache') and display_method in obj.capabilities_cache: if hasattr(obj, 'capabilities_cache') and display_method in obj.capabilities_cache:
user_capabilities[display_method] = obj.capabilities_cache[display_method] user_capabilities[display_method] = obj.capabilities_cache[display_method]
if self.user.is_superuser and not user_capabilities[display_method]:
# Cache override for models with bad orphaned state
user_capabilities[display_method] = True
continue continue
# Aliases for going form UI language to API language # Aliases for going form UI language to API language

18
awx/main/tests/functional/test_rbac_job_templates.py
View File

@@ -227,11 +227,19 @@ def test_job_template_access_org_admin(jt_objects, rando):
@pytest.mark.django_db @pytest.mark.django_db
def test_orphan_JT_readable_by_system_auditor(job_template, system_auditor): class TestOrphanJobTemplate:
assert system_auditor.is_system_auditor
assert job_template.project is None def test_orphan_JT_readable_by_system_auditor(self, job_template, system_auditor):
access = JobTemplateAccess(system_auditor) assert system_auditor.is_system_auditor
assert access.can_read(job_template) assert job_template.project is None
access = JobTemplateAccess(system_auditor)
assert access.can_read(job_template)
def test_system_admin_orphan_capabilities(self, job_template, admin_user):
job_template.capabilities_cache = {'edit': False}
access = JobTemplateAccess(admin_user)
capabilities = access.get_user_capabilities(job_template, method_list=['edit'])
assert capabilities['edit']
@pytest.mark.django_db @pytest.mark.django_db