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

warn about legacy license usage in the licensing UI

Browse Source
This commit is contained in:
Ryan Petrello
2020-10-23 11:42:35 -04:00
parent 7f9784c443
commit e50c2c2867
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/api/views/root.py
View File

@@ -1,6 +1,7 @@
# Copyright (c) 2018 Ansible, Inc. # Copyright (c) 2018 Ansible, Inc.
# All Rights Reserved. # All Rights Reserved.
import base64
import json import json
import logging import logging
import operator import operator
@@ -353,6 +354,15 @@ class ApiV2ConfigView(APIView):
if 'license_key' in license_data: if 'license_key' in license_data:
return Response({"error": _('Legacy license submitted. A subscription manifest is now required.')}, status=status.HTTP_400_BAD_REQUEST) return Response({"error": _('Legacy license submitted. A subscription manifest is now required.')}, status=status.HTTP_400_BAD_REQUEST)
if 'manifest' in license_data: if 'manifest' in license_data:
try:
json_actual = json.loads(base64.b64decode(license_data['manifest']))
if 'license_key' in json_actual:
return Response(
{"error": _('Legacy license submitted. A subscription manifest is now required.')},
status=status.HTTP_400_BAD_REQUEST
)
except Exception:
pass
try: try:
license_data = validate_entitlement_manifest(license_data['manifest']) license_data = validate_entitlement_manifest(license_data['manifest'])
except ValueError as e: except ValueError as e: