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

Generalize the python boolean converter so we can use it in RBAC methods

Browse Source
This commit is contained in:
Matthew Jones
2015-01-26 11:57:21 -05:00
parent 9447c092ac
commit b5db74a7d9
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
awx/api/filters.py
View File

@@ -17,7 +17,7 @@ from rest_framework.exceptions import ParseError
from rest_framework.filters import BaseFilterBackend from rest_framework.filters import BaseFilterBackend
# Ansible Tower # Ansible Tower
from awx.main.utils import get_type_for_model from awx.main.utils import get_type_for_model, to_python_boolean
class ActiveOnlyBackend(BaseFilterBackend): class ActiveOnlyBackend(BaseFilterBackend):
''' '''
@@ -116,17 +116,6 @@ class FieldLookupBackend(BaseFilterBackend):
new_lookup = '__'.join(new_parts) new_lookup = '__'.join(new_parts)
return field, new_lookup return field, new_lookup
def to_python_boolean(self, value, allow_none=False):
value = unicode(value)
if value.lower() in ('true', '1'):
return True
elif value.lower() in ('false', '0'):
return False
elif allow_none and value.lower() in ('none', 'null'):
return None
else:
raise ValueError(u'Unable to convert "%s" to boolean' % unicode(value))
def to_python_related(self, value): def to_python_related(self, value):
value = unicode(value) value = unicode(value)
if value.lower() in ('none', 'null'): if value.lower() in ('none', 'null'):
@@ -136,11 +125,11 @@ class FieldLookupBackend(BaseFilterBackend):
def value_to_python_for_field(self, field, value): def value_to_python_for_field(self, field, value):
if isinstance(field, models.NullBooleanField): if isinstance(field, models.NullBooleanField):
return self.to_python_boolean(value, allow_none=True) return to_python_boolean(value, allow_none=True)
elif isinstance(field, models.BooleanField): elif isinstance(field, models.BooleanField):
return self.to_python_boolean(value) return to_python_boolean(value)
elif isinstance(field, RelatedObject): elif isinstance(field, RelatedObject):
return self.to_python_related(value) return to_python_related(value)
else: else:
return field.to_python(value) return field.to_python(value)

4
awx/main/access.py
View File

@@ -184,14 +184,14 @@ class UserAccess(BaseAccess):
def can_add(self, data): def can_add(self, data):
if data is not None and 'is_superuser' in data: if data is not None and 'is_superuser' in data:
if bool(data['is_superuser']) and not self.user.is_superuser: if to_python_boolean(data['is_superuser'], allow_none=True) and not self.user.is_superuser:
return False return False
return bool(self.user.is_superuser or return bool(self.user.is_superuser or
self.user.admin_of_organizations.filter(active=True).exists()) self.user.admin_of_organizations.filter(active=True).exists())
def can_change(self, obj, data): def can_change(self, obj, data):
if data is not None and 'is_superuser' in data: if data is not None and 'is_superuser' in data:
if bool(data['is_superuser']) and not self.user.is_superuser: if to_python_boolean(data['is_superuser'], allow_none=True) and not self.user.is_superuser:
return False return False
# A user can be changed if they are themselves, or by org admins or # A user can be changed if they are themselves, or by org admins or
# superusers. Change permission implies changing only certain fields # superusers. Change permission implies changing only certain fields

10
awx/main/utils.py
View File

@@ -61,6 +61,16 @@ def get_object_or_403(klass, *args, **kwargs):
except queryset.model.MultipleObjectsReturned, e: except queryset.model.MultipleObjectsReturned, e:
raise PermissionDenied(*e.args) raise PermissionDenied(*e.args)
def to_python_boolean(value, allow_none=False):
value = unicode(value)
if value.lower() in ('true', '1'):
return True
elif value.lower() in ('false', '0'):
return False
elif allow_none and value.lower() in ('none', 'null'):
return None
else:
raise ValueError(u'Unable to convert "%s" to boolean' % unicode(value))
def camelcase_to_underscore(s): def camelcase_to_underscore(s):
''' '''