Nicolas Évrard pushed to branch branch/default at Tryton / Tryton
Commits:
90230caa by Nicolas Évrard at 2023-02-06T18:51:38+01:00
Robustly handle config files syntax errors
Closes #12011
Closes #2943
- - - - -
2 changed files:
- tryton/tryton/config.py
- tryton/tryton/gui/window/dblogin.py
Changes:
=====================================
tryton/tryton/config.py
=====================================
@@ -6,4 +6,5 @@
import logging
import optparse
import os
+import shutil
import sys
@@ -9,4 +10,5 @@
import sys
+import tempfile
from gi.repository import GdkPixbuf
@@ -143,7 +145,19 @@
def load(self):
parser = configparser.ConfigParser()
- parser.read([self.rcfile])
+ try:
+ parser.read([self.rcfile])
+ except configparser.Error:
+ config_dir = os.path.dirname(self.rcfile)
+ with tempfile.NamedTemporaryFile(
+ delete=False, prefix='tryton_', suffix='.conf',
+ dir=config_dir) as temp_file:
+ temp_name = temp_file.name
+ shutil.copy(self.rcfile, temp_name)
+ logger.error(
+ f"Failed to parse {self.rcfile}. "
+ f"A backup can be found at {temp_name}", exc_info=True)
+ return
for section in parser.sections():
for (name, value) in parser.items(section):
if value.lower() == 'true':
=====================================
tryton/tryton/gui/window/dblogin.py
=====================================
@@ -5,6 +5,8 @@
import gettext
import logging
import os
+import shutil
+import tempfile
import threading
from gi.repository import GLib, GObject, Gtk
@@ -482,5 +484,6 @@
grid.attach(label_username, 0, 5, 1, 1)
# Profile information
- self.profile_cfg = os.path.join(get_config_dir(), 'profiles.cfg')
+ config_dir = get_config_dir()
+ self.profile_cfg = os.path.join(config_dir, 'profiles.cfg')
self.profiles = configparser.ConfigParser()
@@ -486,8 +489,23 @@
self.profiles = configparser.ConfigParser()
- if not os.path.exists(self.profile_cfg):
+ try:
+ self.profiles.read(self.profile_cfg)
+ except configparser.Error:
+ # reset self.profiles as parsing errors may leave wrong data in
+ # the parser
+ self.profiles = configparser.ConfigParser()
+ with tempfile.NamedTemporaryFile(
+ delete=False, prefix='profiles_', suffix='.cfg',
+ dir=config_dir) as temp_file:
+ temp_name = temp_file.name
+ shutil.copy(self.profile_cfg, temp_name)
+ logger.error(
+ f"Failed to parse {self.profiles_cfg}. "
+ f"A backup can be found at {temp_name}",
+ exc_info=True)
+ if not self.profiles.sections():
short_version = '.'.join(__version__.split('.', 2)[:2])
name = 'demo%s.tryton.org' % short_version
self.profiles.add_section(name)
self.profiles.set(name, 'host', name)
self.profiles.set(name, 'database', 'demo%s' % short_version)
self.profiles.set(name, 'username', 'demo')
@@ -488,14 +506,9 @@
short_version = '.'.join(__version__.split('.', 2)[:2])
name = 'demo%s.tryton.org' % short_version
self.profiles.add_section(name)
self.profiles.set(name, 'host', name)
self.profiles.set(name, 'database', 'demo%s' % short_version)
self.profiles.set(name, 'username', 'demo')
- else:
- try:
- self.profiles.read(self.profile_cfg)
- except configparser.ParsingError:
- logger.error("Fail to parse profiles.cfg", exc_info=True)
for section in self.profiles.sections():
active = all(self.profiles.has_option(section, option)
for option in ('host', 'database'))
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/90230caafd645b93f606af0712939853981612d7
--
View it on Heptapod:
https://foss.heptapod.net/tryton/tryton/-/commit/90230caafd645b93f606af0712939853981612d7
You're receiving this email because of your account on foss.heptapod.net.