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

allow multi-org expired licenses to delete orgs

Browse Source
This commit is contained in:
Chris Meyers 2015-11-12 15:33:00 -05:00
parent 908b1b4094
commit 97c56d451e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/access.py
View File

@ -146,7 +146,7 @@ class BaseAccess(object):
def can_unattach(self, obj, sub_obj, relationship):
return self.can_change(obj, None)
def check_license(self, add_host=False, feature=None):
def check_license(self, add_host=False, feature=None, check_expiration=True):
reader = TaskSerializer()
validation_info = reader.from_file()
if ('test' in sys.argv or 'jenkins' in sys.argv) and not os.environ.get('SKIP_LICENSE_FIXUP_FOR_TEST', ''):
@ -154,9 +154,9 @@ class BaseAccess(object):
validation_info['time_remaining'] = 99999999
validation_info['grace_period_remaining'] = 99999999
if validation_info.get('time_remaining', None) is None:
if check_expiration and validation_info.get('time_remaining', None) is None:
raise PermissionDenied("license is missing")
if validation_info.get("grace_period_remaining") <= 0:
if check_expiration and validation_info.get("grace_period_remaining") <= 0:
raise PermissionDenied("license has expired")
free_instances = validation_info.get('free_instances', 0)
@ -262,7 +262,7 @@ class OrganizationAccess(BaseAccess):
self.user in obj.admins.all())
def can_delete(self, obj):
self.check_license(feature='multiple_organizations')
self.check_license(feature='multiple_organizations', check_expiration=False)
return self.can_change(obj, None)
class InventoryAccess(BaseAccess):

1
awx/main/backend.py
View File

@ -114,7 +114,6 @@ class TowerSAMLIdentityProvider(BaseSAMLIdentityProvider):
Given the SAML attributes extracted from the SSO response, get
the user data like name.
"""
import os
attrs = dict()
for social_attr in django_settings.SOCIAL_AUTH_SAML_ATTRS_MAP:
map_attr = django_settings.SOCIAL_AUTH_SAML_ATTRS_MAP[social_attr]