Attachment #5300 for bug #31861




		self.signal_new( 'authenticated' )
		self.__credentials = None

	def _create_modules( self, **kwargs ):
		global _all_modules
		self._modules = []
		for mod in _all_modules:
			try:
				instance = mod( kwargs['username'] , kwargs['password'] )
				instance.signal_connect( 'auth_return', self._auth_return )
				instance.signal_connect( 'password_changed', self._password_changed )
				self._modules.append( instance )
			except Exception, e:
				AUTH.warn( "AuthHandler - _create_modules error: %s" % str( e ) )
		self._modules.reverse()
	  
	def authenticate( self, **kwargs ):
		try:
			if kwargs['auth_type'] == "saml":
				AUTH.warn('__starting SAML Authenticate __')
								
			self._create_modules( **kwargs )
			self._current = self._modules.pop()
			self.__new_password = kwargs['new_password']
			self._current.authenticate()
			self.__credentials = ( kwargs['username'], kwargs['password'] )
		except Exception, e:
			AUTH.warn( "authenticate.... error: %s" % str( e ) )

	def authenticate( self, username, password, new_password=None ):
		self._create_modules( username, password )
		self._current = self._modules.pop()
		self.__new_password = new_password
		self._current.authenticate()
		self.__credentials = ( username, password )

	def credentials( self ):
		return self.__credentials




# <http://www.gnu.org/licenses/>.

"""Provides a class :class:`.Client` that implements an UMCP client"""

import errno, os, socket, sys, fcntl

from univention.lib.i18n import Translation

		else:
			self.signal_emit( 'error', UnknownRequestError() )

	def authenticate( self, **kwargs ):
		"""Authenticate against the UMC server"""
		authRequest = Request ('AUTH' )
		
		for opt in kwargs:
			authRequest.body[opt] = kwargs[opt]

		self.request( authRequest )





Defines the basic class for an UMC server.
"""


# python packages
import fcntl
import gzip

		elif msg.command == 'AUTH':
			state.authResponse = Response( msg )
			try:
				state.authenticate( **{'auth_type':msg.body[ 'auth_type' ],'username':msg.body[ 'username' ], 'password':msg.body[ 'password' ], 'new_password':msg.body.get( 'new_password' )} )
			except ( TypeError, KeyError ), e:
				state.authResponse.status = BAD_REQUEST_INVALID_OPTS
				state.authResponse.message = 'insufficient authentification information'


	def _connection( self, socket ):
		'''Signal callback: Invoked on incoming connections.'''

		socket, addr = socket.accept()
		socket.setblocking( 0 )
		if addr:

(-)original/univention-management-console/src/univention/management/console/protocol/session.py (-3 / +3 lines)

Lines 99-108 class State( signals.Provider ):	Link Here

	def _authenticated( self, success ):

	def _authenticated( self, success ):

100

		self.signal_emit( 'authenticated', success, self )

100

		self.signal_emit( 'authenticated', success, self )

101

102

	def authenticate( self, username, password, new_password=None ):

102

	def authenticate( self,  **kwargs  ):

103

		"""Initiates an authentication process"""

103

		"""Initiates an authentication process"""

104

		self.username = username

104

		self.username = kwargs['username']

105

		self.__auth.authenticate( username, password, new_password )

105

		self.__auth.authenticate( **kwargs )

106

107

	def credentials( self ):

107

	def credentials( self ):

108

		"""Returns the credentials"""

108

		"""Returns the credentials"""




		self._auth_response = umcp.Response( request )
		self._auth_response.body['sessionid'] = request.body.get('sessionid','')
		self._auth_response_queue = response_queue
		self.client.authenticate( **request.body )

	def _response(self, response):
		"""Queue response from UMC server."""

			body = cherrypy.request.body.read()

		json = self.load_json(body)

		CORE.info('CPRoot/command: request: command=%s' % cherrypy.request.path_info )

		# create new UMCP request
		req = umcp.Request( 'AUTH' )
		for opt in json['options']:
			req.body[opt] = json['options'][opt]
		req.body[ 'new_password' ] = json[ 'options' ].get('new_password')	

		# create new response queue		
		response_queue = Queue.Queue()

		# send request to UMC server

Return to bug 31861