Attachment #6012 for bug #33621

(-)modules/univention/s4connector/__init__.py (-3 / +6 lines)

Lines 31-37	Link Here

# /usr/share/common-licenses/AGPL-3; if not, see

# /usr/share/common-licenses/AGPL-3; if not, see

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

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

import sys, codecs, base64, string, os, cPickle, types, random, traceback, copy, time

import sys, codecs, string, os, cPickle, types, random, traceback, copy, time

import ldap

import ldap

import pdb

import pdb

import univention_baseconfig

import univention_baseconfig

Lines 41-46	Link Here

import univention.admin.objects

import univention.admin.objects

import univention.debug2 as ud

import univention.debug2 as ud

import base64

import base64

from samba.ndr import ndr_unpack

from samba.dcerpc import misc

from signal import *

from signal import *

term_signal_caught = False

term_signal_caught = False

Lines 623-629	Link Here

623

		print traceback with ud.debug, level is i.e. ud.INFO

625

		print traceback with ud.debug, level is i.e. ud.INFO

624

'''

626

'''

625

		_d=ud.function('ldap._debug_traceback')

627

		_d=ud.function('ldap._debug_traceback')

626

		exc_info = sys.exc_info()

627

628

		ud.debug(ud.LDAP, level, text)

629

		ud.debug(ud.LDAP, level, text)

629

		ud.debug(ud.LDAP, level, traceback.format_exc())

630

		ud.debug(ud.LDAP, level, traceback.format_exc())

Lines 1329-1335	Link Here

1329

				pass

1330

				pass

1330

1331

		try:

1332

		try:

1332

			guid = original_object.get('attributes').get('objectGUID')[0]

1333

			guid_unicode = original_object.get('attributes').get('objectGUID')[0]

1334

			guid_blob = guid_unicode.encode('ISO-8859-1')	## to compensate for __object_from_element

1335

			guid = str(ndr_unpack(misc.GUID, guid_blob))

1333

1336

1334

			object['changed_attributes'] = []

1337

			object['changed_attributes'] = []

1335

			if object['modtype'] == 'modify' and original_object:

1338

			if object['modtype'] == 'modify' and original_object:

(-)modules/univention/s4connector/s4/__init__.py (-1 / +1 lines)

Lines 32-38	Link Here

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

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

import string, ldap, sys, traceback, base64, time, pdb, os, copy, types

import string, ldap, sys, base64, time, pdb, os, copy, types

import array

import array

import univention.uldap

import univention.uldap

import univention.s4connector

import univention.s4connector




def func_name():
	return inspect.currentframe().f_back.f_code.co_name

def _is_base64(val):
	try:
		# It is not sufficient to run base64.decodestring to detect a base64 string.
		# When the ascii decode is not possible, it is not a base4 string.
		val.decode('ascii')
	except UnicodeDecodeError:
		return False
	try:
		# The string must be casted as str otherwise we saw something like this:
		#	11.02.2014 03:53:44,141 LDAP        (INFO): _is_base64 returns True for: Í8^Ml%'<U+0097>A²ôâ/! ^RÃ
		#	11.02.2014 03:53:44,142 LDAP        (WARNING): S4Cache: sqlite: near "<U+0097>A²ôâ": syntax error. SQL command was: [u"SELECT id FROM GUIDS WHERE guid='\xcd8\rl%'\x97A\xb2\xf4\xe2/! \x12\xc3';"
		base64.decodestring(str(val))
		return True
	except binascii.Error:
		return False

def _decode_base64(val):
	return base64.decodestring(val)


def _encode_base64(val):
	return base64.encodestring(val)

def _encode_guid(guid):
	# guid may be unicode

	if _is_base64(guid):
		return guid

	if type(guid) == type(u''):
		return guid.encode('ISO-8859-1').encode('base64')
	else:
		return unicode(guid,'latin').encode('ISO-8859-1').encode('base64')

def _decode_guid(guid):
	try:
		return base64.decodestring(guid)
	except binascii.Error:
		return guid


class EntryDiff(object):
	def __init__(self, old, new):
		self.old = old

	def add_entry(self, guid, entry):
		_d = ud.function('S4Cache.%s' % func_name())

		guid = _encode_guid(guid).strip()

		if not self._guid_exists(guid):
			self._add_entry(guid, entry)
		else:


		entry = {}

		guid = _encode_guid(guid)

		guid_id = self._get_guid_id(guid)

		if not guid_id:


		sql_commands = [
			"SELECT ATTRIBUTES.attribute,data.value from data \
					inner join ATTRIBUTES ON data.attribute_id=attributes.id where guid_id = %s;" % (guid_id,)
		]

		rows = self.__execute_sql_commands(sql_commands, fetch_result=True)

	def remove_entry(self, guid):
		_d = ud.function('S4Cache.%s' % func_name())

		guid = _encode_guid(guid)

		guid_id = self._get_guid_id(guid)

		if not guid_id:

			return None

		sql_commands = [
			"DELETE FROM data WHERE guid_id = '%(guid_id)s';" % {'guid_id': guid_id},
			"DELETE FROM guids WHERE id = '%(guid_id)s';" % {'guid_id': guid_id}
		]

		self.__execute_sql_commands(sql_commands, fetch_result=False)

		_d = ud.function('S4Cache.%s' % func_name())

		sql_commands = [
			"SELECT id FROM GUIDS WHERE guid='%s';" % (guid,)
		]

		rows = self.__execute_sql_commands(sql_commands, fetch_result=True)

		_d = ud.function('S4Cache.%s' % func_name())

		sql_commands = [
			"INSERT INTO GUIDS(guid) VALUES('%s');" % (guid,)
		]

		rows = self.__execute_sql_commands(sql_commands, fetch_result=False)

		_d = ud.function('S4Cache.%s' % func_name())

		sql_commands = [
			"SELECT id FROM ATTRIBUTES WHERE attribute='%s';" % (attr,)
		]

		rows = self.__execute_sql_commands(sql_commands, fetch_result=True)

		_d = ud.function('S4Cache.%s' % func_name())

		sql_commands = [
			"INSERT INTO ATTRIBUTES(attribute) VALUES('%s');" % (attr,)
		]

		self.__execute_sql_commands(sql_commands, fetch_result=False)

Return to bug 33621