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

Merge pull request #2880 from AlanCoding/2870_null_data_access

Browse Source 
Browseable API POST box fixes
This commit is contained in:
Alan Rominger
2016-07-08 15:30:18 -04:00
committed by GitHub
parent 7ac59d952b 5027027aba
commit fbde6355bf
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/main/access.py
View File

@@ -589,8 +589,9 @@ class CredentialAccess(BaseAccess):
def can_read(self, obj): def can_read(self, obj):
return self.user in obj.read_role return self.user in obj.read_role
@check_superuser
def can_add(self, data): def can_add(self, data):
if self.user.is_superuser: if not data: # So the browseable API will work
return True return True
user_pk = get_pk_from_dict(data, 'user') user_pk = get_pk_from_dict(data, 'user')
if user_pk: if user_pk:
@@ -660,6 +661,8 @@ class TeamAccess(BaseAccess):
@check_superuser @check_superuser
def can_add(self, data): def can_add(self, data):
if not data: # So the browseable API will work
return Organization.accessible_objects(self.user, 'admin_role').exists()
org_pk = get_pk_from_dict(data, 'organization') org_pk = get_pk_from_dict(data, 'organization')
org = get_object_or_400(Organization, pk=org_pk) org = get_object_or_400(Organization, pk=org_pk)
if self.user in org.admin_role: if self.user in org.admin_role:
@@ -722,7 +725,7 @@ class ProjectAccess(BaseAccess):
@check_superuser @check_superuser
def can_add(self, data): def can_add(self, data):
if not data or '_method' in data: if not data: # So the browseable API will work
return Organization.accessible_objects(self.user, 'admin_role').exists() return Organization.accessible_objects(self.user, 'admin_role').exists()
organization_pk = get_pk_from_dict(data, 'organization') organization_pk = get_pk_from_dict(data, 'organization')
org = get_object_or_400(Organization, pk=organization_pk) org = get_object_or_400(Organization, pk=organization_pk)
@@ -804,7 +807,7 @@ class JobTemplateAccess(BaseAccess):
given action as well as the 'create' deploy permission. given action as well as the 'create' deploy permission.
Users who are able to create deploy jobs can also run normal and check (dry run) jobs. Users who are able to create deploy jobs can also run normal and check (dry run) jobs.
''' '''
if not data or '_method' in data: # So the browseable API will work? if not data: # So the browseable API will work
return True return True
# if reference_obj is provided, determine if it can be coppied # if reference_obj is provided, determine if it can be coppied
@@ -994,7 +997,7 @@ class JobAccess(BaseAccess):
Q(project__organization__in=org_access_qs)).distinct() Q(project__organization__in=org_access_qs)).distinct()
def can_add(self, data): def can_add(self, data):
if not data or '_method' in data: # So the browseable API will work? if not data: # So the browseable API will work
return True return True
if not self.user.is_superuser: if not self.user.is_superuser:
return False return False
@@ -1096,7 +1099,7 @@ class AdHocCommandAccess(BaseAccess):
inventory__in=inventory_qs) inventory__in=inventory_qs)
def can_add(self, data): def can_add(self, data):
if not data or '_method' in data: # So the browseable API will work? if not data: # So the browseable API will work
return True return True
self.check_license() self.check_license()
@@ -1445,7 +1448,7 @@ class LabelAccess(BaseAccess):
@check_superuser @check_superuser
def can_add(self, data): def can_add(self, data):
if not data or '_method' in data: # So the browseable API will work? if not data: # So the browseable API will work
return True return True
org_pk = get_pk_from_dict(data, 'organization') org_pk = get_pk_from_dict(data, 'organization')
@@ -1552,6 +1555,8 @@ class CustomInventoryScriptAccess(BaseAccess):
@check_superuser @check_superuser
def can_add(self, data): def can_add(self, data):
if not data: # So the browseable API will work
return Organization.accessible_objects(self.user, 'admin_role').exists()
org_pk = get_pk_from_dict(data, 'organization') org_pk = get_pk_from_dict(data, 'organization')
org = get_object_or_400(Organization, pk=org_pk) org = get_object_or_400(Organization, pk=org_pk)
return self.user in org.admin_role return self.user in org.admin_role