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

Obfuscate the license engine... implements AC-1069

Browse Source
This commit is contained in:
Matthew Jones
2014-04-03 15:48:48 -04:00
parent 70db6fadfc
commit 2587fe9f18
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/access.py
View File

@@ -15,7 +15,7 @@ from rest_framework.exceptions import ParseError, PermissionDenied
# AWX # AWX
from awx.main.utils import * from awx.main.utils import *
from awx.main.models import * from awx.main.models import *
from awx.main.licenses import LicenseReader from awx.main.task_engine import TaskSerializer
__all__ = ['get_user_queryset', 'check_user_access'] __all__ = ['get_user_queryset', 'check_user_access']
@@ -351,7 +351,7 @@ class HostAccess(BaseAccess):
return False return False
# Check to see if we have enough licenses # Check to see if we have enough licenses
reader = LicenseReader() reader = TaskSerializer()
validation_info = reader.from_file() validation_info = reader.from_file()
if 'test' in sys.argv: if 'test' in sys.argv:

6
awx/main/tests/licenses.py
View File

@@ -11,7 +11,7 @@ from django.test.client import Client
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from awx.main.models import Host, Inventory, Organization from awx.main.models import Host, Inventory, Organization
from awx.main.tests.base import BaseTest from awx.main.tests.base import BaseTest
from awx.main.licenses import * from awx.main.task_engine import *
class LicenseTests(BaseTest): class LicenseTests(BaseTest):
@@ -36,7 +36,7 @@ class LicenseTests(BaseTest):
def test_license_writer(self): def test_license_writer(self):
writer = LicenseWriter( writer = TaskEngager(
company_name='acmecorp', company_name='acmecorp',
contact_name='Michael DeHaan', contact_name='Michael DeHaan',
contact_email='michael@ansibleworks.com', contact_email='michael@ansibleworks.com',
@@ -56,7 +56,7 @@ class LicenseTests(BaseTest):
strdata_loaded = json.loads(strdata) strdata_loaded = json.loads(strdata)
assert strdata_loaded == data assert strdata_loaded == data
reader = LicenseReader() reader = TaskSerializer()
vdata = reader.from_string(strdata) vdata = reader.from_string(strdata)