Attachment #7455 for bug #39700




					name: 'start/join',
					label: _('Start join at the end of the installation'),
					value: true,
					disabled: !!this.ucr['umc/web/appliance/name'],
					onChange: lang.hitch(this, function(value) {
						this.getWidget('credentials-nonmaster', '_ucs_autosearch_master').set('disabled', !value);
						this.getWidget('credentials-nonmaster', '_ucs_address').set('disabled', !value || this.getWidget('credentials-nonmaster', '_ucs_autosearch_master').get('value'));

		_checkCredentials: function() {
			var params = {role: this._getRoleForDomainChecks(true)};
			lang.mixin(params, this._getCredentials());
			return this.umcpCommand('setup/check/credentials', params).then(function(data) {
				return data.result;
			});
		},

		_domainHasActivatedLicense: function () {
			var credentials = this._getCredentials();
			return this.umcpCommand('setup/check/license', credentials).then(function(data) {
				return data.result;
			});
		},

		_getCredentials: function() {
			var address, username, password, dns;
			var isAdMember = this._isAdMember();

			}

			if (pageName == 'credentials-ad' || pageName == 'credentials-nonmaster') {
				return this.standbyDuring(this._checkCredentials().then(lang.hitch(this, function(domain) {
					var msg = '';
					this._domainName = null;
					if (typeof domain == 'string') {
						this._domainName = domain;
						if (this.ucr['umc/web/appliance/name'] && pageName == 'credentials-nonmaster') {
							return this._domainHasActivatedLicense().then(lang.hitch(this, function(data) {
								if (!data) {
									msg = _('App Appliance could not be joined because the license on the DC Master is not activated.');
									nextPage = pageName;
									dialog.alert(msg);
								}
								return this._forcePageTemporarily(nextPage);
							}));
						}
					} else if (domain === false) {
						msg = _('Connection refused. Please recheck the password');
						nextPage = pageName;

					}

					return this._forcePageTemporarily(nextPage);
				})));
			}

			if (nextPage == 'software') {

(-)umc/setup.xml (+1 lines)

Lines 48-52	Link Here

		<command name="setup/check/credentials" function="check_credentials"/>

		<command name="setup/check/credentials" function="check_credentials"/>

		<command name="setup/set_locale" function="set_locale"/>

		<command name="setup/set_locale" function="set_locale"/>

		<command name="setup/net/progress" function="progress"/>

		<command name="setup/net/progress" function="progress"/>

		<command name="setup/check/license" function="domain_has_activated_license"/>

	</module>

	</module>

</umc>

</umc>

(-)umc/python/setup/__init__.py (-2 / +13 lines)

Lines 41-47	Link Here

import subprocess

import subprocess

import json

import json

import locale as _locale

import locale as _locale

import lxml.etree

import lxml.etree

import notifier

import notifier

import notifier.threads

import notifier.threads

Lines 237-244	Link Here

237

		oldrole = orgValues.get('server/role', '')

237

		oldrole = orgValues.get('server/role', '')

238

		newrole = values.get('server/role', oldrole)

238

		newrole = values.get('server/role', oldrole)

239

		if orgValues.get('joined'):

239

		if orgValues.get('joined'):

240

			raise Exception(_('Already joined systems cannot be joined.'))

240

			raise UMC_Error(_('Already joined systems cannot be joined.'))

241

242

		is_appliance = ucr.get('umc/web/appliance/name') != ''

243

		is_nonmaster = newrole != "domaincontroller_master"

244

		if is_appliance and is_nonmaster:

245

			activated = self._domain_has_activated_license(values.get('nameserver1'), username, password)

246

			if not activated:

247

				raise UMC_Error(_('App Appliance could not be joined because the license on the DC Master is not activated.'))

248

242

		def _thread(obj, username, password):

249

		def _thread(obj, username, password):

243

			# acquire the lock until the scripts have been executed

250

			# acquire the lock until the scripts have been executed

244

			self._finishedResult = False

251

			self._finishedResult = False

Lines 749-754	Link Here

749

		return result

756

		return result

750

757

751

	@simple_response

758

	@simple_response

759

	def domain_has_activated_license(self, nameserver, username, password):

760

		return util.domain_has_activated_license(nameserver, username, password)

761

762

	@simple_response

752

	def check_credentials(self, role, dns, nameserver, address, username, password):

763

	def check_credentials(self, role, dns, nameserver, address, username, password):

753

		if role == 'ad':

764

		if role == 'ad':

754

			try:

765

			try:




from univention.management.console.log import MODULE
from univention.management.console.modules import UMC_CommandError
from univention.lib.admember import lookup_adds_dc, failedADConnect
from univention.lib.umc_connection import UMCConnection

try:
	# execute imports in try/except block as during build test scripts are

		ipv4_nameserver=random.choice(ipv4_servers),
		ipv6_nameserver=random.choice(ipv6_servers),
	)

def domain_has_activated_license(nameserver, username, password):
	fqdn_master = get_fqdn(nameserver)
	if not fqdn_master:
		return False
	connection = UMCConnection(fqdn_master)
	connection.auth(username, password)
	result = connection.request('udm/license/info')
	if result.get('keyID'):
		return True
	else:
		return False

Return to bug 39700