Attachment #5436 for bug #24422

View | Details | Raw Unified | Return to bug 24422
Collapse All | Expand All

(-)univention-management-console-frontend/univention-management-console-web-server (-21 / +17 lines)

Lines 34-40	Link Here

import cherrypy

import cherrypy

import httplib

import httplib

import os

import os

import threading

import Queue

import Queue

from optparse import OptionParser

from optparse import OptionParser

import simplejson

import simplejson

Lines 75-80	Link Here

		except (cherrypy.HTTPError, cherrypy.HTTPRedirect):

		except (cherrypy.HTTPError, cherrypy.HTTPRedirect):

			# ignore common cherrypy exceptions

			# ignore common cherrypy exceptions

			raise

			raise

		except (KeyboardInterrupt, SystemExit):

			# ignore

			raise

		except Exception, ex:

		except Exception, ex:

			CORE.error('Traceback in %s(%r, %r):\n%s' % (f.__name__, args, kwargs, traceback.format_exc()))

			CORE.error('Traceback in %s(%r, %r):\n%s' % (f.__name__, args, kwargs, traceback.format_exc()))

			raise

			raise

Lines 420-425	Link Here

420

		self._log(99, 'sessionid="%s"' % (sessionid))

422

		self._log(99, 'sessionid="%s"' % (sessionid))

421

		return sessionid

423

		return sessionid

422

424

425

	def set_session_id(self, sessionid):

426

		# set the cookie once during successful authentication

427

		# force expiration of cookie in 5 years from now on...

428

		# IE does not support max-age

429

		expiration = datetime.datetime.now()

430

		expiration = expiration.replace(year=expiration.year + 5)

431

		expirationStr = expiration.strftime("%a, %d-%b-%Y %H:%M:%S GMT")

432

		cherrypy.response.cookie['UMCSessionId'] = sessionid

433

		cherrypy.response.cookie['UMCSessionId']['expires'] = expirationStr

434

		cherrypy.response.cookie['UMCSessionId']['version'] = 1

435

		cherrypy.response.cookie['UMCSessionId']['path'] = '/'

436

423

	@logExceptions

437

	@logExceptions

424

	def load_json(self, body):

438

	def load_json(self, body):

425

		try:

439

		try:

Lines 511-526	Link Here

511

			# update IP address of sesssion ==> address changes during single sign on

525

			# update IP address of sesssion ==> address changes during single sign on

512

			UMCP_Dispatcher.sessions[login_token.sessionid].ip = self.get_ip_address()

526

			UMCP_Dispatcher.sessions[login_token.sessionid].ip = self.get_ip_address()

513

527

514

			# set the cookie once during successful authentication

528

			self.set_session_id(login_token.sessionid)

515

			# force expiration of cookie in 5 years from now on...

516

			# IE does not support max-age

517

			expiration = datetime.datetime.now()

518

			expiration = expiration.replace(year=expiration.year + 5)

519

			expirationStr = expiration.strftime("%a, %d-%b-%Y %H:%M:%S GMT")

520

			cherrypy.response.cookie['UMCSessionId'] = login_token.sessionid

521

			cherrypy.response.cookie['UMCSessionId']['expires'] = expirationStr

522

			cherrypy.response.cookie['UMCSessionId']['version'] = 1

523

			cherrypy.response.cookie['UMCSessionId']['path'] = '/'

524

			cherrypy.response.cookie['UMCUsername'] = login_token.username

529

			cherrypy.response.cookie['UMCUsername'] = login_token.username

525

			cherrypy.response.cookie['UMCUsername']['expires'] = expirationStr

530

			cherrypy.response.cookie['UMCUsername']['expires'] = expirationStr

526

			cherrypy.response.cookie['UMCUsername']['version'] = 1

531

			cherrypy.response.cookie['UMCUsername']['version'] = 1

Lines 683-698	Link Here

683

			# add new one time session

688

			# add new one time session

684

			UMCP_Dispatcher.logintokens.add_session(response.body.get('sessionid'), json[ 'options' ].get('username',''))

689

			UMCP_Dispatcher.logintokens.add_session(response.body.get('sessionid'), json[ 'options' ].get('username',''))

685

690

686

			# set the cookie once during successful authentication

691

			self.set_session_id(response.body.get('sessionid'))

687

			# force expiration of cookie in 5 years from now on...

688

			# IE does not support max-age

689

			expiration = datetime.datetime.now()

690

			expiration = expiration.replace(year=expiration.year + 5)

691

			expirationStr = expiration.strftime("%a, %d-%b-%Y %H:%M:%S GMT")

692

			cherrypy.response.cookie['UMCSessionId'] = response.body.get('sessionid')

693

			cherrypy.response.cookie['UMCSessionId']['expires'] = expirationStr

694

			cherrypy.response.cookie['UMCSessionId']['version'] = 1

695

			cherrypy.response.cookie['UMCSessionId']['path'] = '/'

696

692

697

			return ""

693

			return ""

698

694

(-)univention-management-console-module-lib/umc/python/lib/server.py (-1 / +1 lines)

Lines 170-176	Link Here

170

		opener.add_handler(urllib2.HTTPCookieProcessor(cookie_jar))

170

		opener.add_handler(urllib2.HTTPCookieProcessor(cookie_jar))

171

		MODULE.process('Sending request...')

171

		MODULE.process('Sending request...')

172

		try:

172

		try:

173

			response = opener.open(urllib2.Request(url, body, {'Content-Type': 'application/json'}))

173

			response = opener.open(urllib2.Request(url, body, {'Content-Type': 'application/json', 'User-Agent': 'UMC 2'}))

174

			MODULE.process('Got response ...')

174

			MODULE.process('Got response ...')

175

		except (urllib2.HTTPError, urllib2.URLError), ex:

175

		except (urllib2.HTTPError, urllib2.URLError), ex:

176

			MODULE.error('sso_getsession: unable to connect to %r: %s' % (host, ex))

176

			MODULE.error('sso_getsession: unable to connect to %r: %s' % (host, ex))

Return to bug 24422