Attachment #10166 for bug #46790

(-)a/base/univention-system-activation/src/wsgi.py (-2 / +11 lines)

Lines 2-7	Link Here

import cgi

import cgi

import subprocess

import subprocess

import traceback

import json

import json

import re

import re

from ldif import LDIFParser

from ldif import LDIFParser

Lines 69-75 def clean_license_output(out):	Link Here

def application(environ, start_response):

def application(environ, start_response):

	"""WSGI entry point"""

	def _error(message, trace=None):

		return {

			'status': 500,

			'message': message,

			'traceback': trace,

			'location': '',

	def _log(msg):

	def _log(msg):

		print >> environ['wsgi.errors'], msg

		print >> environ['wsgi.errors'], msg

Lines 91-97 def application(environ, start_response):	Link Here

			return _finish(data=out)

			return _finish(data=out)

		except subprocess.CalledProcessError as exc:

		except subprocess.CalledProcessError as exc:

			_log('Failed to read license data from LDAP:\n%s' % exc)

100

			_log('Failed to read license data from LDAP:\n%s' % exc)

			return _finish('400 Bad Request', 'Failed to read license data from LDAP:\n%s' % exc)

101

			return _finish('500 Internal Server Error', _error('Failed to read license data from LDAP:\n%s' % exc))

102

		except Exception as exc:

103

			return _finish(data=_error(str(exc), traceback.format_exc()))

104

	# block uploads that are larger than 1MB

105

	# block uploads that are larger than 1MB

	try:

106

	try:




	"umc/widgets/Text",
	"umc/widgets/TextBox",
	"put-selector/put",
	"umc/json!/license",
	"umc/i18n!systemactivation"
], function(declare, lang, array, Deferred, ioQuery, domQuery, request, xhr, script, Uploader, dialog, Wizard, Text, TextBox, put, _) {
	return declare("ActivationWizard", [ Wizard ], {
		autoFocus: true,
		entries: null,

			emailNode.innerHTML = email_address;

			// send the email
			xhr.get('/license', { handleAs: 'json' }).then(function(license) {
				var data = {
					email: email_address,
					licence: license
				};
				return xhr.post('https://license.univention.de/keyid/conversion/submit', {
					data: data,
					handleAs: 'text',
					headers: {
						'X-Requested-With': null
					}
				});
			}, function(error) {
				tools.handleErrorStatus(error);
			});
		},


Return to bug 46790