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

Merge branch 'license_module_switch' into devel

Browse Source 
* license_module_switch:
  Hide eula if stub license is used
  Fix up some issues on feature validation for licenses
  Remove any references to internal licensing utilities
  Switch out existing obfuscated license with external module
This commit is contained in:
Matthew Jones
2017-07-13 11:08:47 -04:00
parent bbf8f2081d d5346ec6d0
commit 8e8324983b
12 changed files with 64 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/views.py
View File

@@ -279,7 +279,7 @@ class ApiV1ConfigView(APIView):
license_info=license_data,
version=get_awx_version(),
ansible_version=get_ansible_version(),
eula=render_to_string("eula.md"),
eula=render_to_string("eula.md") if license_data['license_type'] != 'open' else '',
analytics_status=pendo_state
)
@@ -323,9 +323,9 @@ class ApiV1ConfigView(APIView):
extra=dict(actor=request.user.username))
return Response({"error": _("Invalid JSON")}, status=status.HTTP_400_BAD_REQUEST)
try:
from awx.main.task_engine import TaskEnhancer
from awx.main.utils.common import get_licenser
license_data = json.loads(data_actual)
license_data_validated = TaskEnhancer(**license_data).validate_enhancements()
license_data_validated = get_licenser(**license_data).validate()
except Exception:
logger.warning(smart_text(u"Invalid license submitted."),
extra=dict(actor=request.user.username))