Attachment #4791 for bug #15723

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

(-)a/branches/ucs-3.1/ucs/base/univention-config-registry/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-config-registry (8.0.4-10) unstable; urgency=low

  * Fix locking and data corruption issue in UCR (Bug #15723)

 -- Philipp Hahn <hahn@univention.de>  Wed, 14 Nov 2012 17:32:42 +0100

univention-config-registry (8.0.4-9) unstable; urgency=low

univention-config-registry (8.0.4-9) unstable; urgency=low

  * Fix ucr unregister for Multifile (Bug #26476)

  * Fix ucr unregister for Multifile (Bug #26476)




					ConfigRegistry.BASES[reg])
		return _ConfigRegistry(filename=filename)

	def load(self, writable=False):
		"""Load registry from file."""
		for reg in self._registry:
			if isinstance(reg, _ConfigRegistry):
				reg.load(writable and reg is self._write_registry)
		strict = self.is_true('ucr/encoding/strict')
		for reg in self._registry:
			if isinstance(reg, _ConfigRegistry):

		"""Save registry to file."""
		self._write_registry.save()

	def lock(self):
		"""Lock registry file."""
		self._write_registry.lock()

	def unlock(self):
		"""Un-lock registry file."""
		self._write_registry.unlock()

	def __delitem__(self, key):
		"""Delete registry key."""
		del self._write_registry[key]

		self.file = filename or '/etc/univention/base.conf'
		self.__create_base_conf()
		self.backup_file = self.file + '.bak'
		self.lock_filename = self.file + '.lock'
		# will be set by <ConfigRegistry> for each <_ConfigRegistry> - <True>
		# means the backend files are valid UTF-8 and should stay that way -->
		# only accept valid UTF-8
		self.strict_encoding = False
		self.reg_file = None

	def __create_base_conf(self):
		"""Create sub registry file."""

	def __load_file(self, reg_file):
		"""Load sub registry from opened file."""
		self.clear()
		nr = -1
		for nr, line in enumerate(reg_file):
			line = re.sub(r'^[^:]*#.*$', "", line)
			if not line:
				continue
			try:
				key, value = line.split(': ', 1)
			except ValueError:
				continue
			else:
				self[key] = value.strip()
		return nr >= 2

	def load(self, writable=False):
			value = value.strip()
			if len(value) == 0:  # if variable was set without an value
				value = ''

			self[key] = value

	def load(self):
		"""Load sub registry from file."""
		import_failed = False
		try:
			if writable:
				self.reg_file = reg_file = os.fdopen(os.open(self.file, os.O_RDWR | os.O_CREAT, 0644), 'w')
				fcntl.flock(self.reg_file.fileno(), fcntl.LOCK_EX)
				if self.__load_file(reg_file):
					return
			else:
				reg_file = open(self.file, 'r')
				try:
					fcntl.flock(reg_file.fileno(), fcntl.LOCK_SH)
					if self.__load_file(reg_file):
						return
				finally:
					reg_file.close()
		except EnvironmentError:
			pass
		else:
			if len(reg_file.readlines()) < 3:  # comment or nothing
				import_failed = True

		if import_failed:
			try:
				reg_file = open(self.backup_file, 'r')
			except EnvironmentError:
				return

		# open or loading failed, try to load backup
		try:
			bak_file = open(self.backup_file, 'r')
			fcntl.flock(bak_file.fileno(), fcntl.LOCK_SH)
			self.__load_file(bak_file)
			bak_file.close()
		except EnvironmentError:
			return

		# Try to write main file
		try:
			if writable:
				self.__save_file(self.reg_file)
			else:
				reg_file = os.fdopen(os.open(self.file, os.O_RDWR | os.O_CREAT, 0644), 'w')
				try:
					fcntl.flock(reg_file.fileno(), fcntl.LOCK_EX)
					self.__save_file(reg_file)
				finally:
					reg_file.close()
		except EnvironmentError:
			pass

	def __save_file(self, reg_file):
		"""Save sub registry to file."""
		try:
			reg_file.seek(0)
			reg_file = open(filename, 'w')
			# write data to file
			reg_file.write('# univention_ base.conf\n\n')
			reg_file.write(self.__str__())
			# flush (meta)data
			reg_file.flush()
			reg_file.truncate()
			os.fsync(reg_file.fileno())
			# close fd
			reg_file.close()
		except EnvironmentError, ex:
			# suppress certain errors
			if ex.errno != errno.EACCES:


	def save(self):
		"""Save sub registry to file."""
		assert self.reg_file
		try:
			bak_file = os.fdopen(os.open(self.backup_file, os.O_RDWR | os.O_CREAT, 0644), 'w')
			try:
				fcntl.flock(bak_file.fileno(), fcntl.LOCK_EX)
				self.__save_file(bak_file)
			finally:
				bak_file.close()

			try:
				self.__save_file(self.reg_file)
			finally:
				self.reg_file.close()
			self.reg_file = None
		except EnvironmentError, ex:
			# suppress certain errors
			if ex.errno != errno.EACCES:
				raise

	def __getitem__(self, key):
		"""Return value from sub registry."""




	else:
		reg = ConfigRegistry()

	reg.load(writable=True)
	try:
		reg.load()
		changed = {}
		for arg in args:
			sep_set = arg.find('=')  # set

						print 'Not updating %s' % key
					else:
						print 'Not setting %s' % key
		reg.save()
	finally:
		reg.save()
	handlers(changed.keys(), (reg, changed))



	else:
		reg = ConfigRegistry()

	reg.load(writable=True)
	try:
		reg.load()
		changed = {}
		for arg in args:
			if reg.has_key(arg, write_registry_only=True):

			else:
				msg = "W: The config registry variable '%s' does not exist"
				print >> sys.stderr, msg % (arg,)
		reg.save()
	finally:
		reg.save()
	handlers(changed.keys(), (reg, changed))



(-)a/branches/ucs-3.1/ucs/base/univention-ssl/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-ssl (7.0.5-4) unstable; urgency=low

  * Fix locking and data corruption issue in UCR (Bug #15723)

 -- Philipp Hahn <hahn@univention.de>  Wed, 14 Nov 2012 17:32:11 +0100

univention-ssl (7.0.5-3) unstable; urgency=low

univention-ssl (7.0.5-3) unstable; urgency=low

  * Fix errexit (Bug #26572)

  * Fix errexit (Bug #26572)





from M2Crypto import X509

from univention.config_registry import ConfigRegistry, handler_set

_bc = ConfigRegistry()
_bc.load()

	days = get_validity_days('/etc/univention/ssl/%s/cert.pem' % fqdn)
	days_ca = get_validity_days('/etc/univention/ssl/ucsCA/CAcert.pem')

	changes = []
	if days and days != _bc.get( 'ssl/validity/host', -1 ):
		changes.append('ssl/validity/host=%d' % (days,))
		_bc.save()

	if days_ca and days_ca != _bc.get( 'ssl/validity/root', -1 ):
		changes.append('ssl/validity/root=%d' % (days_cs,))
	if changes:
		handler_set(changes)




univention-system-setup (6.0.51-1) unstable; urgency=low

  * Fix locking and data corruption issue in UCR (Bug #15723)

 -- Philipp Hahn <hahn@univention.de>  Wed, 14 Nov 2012 17:32:26 +0100

univention-system-setup (6.0.50-1) unstable; urgency=low


  * Revert changes in NetworkPage; Bug #28389

 -- Dirk Wiesenthal <wiesenthal@univention.de>  Mon, 12 Nov 2012 19:52:36 +0100




_ = translation.translate
locale.setlocale(locale.LC_ALL, default_locale) # needed for external translation (e.g. apt)

from univention.config_registry import ConfigRegistry, handler_set
from util import PATH_SETUP_SCRIPTS, PATH_PROFILE
ucr = ConfigRegistry()

class SetupScript(object):
	'''Baseclass for all Python-based Setup-Scripts.

			# nothing to do
			return
		self._ucr_changes[var_name] = (oldval, value)
		ucr[var_name] = value

	def commit_ucr(self):
		'''Saves ucr variables previously

		not raise an exception*. You can
		call it manually if you need to
		do it (e.g. in down())'''
		ucr.save()
		ucr.load()
		if self._ucr_changes:
			handler_set(['%s=%s' % (var_name, value) for var_name, (_, value) in self._ucr_changes.items()])
			# reset (in case it is called multiple times in a script)
			self._ucr_changes.clear()
		ucr.load()
		# times in a script
		self._ucr_changes = {}

	def get_ucr_var(self, var_name):
		'''Retrieve the value of var_name from ucr'''
   Bug #15723: Shuffle UCR code
   
   Move some code in preparation to fix locking issue.




		self.strict_encoding = False
		self.lock_file = None

	def __create_base_conf(self):
		"""Create sub registry file."""
		if not os.path.exists(self.file):
			try:
				reg_file = os.open(self.file, os.O_CREAT | os.O_RDONLY, 0644)
				os.close(reg_file)
			except EnvironmentError:
				msg = "E: file '%s' does not exist and could not be created"
				print >> sys.stderr, msg % (self.file,)
				exception_occured()

	def __load_file(self, reg_file):
		"""Load sub registry from opened file."""
		self.clear()
		for line in reg_file.readlines():
			line = re.sub(r'^[^:]*#.*$', "", line)
			if line == '':
				continue
			if line.find(': ') == -1:
				continue

			key, value = line.split(': ', 1)
			value = value.strip()
			if len(value) == 0:  # if variable was set without an value
				value = ''

			self[key] = value

	def load(self):
		"""Load sub registry from file."""
		self.clear()
		import_failed = False
		try:
			reg_file = open(self.file, 'r')

				return

		reg_file.seek(0)
		self.__load_file(reg_file)
			line = re.sub(r'^[^:]*#.*$', "", line)
			if line == '':
				continue
			if line.find(': ') == -1:
				continue

			key, value = line.split(': ', 1)
			value = value.strip()
			if len(value) == 0:  # if variable was set without an value
				value = ''

			self[key] = value
		reg_file.close()

		if import_failed:
			self.__save_file(self.file)

	def __create_base_conf(self):
		"""Create sub registry file."""
		if not os.path.exists(self.file):
			try:
				reg_file = os.open(self.file, os.O_CREAT | os.O_RDONLY, 0644)
				os.close(reg_file)
			except EnvironmentError:
				msg = "E: file '%s' does not exist and could not be created"
				print >> sys.stderr, msg % (self.file,)
				exception_occured()

	def __save_file(self, filename):
		"""Save sub registry to file."""
		try:




	reg.lock()
	try:
		reg.load()

		changed = {}
		for arg in args:
			sep_set = arg.find('=')  # set

						print 'Not updating %s' % key
					else:
						print 'Not setting %s' % key

		reg.save()
	finally:
		reg.unlock()

	handlers(changed.keys(), (reg, changed))



	"""
	Unset config registry variables in args.
	"""
	handlers = ConfigHandlers()
	handlers.load()

	current_scope = ConfigRegistry.NORMAL
	reg = None
	if opts.get('ldap-policy', False):

		reg = ConfigRegistry(write_registry=current_scope)
	else:
		reg = ConfigRegistry()

	reg.lock()
	try:
		reg.load()

		handlers = ConfigHandlers()
		handlers.load()

		changed = {}
		for arg in args:
			if reg.has_key(arg, write_registry_only=True):
   Bug #15723: direct _write_registry usage
   
   Make _write_registry a direct reference to the writeable ConfigRegistry
   instead of of being an index info _registry[]




	def __init__(self, filename=None, write_registry=NORMAL):
		dict.__init__(self)
		self.file = os.getenv('UNIVENTION_BASECONF') or filename or None
		if self.file:
			self._write_registry = ConfigRegistry.CUSTOM
		else:
			self._write_registry = write_registry
		self._registry = [None] * ConfigRegistry.MAX
		for reg in range(ConfigRegistry.MAX):
			if self.file and reg != ConfigRegistry.CUSTOM:

				self._registry[reg] = {}
			else:
				self._registry[reg] = self._create_registry(reg)
		self._write_registry = self._registry[ConfigRegistry.CUSTOM if self.file else write_registry]

	def _create_registry(self, reg):
		"""Create internal sub registry."""


	def save(self):
		"""Save registry to file."""
		self._write_registry.save()
		registry.save()

	def lock(self):
		"""Lock registry file."""
		self._write_registry.lock()
		registry.lock()

	def unlock(self):
		"""Un-lock registry file."""
		self._write_registry.unlock()
		registry.unlock()

	def __delitem__(self, key):
		"""Delete registry key."""
		del self._write_registry[key]
		del registry[key]

	def __getitem__(self, key):
		"""Return registry value."""


	def __setitem__(self, key, value):
		"""Set registry value."""
		self._write_registry[key] = value
		registry[key] = value

	def __contains__(self, key):
		"""Check if registry key is set."""

	def has_key(self, key, write_registry_only=False):
		"""Check if registry key is set (DEPRECATED)."""
		if write_registry_only:
			return key in self._write_registry
			return key in registry
		else:
			return key in self

   Bug #15723: Convert dict to array
   
   _registry is only indexed by number, so use more efficient array.




			self._write_registry = ConfigRegistry.CUSTOM
		else:
			self._write_registry = write_registry
		self._registry = [None] * ConfigRegistry.MAX
		for reg in range(ConfigRegistry.MAX):
			if self.file and reg != ConfigRegistry.CUSTOM:
				self._registry[reg] = {}


	def load(self):
		"""Load registry from file."""
		for reg in self._registry:
			if isinstance(reg, _ConfigRegistry):
				reg.load()
		strict = self.is_true('ucr/encoding/strict')
		for reg in self._registry:
			if isinstance(reg, _ConfigRegistry):
				reg.strict_encoding = strict

   Bug #15723: Fix file(name) variable
   
   file() is a Python build-in, so the test always evaluates to True.
   Use right "filename" instead.

(-)a/branches/ucs-3.1/ucs/base/univention-config-registry/python/univention/config_registry/backend.py (-4 / +1 lines)

Lines 247-256 class _ConfigRegistry(dict):	Link Here

247

"""

247

"""

248

	def __init__(self, filename=None):

248

	def __init__(self, filename=None):

249

		dict.__init__(self)

249

		dict.__init__(self)

250

		if file:

250

		self.file = filename or '/etc/univention/base.conf'

251

			self.file = filename

252

		else:

253

			self.file = '/etc/univention/base.conf'

254

		self.__create_base_conf()

251

		self.__create_base_conf()

255

		self.backup_file = self.file + '.bak'

252

		self.backup_file = self.file + '.bak'

256

		self.lock_filename = self.file + '.lock'

253

		self.lock_filename = self.file + '.lock'

Return to bug 15723