Skip to content

Robustly handle config file syntax errors [PREVIEW] #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Robustly handle config file syntax errors [PREVIEW] #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion tryton/tryton/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
import logging
import optparse
import os
import shutil
import sys
import tempfile

from gi.repository import GdkPixbuf

Expand Down Expand Up @@ -152,7 +154,19 @@ def save(self):

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':
Expand Down
27 changes: 20 additions & 7 deletions tryton/tryton/gui/window/dblogin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import gettext
import logging
import os
import shutil
import tempfile
import threading

from gi.repository import GLib, GObject, Gtk
Expand Down Expand Up @@ -495,20 +497,31 @@ def __init__(self):
grid.attach(self.entry_date, 1, 6, 2, 1)

# Profile informations
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()
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')
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'))
Expand Down