Attachment 6828 Details for Bug 31059

[patch] patch

31059.patch (text/plain), 5.54 KB, created by Florian Best on 2015-04-16 14:44 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2015-04-16 14:44 CEST

Size: 5.54 KB

patch

obsolete

>diff --git a/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/__init__.py b/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/__init__.py
>index d90fdf3..9208950 100644
>--- a/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/__init__.py
>+++ b/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/__init__.py
>@@ -38,6 +38,7 @@
> from univention.management.console.modules.decorators import simple_response, file_upload
> 
> from univention.lib.i18n import Translation
>+from univention.lib.umc_connection import UMCConnection
> 
> from ucsschool.lib.schoolldap import LDAP_Connection, LDAP_ConnectionError, SchoolBaseModule
> import ucsschool.lib.internetrules as internetrules
>@@ -58,7 +59,7 @@
> from socket import error as SocketError
> 
> import util
>-from util import UMCConnection, Progress
>+from util import Progress
> 
> udm_modules.update()
> 
>@@ -210,7 +211,7 @@ def _thread():
> 						os.chown( itarget, 0, 0 )
> 
> 			# open a new connection to the master UMC
>-			connection = UMCConnection.get_machine_connection()
>+			connection = UMCConnection.get_machine_connection(MODULE.error)
> 			if not connection:
> 				MODULE.error('Could not connect to UMC on %s' % (ucr.get('ldap/master')))
> 				raise UMC_CommandError(_('Could not connect to master server %s.') % ucr.get('ldap/master'))
>@@ -325,7 +326,7 @@ def _thread():
> 			#   first step: acquire room
> 			#   second step: adjust room settings
> 			progress.component(_('Prepare room settings'))
>-			userConnection = UMCConnection('localhost', username=self._username, password=self._password)
>+			userConnection = UMCConnection('localhost', username=self._username, password=self._password, error_handler=MODULE.error)
> 			if not userConnection:
> 				MODULE.error('Could not connect to UMC on local server: %s' % e)
> 				raise UMC_CommandError(_('Could not connect to local UMC server.'))
>@@ -421,7 +422,7 @@ def _thread():
> 			progress.add_steps(10)
> 
> 			# open a new connection to the master UMC
>-			connection = UMCConnection.get_machine_connection()
>+			connection = UMCConnection.get_machine_connection(MODULE.error)
> 			if not connection:
> 				MODULE.error('Could not connect to UMC on %s' % (ucr.get('ldap/master')))
> 				raise UMC_CommandError(_('Could not connect to master server %s.') % ucr.get('ldap/master'))
>diff --git a/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/util.py b/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/util.py
>index a57ebf9..71e3b20 100644
>--- a/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/util.py
>+++ b/ucs-school-4.0r2/ucs-school-umc-exam/umc/python/schoolexam/util.py
>@@ -83,87 +83,3 @@ def error(self, err):
> 
> 	def add_steps(self, steps = 1):
> 		self._steps += steps
>-
>-### mostly copied from app_center/util.py -> should be refactored, see Bug #31059
>-class UMCConnection(object):
>-	def __init__(self, host, username=None, password=None):
>-		self._host = host
>-		self._headers = {
>-			'Content-Type' : 'application/json; charset=UTF-8'
>-		}
>-		if username is not None:
>-			self.auth(username, password)
>-
>-	### new method that was not in app_center/util.py
>-	@staticmethod
>-	def get_machine_connection():
>-		# open a new connection to the master UMC
>-		username = '%s$' % ucr.get('hostname')
>-		password = ''
>-		try:
>-			with open('/etc/machine.secret') as machineFile:
>-				password = machineFile.readline().strip()
>-		except (OSError, IOError) as e:
>-			MODULE.error('Could not read /etc/machine.secret: %s' % e)
>-		try:
>-			connection = UMCConnection(ucr.get('ldap/master'))
>-			connection.auth(username, password)
>-			return connection
>-		except (HTTPException, SocketError) as e:
>-			MODULE.error('Could not connect to UMC on %s: %s' % (ucr.get('ldap/master'), e))
>-		return None
>-
>-	def get_connection(self):
>-		# once keep-alive is over, the socket closes
>-		#   so create a new connection on every request
>-		return HTTPSConnection(self._host)
>-
>-	def auth(self, username, password):
>-		data = self.build_data({'username' : username, 'password' : password})
>-		con = self.get_connection()
>-		try:
>-			con.request('POST', '/umcp/auth', data)
>-		except Exception as e:
>-			# probably unreachable
>-			MODULE.warn(str(e))
>-			error_message = '%s: Authentication failed while contacting: %s' % (self._host, e)
>-			raise HTTPException(error_message)
>-		else:
>-			try:
>-				response = con.getresponse()
>-				cookie = response.getheader('set-cookie')
>-				if cookie is None:
>-					raise ValueError('No cookie')
>-				self._headers['Cookie'] = cookie
>-			except Exception as e:
>-				MODULE.warn(str(e))
>-				error_message = '%s: Authentication failed: %s' % (self._host, response.read())
>-				raise HTTPException(error_message)
>-
>-	def build_data(self, data, flavor=None):
>-		data = {'options' : data}
>-		if flavor:
>-			data['flavor'] = flavor
>-		return dumps(data)
>-
>-	def request(self, url, data=None, flavor=None):
>-		if data is None:
>-			data = {}
>-		data = self.build_data(data, flavor)
>-		con = self.get_connection()
>-		con.request('POST', '/umcp/command/%s' % url, data, headers=self._headers)
>-		response = con.getresponse()
>-		if response.status != 200:
>-			error_message = '%s on %s (%s): %s' % (response.status, self._host, url, response.read())
>-			if response.status == 403:
>-				# 403 is either command is unknown
>-				#   or command is known but forbidden
>-				# as the user was allowed to invoke the same command
>-				# on the local host, it means that the command
>-				# is unknown (older app center)
>-				MODULE.warn(error_message)
>-				raise NotImplementedError('command forbidden: %s' % url)
>-			raise HTTPException(error_message)
>-		content = response.read()
>-		return loads(content)['result']
>-

Actions: View | Diff

Attachments on bug 31059: 6828