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

adjusting access based on PR feedback

Browse Source
This commit is contained in:
Wayne Witzel III
2016-04-13 13:06:08 -04:00
parent e53c2bdfa5
commit c2e9237b14
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/main/access.py
View File

@@ -773,10 +773,6 @@ class JobTemplateAccess(BaseAccess):
if self.user.is_superuser: if self.user.is_superuser:
return True return True
# Must have an inventory if you are not a superuser.
if obj.inventory is None:
return False
if obj.job_type == PERM_INVENTORY_SCAN: if obj.job_type == PERM_INVENTORY_SCAN:
# Scan job with default project, must have JT execute or be org admin # Scan job with default project, must have JT execute or be org admin
if obj.project is None and obj.inventory: if obj.project is None and obj.inventory:
@@ -859,14 +855,18 @@ class JobAccess(BaseAccess):
# A super user can relaunch a job # A super user can relaunch a job
if self.user.is_superuser: if self.user.is_superuser:
return True return True
# If a user can launch the job template then they can relaunch a job from that # If a user can launch the job template then they can relaunch a job from that
# job template # job template
has_perm = False if obj.job_template is not None:
if obj.job_template is not None and obj.job_template.accessible_by(self.user, {'execute':True}): return obj.job_template.accessible_by(self.user, {'execute': True})
has_perm = True
dep_access_inventory = obj.inventory.accessible_by(self.user, {'use':True}) inventory_access = obj.inventory.accessible_by(self.user, {'use':True})
dep_access_project = obj.project is None or obj.project.accessible_by(self.user, {'read':True})
return self.can_read(obj) and dep_access_inventory and dep_access_project and has_perm org_access = obj.inventory.organization.accessible_by(self.user, ALL_PERMISSIONS)
project_access = obj.project is None or obj.project.accessible_by(self.user, ALL_PERMISSIONS)
return inventory_access and (org_access or project_access)
def can_cancel(self, obj): def can_cancel(self, obj):
return self.can_read(obj) and obj.can_cancel return self.can_read(obj) and obj.can_cancel